Skip to content

Commit 42ddf18

Browse files
authored
* Fix for microsoft/vscode-extension-telemetry#7 . * Filter out settings values that don't match enum values.
1 parent 3512cb3 commit 42ddf18

File tree

3 files changed

+41
-16
lines changed

3 files changed

+41
-16
lines changed

Extension/package-lock.json

Lines changed: 31 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@
10731073
"tmp": "~0.0.33",
10741074
"vscode-debugadapter": "~1.24.0",
10751075
"vscode-debugprotocol": "~1.24.0",
1076-
"vscode-extension-telemetry": "~0.0.10",
1076+
"vscode-extension-telemetry": "~0.0.11",
10771077
"vscode-languageclient": "~3.4.5",
10781078
"yauzl": "~2.8.0"
10791079
},

Extension/src/LanguageServer/client.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,15 @@ function collectSettingsForTelemetry(filter: (key: string, val: string, settings
132132
if (val instanceof Object) {
133133
continue; // ignore settings that are objects since tostring on those is not useful (e.g. navigation.length)
134134
}
135+
136+
// Skip values that don't match the setting's enum.
137+
let curSetting: any = util.packageJson.contributes.configuration.properties["C_Cpp." + key];
138+
if (curSetting) {
139+
let curEnum: any[] = curSetting["enum"];
140+
if (curEnum && curEnum.indexOf(val) === -1)
141+
continue;
142+
}
143+
135144
if (filter(key, val, settings)) {
136145
previousCppSettings[key] = val;
137146
switch (String(key).toLowerCase()) {

0 commit comments

Comments
 (0)