SingleExecutor: process markup files after code with file settings

firewave · firewave · commit ffcb5e73e6d9 · 2023-04-16T18:39:35.000+02:00
diff --git a/cli/singleexecutor.cpp b/cli/singleexecutor.cpp
@@ -66,25 +66,45 @@ unsigned int SingleExecutor::check()
         // filesettings
         // check all files of the project
         for (const ImportProject::FileSettings &fs : mSettings.project.fileSettings) {
-            // TODO: handle markup files
-            result += mCppcheck.check(fs);
-            ++c;
-            if (!mSettings.quiet)
-                reportStatus(c, mSettings.project.fileSettings.size(), c, mSettings.project.fileSettings.size());
-            if (mSettings.clangTidy)
-                mCppcheck.analyseClangTidy(fs);
+            if (!mSettings.library.markupFile(fs.filename)
+                || !mSettings.library.processMarkupAfterCode(fs.filename)) {
+                result += mCppcheck.check(fs);
+                ++c;
+                if (!mSettings.quiet)
+                    reportStatus(c, mSettings.project.fileSettings.size(), c, mSettings.project.fileSettings.size());
+                if (mSettings.clangTidy)
+                    mCppcheck.analyseClangTidy(fs);
+            }
         }
     }
 
     // second loop to parse all markup files which may not work until all
     // c/cpp files have been parsed and checked
-    for (std::map<std::string, std::size_t>::const_iterator i = mFiles.cbegin(); i != mFiles.cend(); ++i) {
-        if (mSettings.library.markupFile(i->first) && mSettings.library.processMarkupAfterCode(i->first)) {
-            result += mCppcheck.check(i->first);
-            processedsize += i->second;
-            if (!mSettings.quiet)
-                reportStatus(c + 1, mFiles.size(), processedsize, totalfilesize);
-            c++;
+    // TODO: get rid of duplicated code
+    if (mSettings.project.fileSettings.empty()) {
+        for (std::map<std::string, std::size_t>::const_iterator i = mFiles.cbegin(); i != mFiles.cend(); ++i) {
+            if (mSettings.library.markupFile(i->first)
+                && mSettings.library.processMarkupAfterCode(i->first)) {
+                result += mCppcheck.check(i->first);
+                processedsize += i->second;
+                if (!mSettings.quiet)
+                    reportStatus(c + 1, mFiles.size(), processedsize, totalfilesize);
+                // TODO: call analyseClangTidy()
+                c++;
+            }
+        }
+    }
+    else {
+        for (const ImportProject::FileSettings &fs : mSettings.project.fileSettings) {
+            if (mSettings.library.markupFile(fs.filename)
+                && mSettings.library.processMarkupAfterCode(fs.filename)) {
+                result += mCppcheck.check(fs);
+                ++c;
+                if (!mSettings.quiet)
+                    reportStatus(c, mSettings.project.fileSettings.size(), c, mSettings.project.fileSettings.size());
+                if (mSettings.clangTidy)
+                    mCppcheck.analyseClangTidy(fs);
+            }
         }
     }
     if (mCppcheck.analyseWholeProgram())
diff --git a/releasenotes.txt b/releasenotes.txt
@@ -14,3 +14,4 @@ release notes for cppcheck-2.11
     - `constVariableReference`
     - `constVariablePointer`
 - More command-line parameters will now check if the given integer argument is actually valid. Several other internal string-to-integer conversions will not be error checked.
+- scanning projects (with -j1) will now defer the analysis of markup files until the whole code was processed
