Enable enhancedColorization by default. Fix refresh race in colorization.ts (#3770)

Author: Colengms

Extension/package.json

@@ -503,7 +503,7 @@
             "Enabled",
             "Disabled"
           ],
-          "default": "Disabled",
+          "default": "Enabled",
           "description": "If enabled, code is colorized based on IntelliSense. This setting has no effect if IntelliSense is disabled.",
           "scope": "resource"
         }

Extension/src/LanguageServer/colorization.ts

@@ -442,7 +442,7 @@ export class ColorizationState {
         this.disposeColorizationDecorations();
     }
 
-    public refresh(e: vscode.TextEditor): void {
+    private refreshInner(e: vscode.TextEditor): void {
         // Clear inactive regions
         if (this.inactiveDecoration) {
             e.setDecorations(this.inactiveDecoration, []);
@@ -466,19 +466,26 @@ export class ColorizationState {
             }
         }
         // Apply dimming last
-        if (settings.dimInactiveRegions && this.inactiveRanges) {
+        if (settings.dimInactiveRegions && this.inactiveDecoration && this.inactiveRanges) {
             e.setDecorations(this.inactiveDecoration, this.inactiveRanges);
         }
     }
 
+    public refresh(e: vscode.TextEditor): void {
+        let f: () => void = async () => {
+            this.refreshInner(e);
+        };
+        this.colorizationSettings.syncWithLoadingSettings(f);
+    }
+
     public onSettingsChanged(uri: vscode.Uri): void {
         let f: () => void = async () => {
             this.disposeColorizationDecorations();
             let isCpp: boolean = util.isEditorFileCpp(uri.toString());
             this.createColorizationDecorations(isCpp);
             let editors: vscode.TextEditor[] = vscode.window.visibleTextEditors.filter(e => e.document.uri === uri);
             for (let e of editors) {
-                this.refresh(e);
+                this.refreshInner(e);
             }
         };
         this.colorizationSettings.syncWithLoadingSettings(f);
@@ -650,7 +657,7 @@ export class ColorizationState {
             // Apply the decorations to all *visible* text editors
             let editors: vscode.TextEditor[] = vscode.window.visibleTextEditors.filter(e => e.document.uri.toString() === uri);
             for (let e of editors) {
-                this.refresh(e);
+                this.refreshInner(e);
             }
         };
         this.colorizationSettings.syncWithLoadingSettings(f);