Fix #12456 (GUI: unable to suppress warnings in "externals/*" headers)

danmar · Apr 8, 2024 · 57d5d1a · 57d5d1a
1 parent bd8cb94
commit 57d5d1a
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 2 deletions.
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -594,7 +594,7 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
     mThread->setFiles(fileNames);
     if (mProjectFile && !checkConfiguration)
         mThread->setAddonsAndTools(mProjectFile->getAddonsAndTools());
-    mThread->setSuppressions(mProjectFile ? mProjectFile->getSuppressions() : QList<SuppressionList::Suppression>());
+    mThread->setSuppressions(mProjectFile ? mProjectFile->getCheckingSuppressions() : QList<SuppressionList::Suppression>());
     QDir inf(mCurrentDirectory);
     const QString checkPath = inf.canonicalPath();
     setPath(SETTINGS_LAST_CHECK_PATH, checkPath);
@@ -1022,7 +1022,7 @@ QPair<bool,Settings> MainWindow::getCppcheckSettings()
             tryLoadLibrary(&result.library, filename);
         }
 
-        for (const SuppressionList::Suppression &suppression : mProjectFile->getSuppressions()) {
+        for (const SuppressionList::Suppression &suppression : mProjectFile->getCheckingSuppressions()) {
             result.supprs.nomsg.addSuppression(suppression);
         }
 

diff --git a/gui/projectfile.cpp b/gui/projectfile.cpp
@@ -30,6 +30,7 @@
 #include <QDir>
 #include <QIODevice>
 #include <QLatin1String>
+#include <QRegularExpression>
 #include <QXmlStreamAttributes>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
@@ -756,6 +757,19 @@ void ProjectFile::setPlatform(const QString &platform)
     mPlatform = platform;
 }
 
+QList<SuppressionList::Suppression> ProjectFile::getCheckingSuppressions() const
+{
+    QRegularExpression re("^[^:]+/.*");
+    QList<SuppressionList::Suppression> result;
+    for (SuppressionList::Suppression suppression : mSuppressions) {
+        if (re.match(suppression.fileName.c_str()).hasMatch()) {
+            suppression.fileName = QFileInfo(mFilename).absolutePath().toStdString() + "/" + suppression.fileName;
+        }
+        result << suppression;
+    }
+    return result;
+}
+
 void ProjectFile::setSuppressions(const QList<SuppressionList::Suppression> &suppressions)
 {
     mSuppressions = suppressions;

diff --git a/gui/projectfile.h b/gui/projectfile.h
@@ -187,6 +187,12 @@ class ProjectFile : public QObject {
         return mSuppressions;
     }
 
+    /**
+     * @brief Get "checking" suppressions. Relative paths are converted to absolute paths.
+     * @return list of suppressions.
+     */
+    QList<SuppressionList::Suppression> getCheckingSuppressions() const;
+
     /**
      * @brief Get list addons.
      * @return list of addons.

diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
@@ -26,6 +26,7 @@
 
 #include <string>
 
+#include <QDir>
 #include <QFile>
 #include <QIODevice>
 #include <QList>
@@ -138,4 +139,15 @@ void TestProjectFile::getAddonFilePath() const
     QCOMPARE(ProjectFile::getAddonFilePath(tempdir.path(), filepath), filepath);
 }
 
+void TestProjectFile::getCheckingSuppressions() const
+{
+    const SuppressionList::Suppression suppression("*", "externals/*");
+    const QList<SuppressionList::Suppression> suppressions{suppression};
+    ProjectFile projectFile;
+    projectFile.setFilename("/some/path/123.cppcheck");
+    projectFile.setSuppressions(suppressions);
+    QCOMPARE(projectFile.getCheckingSuppressions()[0].fileName, "/some/path/externals/*");
+}
+
 QTEST_MAIN(TestProjectFile)
+
diff --git a/gui/test/projectfile/testprojectfile.h b/gui/test/projectfile/testprojectfile.h
@@ -29,4 +29,6 @@ private slots:
     void loadSimpleNoroot() const;
 
     void getAddonFilePath() const;
+
+    void getCheckingSuppressions() const;
 };