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

Author: danmar

cli/cmdlineparser.cpp

@@ -382,6 +382,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
     bool def = false;
     bool maxconfigs = false;
     bool debug = false;
+    bool inputAsFilter = false; // set by: --file-filter=+
 
     ImportProject::Type projectType = ImportProject::Type::NONE;
     ImportProject project;
@@ -768,6 +769,8 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                     mLogger.printError("Failed: --file-filter=-");
                     return Result::Fail;
                 }
+            } else if (std::strcmp(filter, "+") == 0) {
+                inputAsFilter = true;
             } else {
                 mSettings.fileFilters.emplace_back(filter);
             }
@@ -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 (inputAsFilter) {
+        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;
@@ -1777,10 +1785,12 @@ void CmdLineParser::printHelp() const
         "    --exitcode-suppressions=<file>\n"
         "                         Used when certain messages should be displayed but\n"
         "                         should not cause a non-zero exitcode.\n"
-        "    --file-filter=<str>  Analyze only those files matching the given filter str\n"
-        "                         Can be used multiple times\n"
+        "    --file-filter=<str>  Analyze only those files matching the given filter str.\n"
+        "                         Can be used multiple times. When str is '-', the file\n"
+        "                         filter will be read from standard input. When str is '+',\n"
+        "                         all path arguments are treated as file filters.\n"
         "                         Example: --file-filter=*bar.cpp analyzes only files\n"
-        "                                  that end with bar.cpp.\n"
+        "                         that end with bar.cpp.\n"
         "    --file-list=<file>   Specify the files to check in a text file. Add one\n"
         "                         filename per line. When file is '-,' the file list will\n"
         "                         be read from standard input.\n"

test/testcmdlineparser.cpp

@@ -208,6 +208,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(fileFilterFileWithDetailsSimplifiedPath);
         TEST_CASE(fileFilterFileWithDetailsCase);
         TEST_CASE(fileFilterStdin);
+        TEST_CASE(fileFilterPlus);
         TEST_CASE(fileFilterNoMatch);
         TEST_CASE(fileList);
         TEST_CASE(fileListNoFile);
@@ -1233,6 +1234,19 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("file2.cpp", settings->fileFilters[1]);
     }
 
+    void fileFilterPlus() {
+        REDIRECT;
+        ScopedFile file("project.cppcheck",
+                        "<project>\n"
+                        "<paths>\n"
+                        "<dir name=\"src\"/>\n"
+                        "</paths>\n"
+                        "</project>");
+        const char * const argv[] = {"cppcheck", "--project=project.cppcheck", "--file-filter=+", "src/file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("src/file.cpp", settings->fileFilters.front());
+    }
+
     void fileFilterNoMatch() {
         REDIRECT;
         RedirectInput input("notexist1.c\nnotexist2.cpp\n");