Prepending workspace path to relative paths from CppProperties (#10045)

* Relative paths of compileCommands to workspacePath

* Address issue

* Fix lint

* Change rootUri for undefined

* Minor fix

Author: Bernardin-MS

Extension/src/LanguageServer/client.ts

@@ -2397,6 +2397,10 @@ export class DefaultClient implements Client {
             } else {
                 modifiedConfig.compilerArgs = compilerPathAndArgs.allCompilerArgs;
             }
+
+            if (modifiedConfig.compileCommands) {
+                modifiedConfig.compileCommands = cppProperties.resolvePath(modifiedConfig.compileCommands, os.platform() === "win32");
+            }
             params.configurations.push(modifiedConfig);
         });
 

Extension/src/LanguageServer/configurations.ts

@@ -1353,15 +1353,15 @@ export class CppProperties {
         return success;
     }
 
-    private resolvePath(path: string | undefined, isWindows: boolean): string {
-        if (!path || path === "${default}") {
+    public resolvePath(input_path: string | undefined, isWindows: boolean): string {
+        if (!input_path || input_path === "${default}") {
             return "";
         }
 
         let result: string = "";
 
         // first resolve variables
-        result = util.resolveVariables(path, this.ExtendedEnvironment);
+        result = util.resolveVariables(input_path, this.ExtendedEnvironment);
         if (this.rootUri) {
             if (result.includes("${workspaceFolder}")) {
                 result = result.replace("${workspaceFolder}", this.rootUri.fsPath);
@@ -1377,6 +1377,11 @@ export class CppProperties {
             result = result.replace(/\*/g, "");
         }
 
+        // Make sure all paths result to an absolute path
+        if (!path.isAbsolute(result) && this.rootUri) {
+            result = path.join(this.rootUri.fsPath, result);
+        }
+
         return result;
     }