Modify light theme coloration; Add decorationRangePair interface; Guard against undefined return value

Author: grdowns

Extension/src/LanguageServer/client.ts

@@ -21,6 +21,7 @@ import { createProtocolFilter } from './protocolFilter';
 import { DataBinding } from './dataBinding';
 import minimatch = require("minimatch");
 import * as logger from '../logger';
+import { deactivate } from './extension';
 
 let ui: UI;
 
@@ -193,6 +194,11 @@ export function createNullClient(): Client {
     return new NullClient();
 }
 
+interface decorationRangesPair {
+    decoration: vscode.TextEditorDecorationType;
+    ranges: vscode.Range[];
+}
+
 class DefaultClient implements Client {
     private languageClient: LanguageClient; // The "client" that launches and communicates with our language "server" process.
     private disposables: vscode.Disposable[] = [];
@@ -205,7 +211,7 @@ class DefaultClient implements Client {
     private crashTimes: number[] = [];
     private failureMessageShown = new PersistentState<boolean>("DefaultClient.failureMessageShown", false);
     private isSupported: boolean = true;
-    private inactiveRegionsDecorations = new Map<string, [vscode.TextEditorDecorationType, vscode.Range[]]>();
+    private inactiveRegionsDecorations = new Map<string, decorationRangesPair>();
 
     // The "model" that is displayed via the UI (status bar).
     private model: ClientModel = {
@@ -393,8 +399,10 @@ class DefaultClient implements Client {
     public onDidChangeVisibleTextEditors(editors: vscode.TextEditor[]): void {
         //Apply text decorations to inactive regions
         for (let e of editors) {
-            let valuePair: [vscode.TextEditorDecorationType, vscode.Range[]] = this.inactiveRegionsDecorations.get(e.document.uri.toString());
-            e.setDecorations(valuePair[0], valuePair[1]); // VSCode clears the decorations when the text editor becomes invisible
+            let valuePair: decorationRangesPair = this.inactiveRegionsDecorations.get(e.document.uri.toString());
+            //if (valuePair !== undefined) {
+                e.setDecorations(valuePair.decoration, valuePair.ranges); // VSCode clears the decorations when the text editor becomes invisible
+            //}
         }
     }
 
@@ -639,21 +647,25 @@ class DefaultClient implements Client {
 
     private updateInactiveRegions(params: InactiveRegionParams): void {
         let renderOptions: vscode.DecorationRenderOptions = {
-            light: { color: "rgba(125,125,125,1.0)" },
+            light: { color: "rgba(175,175,175,1.0)" },
             dark: { color: "rgba(155,155,155,1.0)" }
         };
         let decoration: vscode.TextEditorDecorationType = vscode.window.createTextEditorDecorationType(renderOptions);
 
         // Recycle the active text decorations when we receive a new set of inactive regions
-        let valuePair: [vscode.TextEditorDecorationType, vscode.Range[]] = this.inactiveRegionsDecorations.get(params.uri);
+        let valuePair: decorationRangesPair = this.inactiveRegionsDecorations.get(params.uri);
         if (valuePair !== undefined) {
             // Disposing of and resetting the decoration will undo previously applied text decorations
-            valuePair[0].dispose();
-            valuePair[0] = decoration;
+            valuePair.decoration.dispose();
+            valuePair.decoration = decoration;
 
-            valuePair[1] = params.ranges; // As vscode.TextEditor.setDecorations only applies to visible editors, we must cache the range for when another editor becomes visible
+            valuePair.ranges = params.ranges; // As vscode.TextEditor.setDecorations only applies to visible editors, we must cache the range for when another editor becomes visible
         } else { // The entry does not exist. Make a new one
-            this.inactiveRegionsDecorations.set(params.uri, [decoration, params.ranges]);
+            let toInsert: decorationRangesPair = {
+                decoration: decoration,
+                ranges: params.ranges
+            };
+            this.inactiveRegionsDecorations.set(params.uri, toInsert);
         }
 
         // Apply the decorations to all *visible* text editors