Seanmcm/telemetry fix (#1494)

* Fix telemetry.

Author: sean-mcmanus

Extension/src/LanguageServer/client.ts

@@ -120,7 +120,7 @@ let previousCppSettings: { [key: string]: any } = {};
 /**
  * track settings changes for telemetry
  */
-function collectSettings(filter: (key: string, val: string, settings: vscode.WorkspaceConfiguration) => boolean, resource: vscode.Uri): { [key: string]: string } {
+function collectSettingsForTelemetry(filter: (key: string, val: string, settings: vscode.WorkspaceConfiguration) => boolean, resource: vscode.Uri): { [key: string]: string } {
     let settings: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("C_Cpp", resource);
     let result: { [key: string]: string } = {};
 
@@ -134,7 +134,41 @@ function collectSettings(filter: (key: string, val: string, settings: vscode.Wor
         }
         if (filter(key, val, settings)) {
             previousCppSettings[key] = val;
-            result[key] = (key === "clang_format_path") ? "..." : String(previousCppSettings[key]);
+            switch (String(key).toLowerCase()) {
+                case "clang_format_path": {
+                    continue;
+                }
+                case "clang_format_style":
+                case "clang_format_fallbackstyle": {
+                    let newKey: string = String(key) + "2";
+                    if (val) {
+                        switch (String(val).toLowerCase()) {
+                            case "visual studio":
+                            case "llvm":
+                            case "google":
+                            case "chromium":
+                            case "mozilla":
+                            case "webkit":
+                            case "file":
+                            case "none": {
+                                result[newKey] = String(previousCppSettings[key]);
+                                break;
+                            }
+                            default: {
+                                result[newKey] = "...";
+                                break;
+                            }
+                        }
+                    } else {
+                        result[newKey] = "null";
+                    }
+                    break;
+                }
+                default: {
+                    result[key] = String(previousCppSettings[key]);
+                    break;
+                }
+            }
             if (result[key].length > maxSettingLengthForTelemetry) {
                 result[key] = result[key].substr(0, maxSettingLengthForTelemetry) + "...";
             }
@@ -145,15 +179,15 @@ function collectSettings(filter: (key: string, val: string, settings: vscode.Wor
 }
 
 function initializeSettingsCache(resource: vscode.Uri): void {
-    collectSettings(() => true, resource);
+    collectSettingsForTelemetry(() => true, resource);
 }
 
 function getNonDefaultSettings(resource: vscode.Uri): { [key: string]: string } {
     let filter: (key: string, val: string, settings: vscode.WorkspaceConfiguration) => boolean = (key: string, val: string, settings: vscode.WorkspaceConfiguration) => {
         return val !== settings.inspect(key).defaultValue;
     };
     initializeSettingsCache(resource);
-    return collectSettings(filter, resource);
+    return collectSettingsForTelemetry(filter, resource);
 }
 
 interface ClientModel {
@@ -393,7 +427,7 @@ class DefaultClient implements Client {
         let filter: (key: string, val: string) => boolean = (key: string, val: string) => {
             return !(key in previousCppSettings) || val !== previousCppSettings[key];
         };
-        let changedSettings: any = collectSettings(filter, this.RootUri);
+        let changedSettings: any = collectSettingsForTelemetry(filter, this.RootUri);
 
         if (Object.keys(changedSettings).length > 0) {
             telemetry.logLanguageServerEvent("CppSettingsChange", changedSettings, null);