Address issue with AB default not applied. Fix issue with non file URIs (#3767)

Author: Colengms

Extension/src/LanguageServer/client.ts

@@ -583,34 +583,40 @@ class DefaultClient implements Client {
     private editVersion: number = 0;
 
     public onDidChangeTextDocument(textDocumentChangeEvent: vscode.TextDocumentChangeEvent): void {
-        if (textDocumentChangeEvent.document.languageId === "cpp" || textDocumentChangeEvent.document.languageId === "c") {
-            this.editVersion++;
-            try {
-                let colorizationState: ColorizationState = this.getColorizationState(textDocumentChangeEvent.document.uri.toString());
+        if (textDocumentChangeEvent.document.uri.scheme === "file") {
+            if (textDocumentChangeEvent.document.languageId === "cpp" || textDocumentChangeEvent.document.languageId === "c") {
+                this.editVersion++;
+                try {
+                    let colorizationState: ColorizationState = this.getColorizationState(textDocumentChangeEvent.document.uri.toString());
 
-                // Adjust colorization ranges after this edit.  (i.e. if a line was added, push decorations after it down one line)
-                colorizationState.updateAfterEdits(textDocumentChangeEvent.contentChanges, this.editVersion);
-            } catch (e) {
-                // Ensure an exception does not prevent pass-through to native handler, or editVersion could become inconsistent
-                console.log(e.toString());
+                    // Adjust colorization ranges after this edit.  (i.e. if a line was added, push decorations after it down one line)
+                    colorizationState.updateAfterEdits(textDocumentChangeEvent.contentChanges, this.editVersion);
+                } catch (e) {
+                    // Ensure an exception does not prevent pass-through to native handler, or editVersion could become inconsistent
+                    console.log(e.toString());
+                }
             }
         }
     }
 
     public onDidOpenTextDocument(document: vscode.TextDocument): void {
-        this.sendVisibleRanges(document.uri);
+        if (document.uri.scheme === "file") {
+            this.sendVisibleRanges(document.uri);
+        }
     }
 
     public onDidChangeVisibleTextEditors(editors: vscode.TextEditor[]): void {
         let processedUris: vscode.Uri[] = [];
         editors.forEach(editor => {
-            let colorizationState: ColorizationState = this.colorizationState.get(editor.document.uri.toString());
-            if (colorizationState) {
-                colorizationState.refresh(editor);
-            }
-            if (!processedUris.find(uri => uri === editor.document.uri)) {
-                processedUris.push(editor.document.uri);
-                this.sendVisibleRanges(editor.document.uri);
+            if (editor.document.uri.scheme === "file") {
+                let colorizationState: ColorizationState = this.colorizationState.get(editor.document.uri.toString());
+                if (colorizationState) {
+                    colorizationState.refresh(editor);
+                }
+                if (!processedUris.find(uri => uri === editor.document.uri)) {
+                    processedUris.push(editor.document.uri);
+                    this.sendVisibleRanges(editor.document.uri);
+                }
             }
         });
     }
@@ -650,7 +656,9 @@ class DefaultClient implements Client {
     }
 
     public onDidChangeTextEditorVisibleRanges(textEditorVisibleRangesChangeEvent: vscode.TextEditorVisibleRangesChangeEvent): void {
-        this.sendVisibleRanges(textEditorVisibleRangesChangeEvent.textEditor.document.uri);
+        if (textEditorVisibleRangesChangeEvent.textEditor.document.uri.scheme === "file") {
+            this.sendVisibleRanges(textEditorVisibleRangesChangeEvent.textEditor.document.uri);
+        }
     }
 
     public onRegisterCustomConfigurationProvider(provider: CustomConfigurationProvider1): Thenable<void> {

Extension/src/main.ts

@@ -305,6 +305,7 @@ async function finalizeExtensionActivation(): Promise<void> {
 
     let abTestSettings: cpptoolsJsonUtils.ABTestSettings = cpptoolsJsonUtils.getABTestSettings();
     let packageJson: any = util.getRawPackageJson();
+    let writePackageJson: boolean = false;
     let packageJsonPath: string = util.getExtensionFilePath("package.json");
     if (!packageJsonPath.includes(".vscode-insiders") && !packageJsonPath.includes(".vscode-exploration")) {
         let prevIntelliSenseEngineDefault: any = packageJson.contributes.configuration.properties["C_Cpp.intelliSenseEngine"].default;
@@ -314,20 +315,28 @@ async function finalizeExtensionActivation(): Promise<void> {
             packageJson.contributes.configuration.properties["C_Cpp.intelliSenseEngine"].default = "Tag Parser";
         }
         if (prevIntelliSenseEngineDefault !== packageJson.contributes.configuration.properties["C_Cpp.intelliSenseEngine"].default) {
-            return util.writeFileText(util.getPackageJsonPath(), util.stringifyPackageJson(packageJson));
+            writePackageJson = true;
         }
     } else {
         if (packageJson.contributes.configuration.properties['C_Cpp.updateChannel'].default === 'Default') {
             packageJson.contributes.configuration.properties['C_Cpp.updateChannel'].default = 'Insiders';
-            return util.writeFileText(util.getPackageJsonPath(), util.stringifyPackageJson(packageJson));
+            writePackageJson = true;
         }
     }
 
+    let prevEnhancedColorizationDefault: any = packageJson.contributes.configuration.properties["C_Cpp.enhancedColorization"].default;
     if (abTestSettings.UseEnhancedColorization) {
         packageJson.contributes.configuration.properties["C_Cpp.enhancedColorization"].default = "Enabled";
     } else {
         packageJson.contributes.configuration.properties["C_Cpp.enhancedColorization"].default = "Disabled";
     }
+    if (prevEnhancedColorizationDefault !== packageJson.contributes.configuration.properties["C_Cpp.enhancedColorization"].default) {
+        writePackageJson = true;
+    }
+
+    if (writePackageJson) {
+        return util.writeFileText(util.getPackageJsonPath(), util.stringifyPackageJson(packageJson));
+    }
 }
 
 function rewriteManifest(): Promise<void> {