From f18a34006683c4ecdf100c2529e23159e7b2a9af Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru Date: Mon, 1 Mar 2021 20:05:22 +0100 Subject: [PATCH] Use method instead of event --- .../src/tsServer/versionManager.ts | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/extensions/typescript-language-features/src/tsServer/versionManager.ts b/extensions/typescript-language-features/src/tsServer/versionManager.ts index 79308f94cc9..4bfa453de9d 100644 --- a/extensions/typescript-language-features/src/tsServer/versionManager.ts +++ b/extensions/typescript-language-features/src/tsServer/versionManager.ts @@ -39,7 +39,14 @@ export class TypeScriptVersionManager extends Disposable { } } else { setImmediate(() => { - vscode.workspace.requireWorkspaceTrust(false); + vscode.workspace.requireWorkspaceTrust(false) + .then(trustState => { + if (trustState === vscode.WorkspaceTrustState.Trusted && this.versionProvider.localVersion) { + this.updateActiveVersion(this.versionProvider.localVersion); + } else { + this.updateActiveVersion(this.versionProvider.defaultVersion); + } + }); }); } } @@ -50,16 +57,6 @@ export class TypeScriptVersionManager extends Disposable { }); } - this._register(vscode.workspace.onDidChangeWorkspaceTrustState((event: vscode.WorkspaceTrustStateChangeEvent) => { - if (this.useWorkspaceTsdkSetting) { - if (event.currentTrustState === vscode.WorkspaceTrustState.Trusted && this.versionProvider.localVersion) { - this.updateActiveVersion(this.versionProvider.localVersion); - } else { - this.updateActiveVersion(this.versionProvider.defaultVersion); - } - } - })); - } private readonly _onDidPickNewVersion = this._register(new vscode.EventEmitter());