maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use method instead of event

Browse source
This commit is contained in:
Ladislau Szomoru 2021-03-01 20:05:22 +01:00
parent c30e2d46b2
commit f18a340066
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
extensions/typescript-language-features/src/tsServer/versionManager.ts
View file

@ -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<void>());