Fix recheck

Author: wjakobsson

gui/mainwindow.cpp

@@ -171,7 +171,7 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     connect(mUI->mActionAnalyzeFiles, &QAction::triggered, this, &MainWindow::analyzeFiles);
     connect(mUI->mActionAnalyzeDirectory, &QAction::triggered, this, &MainWindow::analyzeDirectory);
     connect(mUI->mActionSettings, &QAction::triggered, this, &MainWindow::programSettings);
-    connect(mUI->mActionClearResults, &QAction::triggered, this, &MainWindow::clearResults);
+    connect(mUI->mActionClearResults, &QAction::triggered, this, [this]() { clearResults(); });
     connect(mUI->mActionOpenXML, &QAction::triggered, this, &MainWindow::openResults);
 
     connect(mUI->mActionShowStyle, &QAction::toggled, this, &MainWindow::showStyle);
@@ -582,7 +582,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLib, const bo
         });
     }
 
-    clearResults();
+    clearResults(recheckFiles);
 
     mIsLogfileLoaded = false;
     if (mProjectFile) {
@@ -628,7 +628,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);
@@ -647,7 +647,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLib, const bo
     mUI->mResults->setCheckSettings(checkSettings);
 }
 
-void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLib, const bool checkConfig)
+void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLib, const bool checkConfig, const bool partialRecheck)
 {
     if (files.isEmpty())
         return;
@@ -657,7 +657,7 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLib, c
     if (!getCppcheckSettings(checkSettings, *supprs))
         return;
 
-    clearResults();
+    clearResults(partialRecheck ? files : QStringList());
 
     mIsLogfileLoaded = false;
     FileList pathList;
@@ -669,7 +669,6 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLib, c
     }
     QStringList fileNames = pathList.getFileList();
 
-    mUI->mResults->clear(true);
     mUI->mResults->setResultsSource(ResultsTree::ResultsSource::Analysis);
     mThread->clearFiles();
 
@@ -707,7 +706,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);
@@ -1448,8 +1447,14 @@ void MainWindow::reAnalyze(bool all)
     mUI->mResults->setCheckSettings(checkSettings);
 }
 
-void MainWindow::clearResults()
+void MainWindow::clearResults(const QStringList& selectedFiles)
 {
+    if (!selectedFiles.isEmpty()) {
+        mUI->mResults->clear(false);
+        for (QString f : selectedFiles)
+            mUI->mResults->clearRecheckFile(f);
+        return;
+    }
     if (mProjectFile && !mProjectFile->getBuildDir().isEmpty()) {
         QDir dir(QFileInfo(mProjectFile->getFilename()).absolutePath() + '/' + mProjectFile->getBuildDir());
         for (const QString& f: dir.entryList(QDir::Files)) {
@@ -1981,7 +1986,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
     if (paths.isEmpty()) {
         paths << mCurrentDirectory;
     }
-    doAnalyzeFiles(paths, checkLib, checkConfig);
+    doAnalyzeFiles(paths, checkLib, checkConfig, !recheckFiles.isEmpty());
 }
 
 void MainWindow::newProjectFile()

gui/mainwindow.h

@@ -107,8 +107,11 @@ public slots:
     /** @brief Slot to reanalyze modified files */
     void reAnalyzeModified();
 
-    /** @brief Slot to clear all search results */
-    void clearResults();
+    /**
+     * @brief Slot to clear all search results or selected
+     * @param selectedFiles list to clear, leave empty for all
+    */
+    void clearResults(const QStringList& selectedFiles = QStringList());
 
     /** @brief Slot to open XML report file */
     void openResults();
@@ -309,16 +312,17 @@ private slots:
      * @param checkLib Flag to indicate if library should be checked
      * @param checkConfig Flag to indicate if the configuration should be checked.
      */
-    void doAnalyzeProject(ImportProject p, bool checkLib = false, bool checkConfig = false, const QStringList& recheckFiles = QStringList());
+    void doAnalyzeProject(ImportProject p, bool checkLib = false, bool checkConfig = false, const QStringList &recheckFiles = QStringList());
 
     /**
      * @brief Analyze all files specified in parameter files
      *
      * @param files List of files and/or directories to analyze
      * @param checkLib Flag to indicate if library should be checked
      * @param checkConfig Flag to indicate if the configuration should be checked.
+     * @param partialRecheck Flag to indicate a partial recheck.
      */
-    void doAnalyzeFiles(const QStringList &files, bool checkLib = false, bool checkConfig = false);
+    void doAnalyzeFiles(const QStringList &files, bool checkLib = false, bool checkConfig = false, const bool partialRecheck = false);
 
     /**
      * @brief Get our default cppcheck settings and read project file.

gui/resultstree.cpp

@@ -427,7 +427,7 @@ void ResultsTree::clear(const QString &filename)
 
         if (stripped == fileItem->text() ||
             filename == fileItem->errorItem->file0) {
-            mErrorList.removeAll(fileItem->errorItem->toString());
+            removeFileErrorsFromErrorList(fileItem);
             mModel->removeRow(i);
             break;
         }
@@ -445,7 +445,7 @@ void ResultsTree::clearRecheckFile(const QString &filename)
         QString storedfile = fileItem->getErrorPathItem().file;
         storedfile = ((!mCheckPath.isEmpty() && storedfile.startsWith(mCheckPath)) ? storedfile.mid(mCheckPath.length() + 1) : storedfile);
         if (actualfile == storedfile) {
-            mErrorList.removeAll(fileItem->errorItem->toString());
+            removeFileErrorsFromErrorList(fileItem);
             mModel->removeRow(i);
             break;
         }
@@ -1132,6 +1132,16 @@ void ResultsTree::saveErrors(Report *report, const ResultItem *fileItem) const
     }
 }
 
+void ResultsTree::removeFileErrorsFromErrorList(const ResultItem *fileItem)
+{
+    for (int i{0}; i < fileItem->rowCount(); ++i) {
+        const auto *errorItem = dynamic_cast<const ResultItem*>(fileItem->child(i, COLUMN_FILE));
+        if (errorItem && errorItem->errorItem)
+            mErrorList.removeAll(errorItem->errorItem->toString());
+    }
+    mErrorList.removeAll(fileItem->errorItem->toString());
+}
+
 void ResultsTree::updateFromOldReport(const QString &filename)
 {
     showColumn(COLUMN_SINCE_DATE);
@@ -1195,6 +1205,7 @@ void ResultsTree::updateSettings(bool showFullPath,
 void ResultsTree::setCheckDirectory(const QString &dir)
 {
     mCheckPath = dir;
+    refreshFilePaths();
 }
 
 const QString& ResultsTree::getCheckDirectory() const

gui/resultstree.h

@@ -356,6 +356,12 @@ protected slots:
      */
     void saveErrors(Report *report, const ResultItem *fileItem) const;
 
+    /**
+     * @brief Remove all errors of a file item from the duplicate-check list
+     * @param fileItem Item whose errors to remove
+     */
+    void removeFileErrorsFromErrorList(const ResultItem *fileItem);
+
     /**
      * @brief Convert a severity string to a icon filename
      *

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);