fixed #13909 / refs #13914 - added (enforced) language handling for imported projects in GUI

Author: firewave

Makefile

@@ -659,7 +659,7 @@ $(libcppdir)/vf_settokenvalue.o: lib/vf_settokenvalue.cpp lib/addoninfo.h lib/as
 $(libcppdir)/vfvalue.o: lib/vfvalue.cpp lib/config.h lib/errortypes.h lib/mathlib.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vfvalue.cpp
 
-frontend/frontend.o: frontend/frontend.cpp frontend/frontend.h
+frontend/frontend.o: frontend/frontend.cpp frontend/frontend.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_FE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ frontend/frontend.cpp
 
 cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/filelister.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h lib/xml.h

cli/cmdlineparser.cpp

@@ -39,6 +39,8 @@
 #include "timer.h"
 #include "utils.h"
 
+#include "frontend.h"
+
 #include <algorithm>
 #include <cassert>
 #include <climits>
@@ -221,40 +223,7 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
 
         mFileSettings.clear();
 
-        if (mEnforcedLang != Standards::Language::None)
-        {
-            // apply enforced language
-            for (auto& fs : fileSettings)
-            {
-                if (mSettings.library.markupFile(fs.filename()))
-                    continue;
-                fs.file.setLang(mEnforcedLang);
-            }
-        }
-        else
-        {
-            // identify files
-            for (auto& fs : fileSettings)
-            {
-                if (mSettings.library.markupFile(fs.filename()))
-                    continue;
-                assert(fs.file.lang() == Standards::Language::None);
-                bool header = false;
-                fs.file.setLang(Path::identify(fs.filename(), mSettings.cppHeaderProbe, &header));
-                // unknown extensions default to C++
-                if (!header && fs.file.lang() == Standards::Language::None)
-                    fs.file.setLang(Standards::Language::CPP);
-            }
-        }
-
-        // enforce the language since markup files are special and do not adhere to the enforced language
-        for (auto& fs : fileSettings)
-        {
-            if (mSettings.library.markupFile(fs.filename())) {
-                assert(fs.file.lang() == Standards::Language::None);
-                fs.file.setLang(Standards::Language::C);
-            }
-        }
+        frontend::applyLang(fileSettings, mSettings, mEnforcedLang);
 
         // sort the markup last
         std::copy_if(fileSettings.cbegin(), fileSettings.cend(), std::back_inserter(mFileSettings), [&](const FileSettings &fs) {

cli/cmdlineparser.h

@@ -177,6 +177,7 @@ class CmdLineParser {
     Settings &mSettings;
     Suppressions &mSuppressions;
     bool mAnalyzeAllVsConfigsSetOnCmdLine = false;
+    /** @brief Name of the language that is enforced. Empty per default. */
     Standards::Language mEnforcedLang{Standards::Language::None};
 };
 

frontend/frontend.cpp

@@ -18,5 +18,45 @@
 
 #include "frontend.h"
 
-namespace frontend
-{}
+#include "filesettings.h"
+#include "settings.h"
+
+namespace frontend {
+    void applyLang(std::list<FileSettings>& fileSettings, const Settings& settings, Standards::Language enforcedLang)
+    {
+        if (enforcedLang != Standards::Language::None)
+        {
+            // apply enforced language
+            for (auto& fs : fileSettings)
+            {
+                if (settings.library.markupFile(fs.filename()))
+                    continue;
+                fs.file.setLang(enforcedLang);
+            }
+        }
+        else
+        {
+            // identify files
+            for (auto& fs : fileSettings)
+            {
+                if (settings.library.markupFile(fs.filename()))
+                    continue;
+                assert(fs.file.lang() == Standards::Language::None);
+                bool header = false;
+                fs.file.setLang(Path::identify(fs.filename(), settings.cppHeaderProbe, &header));
+                // unknown extensions default to C++
+                if (!header && fs.file.lang() == Standards::Language::None)
+                    fs.file.setLang(Standards::Language::CPP);
+            }
+        }
+
+        // enforce the language since markup files are special and do not adhere to the enforced language
+        for (auto& fs : fileSettings)
+        {
+            if (settings.library.markupFile(fs.filename())) {
+                assert(fs.file.lang() == Standards::Language::None);
+                fs.file.setLang(Standards::Language::C);
+            }
+        }
+    }
+}

frontend/frontend.h

@@ -19,7 +19,16 @@
 #ifndef FRONTEND_H
 #define FRONTEND_H
 
+#include "standards.h"
+
+#include <list>
+
+struct FileSettings;
+class Settings;
+
 namespace frontend
-{}
+{
+    void applyLang(std::list<FileSettings> &fileSettings, const Settings &settings, Standards::Language enforcedLang);
+}
 
 #endif // FRONTEND_H

gui/mainwindow.cpp

@@ -54,6 +54,8 @@
 
 #include "ui_mainwindow.h"
 
+#include "frontend.h"
+
 #include <algorithm>
 #include <iterator>
 #include <list>
@@ -604,6 +606,10 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
         mThread->setClangIncludePaths(clangHeaders.split(";"));
         mThread->setSuppressions(mProjectFile->getSuppressions());
     }
+
+    const Standards::Language enforcedLang = static_cast<Standards::Language>(mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt());
+    frontend::applyLang(p.fileSettings, checkSettings, enforcedLang);
+
     mThread->setProject(p);
     mThread->check(checkSettings, supprs);
     mUI->mResults->setCheckSettings(checkSettings);
@@ -1208,7 +1214,6 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
         settings.platform.set(static_cast<Platform::Type>(mSettings->value(SETTINGS_CHECKED_PLATFORM, 0).toInt()));
     settings.standards.setCPP(mSettings->value(SETTINGS_STD_CPP, QString()).toString().toStdString());
     settings.standards.setC(mSettings->value(SETTINGS_STD_C, QString()).toString().toStdString());
-    Standards::Language enforcedLang = static_cast<Standards::Language>(mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt());
 
     settings.jobs = std::max(settings.jobs, 1u);