fixed #14746 import project: include path in compile_commands.json not handled well (#8591)

Author: wjakobsson

lib/importproject.cpp

@@ -1699,8 +1699,10 @@ void ImportProject::setRelativePaths(const std::string &filename)
     const std::vector<std::string> basePaths{Path::fromNativeSeparators(Path::getCurrentPath())};
     for (auto &fs: fileSettings) {
         fs.file.setPath(Path::getRelativePath(fs.filename(), basePaths));
-        for (auto &includePath: fs.includePaths)
-            includePath = Path::getRelativePath(includePath, basePaths);
+        for (auto &includePath: fs.includePaths) {
+            const std::string rel = Path::getRelativePath(includePath, basePaths);
+            includePath = rel.empty() ? "." : rel;
+        }
     }
 }
 

lib/importproject.h

@@ -110,6 +110,7 @@ class CPPCHECKLIB WARN_UNUSED ImportProject {
     bool importCompileCommands(std::istream &istr);
     bool importCppcheckGuiProject(std::istream &istr, Settings &settings, Suppressions &supprs);
     static std::string collectArgs(const std::string &cmd, std::vector<std::string> &args);
+    void setRelativePaths(const std::string &filename);
 
     struct SharedItemsProject {
         bool successful = false;
@@ -123,7 +124,6 @@ class CPPCHECKLIB WARN_UNUSED ImportProject {
 
 private:
     static void parseArgs(FileSettings &fs, const std::vector<std::string> &args);
-    void setRelativePaths(const std::string &filename);
 
     bool importSln(std::istream &istr, const std::string &path, const std::vector<std::string> &fileFilters);
     bool importSlnx(const std::string& filename, const std::vector<std::string>& fileFilters);

test/testimportproject.cpp

@@ -42,6 +42,7 @@ class TestImporter final : public ImportProject {
     using ImportProject::collectArgs;
     using ImportProject::fsSetDefines;
     using ImportProject::fsSetIncludePaths;
+    using ImportProject::setRelativePaths;
 };
 
 
@@ -56,6 +57,7 @@ class TestImportProject : public TestFixture {
         TEST_CASE(setIncludePaths1);
         TEST_CASE(setIncludePaths2);
         TEST_CASE(setIncludePaths3); // macro names are case insensitive
+        TEST_CASE(setRelativePathsInclude); // #14746
         TEST_CASE(importCompileCommands1);
         TEST_CASE(importCompileCommands2); // #8563, #9567
         TEST_CASE(importCompileCommands3); // check with existing trailing / in directory
@@ -134,6 +136,18 @@ class TestImportProject : public TestFixture {
         ASSERT_EQUALS("c:/abc/other/", fs.includePaths.front());
     }
 
+    void setRelativePathsInclude() const {
+        const std::string cwd = Path::fromNativeSeparators(Path::getCurrentPath());
+        TestImporter importer;
+        FileSettings fs{cwd + "/sub/a.c", Standards::Language::C, 0};
+        fs.includePaths.push_back(cwd + "/");
+        importer.fileSettings.push_back(fs);
+        importer.setRelativePaths("compile_commands.json");
+        fs = importer.fileSettings.front();
+        ASSERT_EQUALS(".", fs.includePaths.front());
+        ASSERT_EQUALS("sub/a.c", fs.filename());
+    }
+
     void importCompileCommands1() const {
         REDIRECT;
         constexpr char json[] = R"([{