Fix settings telemetry to handle more deeply nested settings (#5749)

microsoft · Jul 8, 2020 · 471f9b3 · 471f9b3
1 parent 196510a
commit 471f9b3
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/Extension/src/LanguageServer/settingsTracker.ts b/Extension/src/LanguageServer/settingsTracker.ts
@@ -48,7 +48,13 @@ export class SettingsTracker {
             if (val === undefined) {
                 continue;
             }
-            if (val instanceof Object && !(val instanceof Array)) {
+
+            // Iterate through dotted "sub" settings.
+            const collectSettingsRecursive = (key: string, val: Object, depth: number) => {
+                if (depth > 4) {
+                    // Limit settings recursion to 4 dots (not counting the first one in: `C_Cpp.`)
+                    return;
+                }
                 for (const subKey in val) {
                     const newKey: string = key + "." + subKey;
                     const newRawSetting: any = util.packageJson.contributes.configuration.properties["C_Cpp." + newKey];
@@ -57,11 +63,18 @@ export class SettingsTracker {
                     if (subVal === undefined) {
                         continue;
                     }
-                    const entry: KeyValuePair | undefined = this.filterAndSanitize(newKey, subVal, correctlyScopedSubSettings, filter);
-                    if (entry && entry.key && entry.value) {
-                        result[entry.key] = entry.value;
+                    if (subVal instanceof Object && !(subVal instanceof Array)) {
+                        collectSettingsRecursive(newKey, subVal, depth + 1);
+                    } else {
+                        const entry: KeyValuePair | undefined = this.filterAndSanitize(newKey, subVal, correctlyScopedSubSettings, filter);
+                        if (entry && entry.key && entry.value) {
+                            result[entry.key] = entry.value;
+                        }
                     }
                 }
+            };
+            if (val instanceof Object && !(val instanceof Array)) {
+                collectSettingsRecursive(key, val, 1);
                 continue;
             }