Fix #14116 (cmdline: Improve IDE integration with --project-settings option)

Author: danmar

cli/cmdlineparser.cpp

@@ -385,6 +385,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
     ImportProject::Type projectType = ImportProject::Type::NONE;
     ImportProject project;
+    bool projectSettings = false;
     std::string vsConfig;
 
     std::string platform;
@@ -1132,16 +1133,18 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             }
         }
 
-        // --project
-        else if (std::strncmp(argv[i], "--project=", 10) == 0) {
+        // --project, --project-settings
+        else if (std::strncmp(argv[i], "--project=", 10) == 0 || std::strncmp(argv[i], "--project-settings=", 19) == 0) {
             if (projectType != ImportProject::Type::NONE)
             {
                 mLogger.printError("multiple --project options are not supported.");
                 return Result::Fail;
             }
 
+            projectSettings = (std::strncmp(argv[i], "--project-settings=", 19) == 0);
+
             mSettings.checkAllConfigurations = false;     // Can be overridden with --max-configs or --force
-            std::string projectFile = argv[i]+10;
+            std::string projectFile = std::strchr(argv[i], '=') + 1;
             projectType = project.import(projectFile, &mSettings, &mSuppressions, isCppcheckPremium());
             if (projectType == ImportProject::Type::CPPCHECK_GUI) {
                 for (const std::string &lib : project.guiProject.libraries)
@@ -1582,6 +1585,11 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         //mLogger.printMessage("whole program analysis requires --cppcheck-build-dir to be active with -j.");
     }
 
+    if (projectSettings) {
+        mSettings.fileFilters.insert(mSettings.fileFilters.end(), mPathNames.cbegin(), mPathNames.cend());
+        mPathNames.clear();
+    }
+
     if (!mPathNames.empty() && projectType != ImportProject::Type::NONE) {
         mLogger.printError("--project cannot be used in conjunction with source files.");
         return Result::Fail;
@@ -1918,6 +1926,16 @@ void CmdLineParser::printHelp() const
         "                         or Visual Studio Project (*.vcxproj) you can limit\n"
         "                         the configuration cppcheck should check.\n"
         "                         For example: '--project-configuration=Release|Win32'\n"
+        "    --project-settings=<file>\n"
+        "                         IDE option: Import settings from project file. Preprocessor\n"
+        "                         settings, suppressions, coding standards, etc. are imported.\n"
+        "                         Unlike --project the files to analyse is not imported with this\n"
+        "                         option.\n"
+        "                         These two commands are effectively the same:\n"
+        "                             cppcheck --project=foo --file-filter=src/test.c\n"
+        "                             cppcheck --project-settings=foo src/test.c\n"
+        "                         Both commands will load the project foo and then analyse only the\n"
+        "                         file src/test.c\n"
         "    -q, --quiet          Do not show progress reports.\n"
         "                         Note that this option is not mutually exclusive with --verbose.\n"
         "    -rp=<paths>, --relative-paths=<paths>\n"

test/testcmdlineparser.cpp

@@ -376,6 +376,8 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(projectEmpty);
         TEST_CASE(projectMissing);
         TEST_CASE(projectNoPaths);
+        TEST_CASE(projectSettingsBeforeSource);
+        TEST_CASE(projectSettingsAfterSource);
         TEST_CASE(addon);
         TEST_CASE(addonMissing);
 #ifdef HAVE_RULES
@@ -2502,6 +2504,32 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("cppcheck: error: no C or C++ source files found.\n", logger->str());
     }
 
+    void projectSettingsBeforeSource() {
+        REDIRECT;
+        ScopedFile file("project.cppcheck",
+                        "<project>\n"
+                        "<paths>\n"
+                        "<dir name=\"src\"/>\n"
+                        "</paths>\n"
+                        "</project>");
+        const char * const argv[] = {"cppcheck", "--project-settings=project.cppcheck", "src/file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("src/file.cpp", settings->fileFilters.front());
+    }
+
+    void projectSettingsAfterSource() {
+        REDIRECT;
+        ScopedFile file("project.cppcheck",
+                        "<project>\n"
+                        "<paths>\n"
+                        "<dir name=\"src\"/>\n"
+                        "</paths>\n"
+                        "</project>");
+        const char * const argv[] = {"cppcheck", "src/file.cpp", "--project-settings=project.cppcheck"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("src/file.cpp", settings->fileFilters.front());
+    }
+
     void addon() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--addon=misra", "file.cpp"};