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

#126057

Browse source
This commit is contained in:
Ladislau Szomoru 2021-06-14 10:21:19 +02:00
parent e1161be268
commit 3ee7bdd575
No known key found for this signature in database
GPG key ID: 2B88287CB9DB080B
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/vs/workbench/services/workspaces/common/workspaceTrust.ts
View file

@ -129,15 +129,17 @@ export class WorkspaceTrustManagementService extends Disposable implements IWork
private initializeWorkspaceTrust(): void { private initializeWorkspaceTrust(): void {
// Resolve canonical Uris // Resolve canonical Uris
this.resolveCanonicalUris().then(async () => { this.resolveCanonicalUris()
this._canonicalUrisResolved = true; .then(async () => {
await this.updateWorkspaceTrust(); this._canonicalUrisResolved = true;
await this.updateWorkspaceTrust();
this._workspaceResolvedPromiseResolve(); })
if (!this.environmentService.remoteAuthority) { .finally(() => {
this._workspaceTrustInitializedPromiseResolve(); this._workspaceResolvedPromiseResolve();
} if (!this.environmentService.remoteAuthority) {
}); this._workspaceTrustInitializedPromiseResolve();
}
});
// Remote - resolve remote authority // Remote - resolve remote authority
if (this.environmentService.remoteAuthority) { if (this.environmentService.remoteAuthority) {
@ -145,7 +147,8 @@ export class WorkspaceTrustManagementService extends Disposable implements IWork
.then(async result => { .then(async result => {
this._remoteAuthority = result; this._remoteAuthority = result;
await this.updateWorkspaceTrust(); await this.updateWorkspaceTrust();
})
.finally(() => {
this._workspaceTrustInitializedPromiseResolve(); this._workspaceTrustInitializedPromiseResolve();
}); });
} }