Address issues with C_Cpp.default.compileCommands

Author: bobbrow

Extension/package.json

@@ -707,6 +707,9 @@
                                 "default": []
                             }
                         ],
+                        "default": [
+                            ""
+                        ],
                         "markdownDescription": "%c_cpp.configuration.default.compileCommands.markdownDescription%",
                         "scope": "machine-overridable"
                     },

Extension/src/LanguageServer/settings.ts

@@ -402,26 +402,19 @@ export class CppSettings extends Settings {
     public get defaultDotconfig(): string | undefined { return changeBlankStringToUndefined(this.getAsStringOrUndefined("default.dotConfig")); }
     public get defaultMacFrameworkPath(): string[] | undefined { return this.getArrayOfStringsWithUndefinedDefault("default.macFrameworkPath"); }
     public get defaultWindowsSdkVersion(): string | undefined { return changeBlankStringToUndefined(this.getAsStringOrUndefined("default.windowsSdkVersion")); }
-    public get defaultForcedInclude(): string[] | undefined { return this.getArrayOfStringsWithUndefinedDefault("default.forcedInclude"); }
-    public get defaultIntelliSenseMode(): string | undefined { return this.getAsStringOrUndefined("default.intelliSenseMode"); }
     public get defaultCompileCommands(): string[] | undefined {
-        // Try to get the value as a string.
-        const value: string | undefined = this.getAsStringOrUndefined("default.compileCommands");
-        if (value !== undefined) {
-            if (changeBlankStringToUndefined(value) === undefined) {
-                return undefined;
-            }
-            return [value];
+        const value: any = super.Section.get<any>("default.compileCommands");
+        if (isString(value)) {
+            return value.length > 0 ? [value] : undefined;
         }
-
-        // value is not a string, try to get it as an array of strings instead.
-        let valueArray: string[] | undefined = this.getAsArrayOfStringsOrUndefined("default.compileCommands");
-        valueArray = valueArray?.filter((value: string) => value.length > 0);
-        if (valueArray?.length === 0) {
-            return undefined;
+        if (isArrayOfString(value)) {
+            const result = value.filter(x => x.length > 0);
+            return result.length > 0 ? result : undefined;
         }
-        return valueArray;
+        return undefined;
     }
+    public get defaultForcedInclude(): string[] | undefined { return this.getArrayOfStringsWithUndefinedDefault("default.forcedInclude"); }
+    public get defaultIntelliSenseMode(): string | undefined { return this.getAsStringOrUndefined("default.intelliSenseMode"); }
     public get defaultCompilerPath(): string | null { return this.getAsString("default.compilerPath", true); }
 
     public set defaultCompilerPath(value: string) {

Extension/src/LanguageServer/settingsTracker.ts

@@ -108,6 +108,11 @@ export class SettingsTracker {
                         return "<invalid>";
                     }
                     return val;
+                } else if (curSetting["oneOf"]) {
+                    // Currently only C_Cpp.default.compileCommands uses this case.
+                    if (curSetting["oneOf"].some((x: any) => this.typeMatch(val, x.type))) {
+                        return val;
+                    }
                 } else if (val === curSetting["default"]) {
                     // C_Cpp.default.browse.path is a special case where the default value is null and doesn't match the type definition.
                     return val;
@@ -206,7 +211,7 @@ export class SettingsTracker {
             if (value && value.length > maxSettingLengthForTelemetry) {
                 value = value.substring(0, maxSettingLengthForTelemetry) + "...";
             }
-            return {key: key, value: value};
+            return { key: key, value: value };
         }
         return undefined;
     }