Fix for microsoft/vscode-extension-telemetry#7 (#1499)

* Fix for microsoft/vscode-extension-telemetry#7 . * Filter out settings values that don't match enum values.
microsoft · Jan 30, 2018 · 42ddf18 · 42ddf18
1 parent 3512cb3
commit 42ddf18
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 16 deletions.
diff --git a/Extension/package-lock.json b/Extension/package-lock.json
diff --git a/Extension/package.json b/Extension/package.json
@@ -1073,7 +1073,7 @@
     "tmp": "~0.0.33",
     "vscode-debugadapter": "~1.24.0",
     "vscode-debugprotocol": "~1.24.0",
-    "vscode-extension-telemetry": "~0.0.10",
+    "vscode-extension-telemetry": "~0.0.11",
     "vscode-languageclient": "~3.4.5",
     "yauzl": "~2.8.0"
   },

diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
@@ -132,6 +132,15 @@ function collectSettingsForTelemetry(filter: (key: string, val: string, settings
         if (val instanceof Object) {
             continue; // ignore settings that are objects since tostring on those is not useful (e.g. navigation.length)
         }
+
+        // Skip values that don't match the setting's enum.
+        let curSetting: any = util.packageJson.contributes.configuration.properties["C_Cpp." + key];
+        if (curSetting) {
+            let curEnum: any[] = curSetting["enum"];
+            if (curEnum && curEnum.indexOf(val) === -1)
+                continue;
+        }
+
         if (filter(key, val, settings)) {
             previousCppSettings[key] = val;
             switch (String(key).toLowerCase()) {