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

Remove extra check that is not needed

Browse source
This commit is contained in:
Ladislau Szomoru 2021-03-01 15:13:07 +01:00
parent e916637528
commit 73112daff1
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,16 +32,15 @@ export class TypeScriptVersionManager extends Disposable {
this._currentVersion = this.versionProvider.defaultVersion;
if (this.useWorkspaceTsdkSetting) {
if (vscode.workspace.trustState === vscode.WorkspaceTrustState.Unknown) {
setImmediate(() => {
vscode.workspace.requireWorkspaceTrust(false);
});
}
if (this.isWorkspaceTrusted) {
const localVersion = this.versionProvider.localVersion;
if (localVersion) {
this._currentVersion = localVersion;
}
} else {
setImmediate(() => {
vscode.workspace.requireWorkspaceTrust(false);
});
}
}
@ -53,8 +52,8 @@ export class TypeScriptVersionManager extends Disposable {
this._register(vscode.workspace.onDidChangeWorkspaceTrustState((event: vscode.WorkspaceTrustStateChangeEvent) => {
if (this.useWorkspaceTsdkSetting) {
if (event.currentTrustState === vscode.WorkspaceTrustState.Trusted) {
this.updateActiveVersion(this.versionProvider.localVersion ?? this.versionProvider.defaultVersion);
if (event.currentTrustState === vscode.WorkspaceTrustState.Trusted && this.versionProvider.localVersion) {
this.updateActiveVersion(this.versionProvider.localVersion);
} else {
this.updateActiveVersion(this.versionProvider.defaultVersion);
}