Log the modified extension settings as part of Log Diagnostics (#12621)

Author: bobbrow

Extension/package.json

@@ -610,7 +610,7 @@
                         "scope": "resource"
                     },
                     "C_Cpp.inactiveRegionOpacity": {
-                        "type:": "number",
+                        "type": "number",
                         "default": 0.55,
                         "markdownDescription": "%c_cpp.configuration.inactiveRegionOpacity.markdownDescription%",
                         "scope": "resource",
@@ -1153,6 +1153,7 @@
                         "scope": "resource"
                     },
                     "C_Cpp.vcFormat.newLine.beforeOpenBrace.lambda": {
+                        "type": "string",
                         "enum": [
                             "newLine",
                             "sameLine",

Extension/src/LanguageServer/client.ts

@@ -1948,6 +1948,17 @@ export class DefaultClient implements Client {
         if (this.configuration.CurrentConfiguration) {
             configJson = `Current Configuration:\n${JSON.stringify(this.configuration.CurrentConfiguration, null, 4)}\n`;
         }
+        const userModifiedSettings = Object.entries(this.settingsTracker.getUserModifiedSettings());
+        if (userModifiedSettings.length > 0) {
+            const settings: Record<string, any> = {};
+            for (const [key] of userModifiedSettings) {
+                // Some settings were renamed during a telemetry change, so we need to undo that here.
+                const realKey = key.endsWith('2') ? key.slice(0, key.length - 1) : key;
+                const fullKey = `C_Cpp.${realKey}`;
+                settings[fullKey] = vscode.workspace.getConfiguration("C_Cpp").get(realKey) ?? '<error-retrieving-value>';
+            }
+            configJson += `Modified Settings:\n${JSON.stringify(settings, null, 4)}\n`;
+        }
 
         // Get diagnostics for configuration provider info.
         let configurationLoggingStr: string = "";

Extension/src/LanguageServer/settingsTracker.ts

@@ -62,17 +62,17 @@ export class SettingsTracker {
                     if (subVal === undefined) {
                         continue;
                     }
-                    if (subVal instanceof Object && !(subVal instanceof Array)) {
+                    if (newRawSetting === undefined && subVal instanceof Object) {
                         collectSettingsRecursive(newKey, subVal, depth + 1);
                     } else {
                         const entry: KeyValuePair | undefined = this.filterAndSanitize(newKey, subVal, correctlyScopedSubSettings, filter);
-                        if (entry && entry.key && entry.value) {
+                        if (entry?.key && entry.value !== undefined) {
                             result[entry.key] = entry.value;
                         }
                     }
                 }
             };
-            if (val instanceof Object && !(val instanceof Array)) {
+            if (rawSetting === undefined && val instanceof Object) {
                 collectSettingsRecursive(key, val, 1);
                 continue;
             }
@@ -108,6 +108,9 @@ export class SettingsTracker {
                         return "<invalid>";
                     }
                     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;
                 }
             }
         }
@@ -123,6 +126,9 @@ export class SettingsTracker {
                         if (typeof value === t) {
                             return t;
                         }
+                        if (t === "integer" && typeof value === "number") {
+                            return "number";
+                        }
                         if (t === "array" && value instanceof Array) {
                             return t;
                         }
@@ -131,8 +137,13 @@ export class SettingsTracker {
                         }
                     }
                 }
-            } else if (typeof type === "string" && typeof value === type) {
-                return type;
+            } else if (typeof type === "string") {
+                if (typeof value === type) {
+                    return type;
+                }
+                if (type === "integer" && typeof value === "number") {
+                    return "number";
+                }
             }
         }
         return undefined;