Fix incorrect work with relative paths in include flags

Author: Vladislav Kalugin

server/src/building/ProjectBuildDatabse.cpp

@@ -1,23 +1,31 @@
 #include "ProjectBuildDatabase.h"
+
 #include "utils/GrpcUtils.h"
 #include "exceptions/CompilationDatabaseException.h"
 #include "utils/JsonUtils.h"
 #include "loguru.h"
 #include "utils/StringUtils.h"
+#include "utils/CompilationUtils.h"
 
+static std::string tryConvertToFullPath(const std::string &possibleFilePath, const fs::path &dirPath) {
+    fs::path fullFilePath = Paths::getCCJsonFileFullPath(possibleFilePath, dirPath);
+    return fs::exists(fullFilePath) ? fullFilePath.string() : possibleFilePath;
+}
 
-static std::string tryConvertOptionToPath(const std::string &possibleFilePath,
-                                          const fs::path &dirPath) {
-    if (StringUtils::startsWith(possibleFilePath, "-")) {
-        return possibleFilePath;
-    }
-    fs::path fullFilePath;
+static std::string tryConvertOptionToPath(const std::string &possibleFilePath, const fs::path &dirPath) {
+    std::string resOption;
     try {
-        fullFilePath = Paths::getCCJsonFileFullPath(possibleFilePath, dirPath);
+        if (StringUtils::startsWith(possibleFilePath, "-I")) {
+            resOption = CompilationUtils::getIncludePath(tryConvertToFullPath(possibleFilePath.substr(2), dirPath));
+        } else if (!StringUtils::startsWith(possibleFilePath, "-")) {
+            resOption = tryConvertToFullPath(possibleFilePath, dirPath);
+        } else {
+            resOption = possibleFilePath;
+        }
     } catch (...) {
         return possibleFilePath;
     }
-    return fs::exists(fullFilePath) ? fullFilePath.string() : possibleFilePath;
+    return resOption;
 }
 
 ProjectBuildDatabase::ProjectBuildDatabase(fs::path _buildCommandsJsonPath,

server/src/printers/NativeMakefilePrinter.cpp

@@ -653,7 +653,7 @@ namespace printer {
             return;
         }
         // if in -I flag
-        if (argument.length() >= 3 && StringUtils::startsWith(argument, "-I")) {
+        if (StringUtils::startsWith(argument, "-I/")) {
             argument = CompilationUtils::getIncludePath(getRelativePath(argument.substr(2)).string());
         }
     }

server/src/printers/RelativeMakefilePrinter.cpp

@@ -27,7 +27,7 @@ RelativeMakefilePrinter::RelativeMakefilePrinter(
     initializePathsToShellVariables();
 }
 
-fs::path RelativeMakefilePrinter::getRelativePath(fs::path source) const {
+fs::path RelativeMakefilePrinter::getRelativePath(const fs::path &source) const {
     return getRelativePath(source, true);
 }
 

server/src/printers/RelativeMakefilePrinter.h

@@ -27,7 +27,7 @@ class RelativeMakefilePrinter : public DefaultMakefilePrinter {
 
     // map variable with absolute path to $(someVar)
     std::map<std::string, fs::path, std::function<bool(const std::string&, const std::string&)>> pathToShellVariable;
-    fs::path getRelativePath(fs::path source) const;
+    fs::path getRelativePath(const fs::path &source) const;
     void declareShellVariable(const std::string& variableName, fs::path path,
                               std::function<void(const std::string&, const std::string&)> shellVariableDeclarationFunction,
                               bool shouldWriteToMap = true, bool isCanonical = true);