Fixes microsoft#38189

alexdima · alexdima · commit 8fdebbd381c4 · 2017-12-06T16:30:26.000+01:00
diff --git a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
@@ -330,7 +330,7 @@ class WordHighlighter {
 			this.renderDecorationsTimer = -1;
 			this.renderDecorations();
 		} else {
-			// Asyncrhonous
+			// Asynchronous
 			this.renderDecorationsTimer = setTimeout(() => {
 				this.renderDecorations();
 			}, (minimumRenderTime - currentTime));
diff --git a/src/vs/platform/contextkey/browser/contextKeyService.ts b/src/vs/platform/contextkey/browser/contextKeyService.ts
@@ -235,7 +235,11 @@ export abstract class AbstractContextKeyService implements IContextKeyService {
 	}
 
 	public setContext(key: string, value: any): void {
-		if (this.getContextValuesContainer(this._myContextId).setValue(key, value)) {
+		const myContext = this.getContextValuesContainer(this._myContextId);
+		if (!myContext) {
+			return;
+		}
+		if (myContext.setValue(key, value)) {
 			this._onDidChangeContextKey.fire(key);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,11 @@ export abstract class AbstractContextKeyService implements IContextKeyService {`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`public setContext(key: string, value: any): void {`
`238`		`- if (this.getContextValuesContainer(this._myContextId).setValue(key, value)) {`
	`238`	`+ const myContext = this.getContextValuesContainer(this._myContextId);`
	`239`	`+ if (!myContext) {`
	`240`	`+ return;`
	`241`	`+ }`
	`242`	`+ if (myContext.setValue(key, value)) {`
`239`	`243`	`this._onDidChangeContextKey.fire(key);`
`240`	`244`	`}`
`241`	`245`	`}`