Merge branch 'main' into bobbrow/codeAnalysisChanged

Author: bobbrow

Extension/package.json

@@ -3744,7 +3744,7 @@
                             },
                             "svdPath": {
                                 "type": "string",
-                                "description": "%c_cpp.debuggers.cppdbg.visualizerFile.description",
+                                "description": "%c_cpp.debuggers.cppdbg.svdPath.description%",
                                 "default": ""
                             },
                             "showDisplayString": {

Extension/src/LanguageServer/configurations.ts

@@ -1574,9 +1574,11 @@ export class CppProperties {
                 quoted = true;
                 result = result.slice(1, -1);
             }
+            // On Windows, isAbsolute does not handle root paths without a slash, such as "C:"
+            const isWindowsRootPath: boolean = process.platform === 'win32' && /^[a-zA-Z]:$/.test(result);
             // Make sure all paths result to an absolute path.
             // Do not add the root path to an unresolved env variable.
-            if (!result.includes("env:") && !path.isAbsolute(result) && this.rootUri) {
+            if (!isWindowsRootPath && !result.includes("env:") && !path.isAbsolute(result) && this.rootUri) {
                 result = path.join(this.rootUri.fsPath, result);
             }
             if (quoted) {

Extension/tools/OptionsSchema.json

@@ -477,7 +477,11 @@
             "allOf": [
               {
                 "if": {
-                  "properties": { "type": { "const": "scp" } }
+                  "properties": {
+                    "type": {
+                      "const": "scp"
+                    }
+                  }
                 },
                 "then": {
                   "properties": {
@@ -491,7 +495,11 @@
               },
               {
                 "if": {
-                  "properties": { "type": { "const": "rsync" } }
+                  "properties": {
+                    "type": {
+                      "const": "rsync"
+                    }
+                  }
                 },
                 "then": {
                   "properties": {
@@ -672,7 +680,7 @@
         },
         "svdPath": {
           "type": "string",
-          "description": "%c_cpp.debuggers.cppdbg.visualizerFile.description",
+          "description": "%c_cpp.debuggers.cppdbg.svdPath.description%",
           "default": ""
         },
         "showDisplayString": {