small fix

Author: wjakobsson

gui/mainwindow.cpp

@@ -630,7 +630,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLib, const bo
     if (!checkSettings.buildDir.empty()) {
         checkSettings.loadSummaries();
         std::list<std::string> sourcefiles;
-        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, p.fileSettings);
+        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, p.fileSettings, !recheckFiles.isEmpty());
     }
 
     //mThread->SetanalyzeProject(true);
@@ -708,7 +708,7 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLib, c
     if (!checkSettings.buildDir.empty()) {
         checkSettings.loadSummaries();
         const auto& sourcefiles = toStdStringList<std::list<std::string>>(fileNames);
-        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, {});
+        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, {}, partialRecheck);
     }
 
     mThread->setCheckFiles(true);

lib/analyzerinfo.cpp

@@ -24,10 +24,12 @@
 #include "utils.h"
 
 #include <array>
+#include <cstdlib>
 #include <cstring>
 #include <exception>
 #include <iostream>
 #include <map>
+#include <set>
 #include <sstream>
 #include <stdexcept>
 #include <utility>
@@ -51,11 +53,43 @@ static std::string getFilename(const std::string &fullpath)
     return fullpath.substr(pos1,pos2);
 }
 
-void AnalyzerInformation::writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings)
+void AnalyzerInformation::writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings, bool merge)
 {
     const std::string filesTxt(buildDir + "/files.txt");
+
+    std::string keptLines;
+    std::map<std::string, unsigned int> fileCount;
+
+    if (merge) {
+        std::set<std::string> current;
+        for (const std::string &f : sourcefiles)
+            current.insert(Path::simplifyPath(f));
+        for (const FileSettings &fs : fileSettings)
+            current.insert(Path::simplifyPath(fs.filename()));
+
+        std::ifstream fin(filesTxt);
+        std::string line;
+        while (std::getline(fin, line)) {
+            Info info;
+            if (!info.parse(line))
+                continue;
+            if (current.count(info.sourceFile))
+                continue;
+            keptLines += line + '\n';
+
+            const std::string::size_type dotA = info.afile.rfind(".a");
+            if (dotA != std::string::npos) {
+                const std::string base = info.afile.substr(0, dotA);
+                const unsigned int n = std::strtoul(info.afile.c_str() + dotA + 2, nullptr, 10);
+                unsigned int &count = fileCount[base];
+                count = std::max(count, n);
+            }
+        }
+    }
+
     std::ofstream fout(filesTxt);
-    fout << getFilesTxt(sourcefiles, fileSettings);
+    fout << keptLines;
+    fout << getFilesTxt(sourcefiles, fileSettings, fileCount);
 }
 
 void AnalyzerInformation::writeIncludes(const std::set<std::string> &files)
@@ -120,11 +154,9 @@ void AnalyzerInformation::writeHash(std::size_t hash)
     }
 }
 
-std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings) {
+std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings, std::map<std::string, unsigned int> fileCount) {
     std::ostringstream ret;
 
-    std::map<std::string, unsigned int> fileCount;
-
     for (const std::string &f : sourcefiles) {
         const std::string afile = getFilename(f);
         ret << afile << ".a" << (++fileCount[afile]) << sep << sep << sep << Path::simplifyPath(f) << '\n';

lib/analyzerinfo.h

@@ -27,6 +27,7 @@
 #include <fstream>
 #include <functional>
 #include <list>
+#include <map>
 #include <set>
 #include <string>
 
@@ -58,7 +59,7 @@ class CPPCHECKLIB AnalyzerInformation {
 public:
     ~AnalyzerInformation();
 
-    static void writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings);
+    static void writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings, bool merge = false);
 
     /** Close current TU.analyzerinfo file */
     void close();
@@ -89,7 +90,7 @@ class CPPCHECKLIB AnalyzerInformation {
     static std::string processFilesTxt(const std::string& buildDir, const std::function<void(const char* checkattr, const tinyxml2::XMLElement* e, const Info& filesTxtInfo)>& handler, bool debug = false);
 
 protected:
-    static std::string getFilesTxt(const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings);
+    static std::string getFilesTxt(const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings, std::map<std::string, unsigned int> fileCount = {});
 
     static std::string getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, size_t fsFileId);