From 4b6011db2653b9797fc08a5735154ba27a32bdb0 Mon Sep 17 00:00:00 2001 From: Alexandru Dima Date: Fri, 22 Nov 2019 17:30:42 +0100 Subject: [PATCH] Add workarounds for bad tests --- .../common/services/modelServiceImpl.ts | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts index 07a0874862a..3b9734e0a16 100644 --- a/src/vs/editor/common/services/modelServiceImpl.ts +++ b/src/vs/editor/common/services/modelServiceImpl.ts @@ -466,9 +466,12 @@ class SemanticStyling extends Disposable { ) { super(); this._caches = new WeakMap(); - this._register(this._themeService.onThemeChange(() => { - this._caches = new WeakMap(); - })); + if (this._themeService) { + // workaround for tests which use undefined... :/ + this._register(this._themeService.onThemeChange(() => { + this._caches = new WeakMap(); + })); + } } public get(provider: SemanticColoringProvider): SemanticColoringProviderStyling { @@ -629,11 +632,14 @@ class ModelSemanticColoring extends Disposable { this._register(this._model.onDidChangeContent(e => this._fetchSemanticTokens.schedule())); this._register(SemanticColoringProviderRegistry.onDidChange(e => this._fetchSemanticTokens.schedule())); - this._register(themeService.onThemeChange(_ => { - // clear out existing tokens - this._setSemanticTokens(null, null, []); - this._fetchSemanticTokens.schedule(); - })); + if (themeService) { + // workaround for tests which use undefined... :/ + this._register(themeService.onThemeChange(_ => { + // clear out existing tokens + this._setSemanticTokens(null, null, []); + this._fetchSemanticTokens.schedule(); + })); + } this._fetchSemanticTokens.schedule(0); } -- GitLab