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

Simplify transition code

Browse source
This commit is contained in:
Ladislau Szomoru 2021-05-11 14:13:40 +02:00
parent 1e810cafb7
commit 50d78f1585
No known key found for this signature in database
GPG key ID: 2B88287CB9DB080B
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,7 +50,6 @@ export class WorkspaceTrustManagementService extends Disposable implements IWork
private readonly _onDidChangeTrustedFolders = this._register(new Emitter<void>());
readonly onDidChangeTrustedFolders = this._onDidChangeTrustedFolders.event;
private _isWorkspaceTransitionInProgress: boolean = false;
private _isWorkspaceTrusted: boolean = false;
private _trustStateInfo: IWorkspaceTrustInfo;
@ -77,16 +76,12 @@ export class WorkspaceTrustManagementService extends Disposable implements IWork
this._register(this.workspaceService.onDidChangeWorkspaceFolders(async () => await this.updateWorkspaceTrust()));
this._register(this.workspaceService.onDidChangeWorkbenchState(async () => await this.updateWorkspaceTrust()));
this._register(this.storageService.onDidChangeValue(async changeEvent => {
if (changeEvent.key === this.storageKey) {
/* This will only execute if storage was changed by a user action in a separate window */
if (changeEvent.key === this.storageKey && JSON.stringify(this._trustStateInfo) !== JSON.stringify(this.loadTrustInfo())) {
this._trustStateInfo = this.loadTrustInfo();
this._onDidChangeTrustedFolders.fire();
// Asynchronously update the workspace trust state so that if there is
// an attempt to synchronously update workspace trust state that would
// take precedence.
// Updating the workspace trust state asynchronously should only occur
// if the storage has been updated due to an action in a separate window.
setTimeout(async () => await this.updateWorkspaceTrust());
await this.updateWorkspaceTrust();
}
}));
}
@ -119,6 +114,8 @@ export class WorkspaceTrustManagementService extends Disposable implements IWork
private async saveTrustInfo(): Promise<void> {
this.storageService.store(this.storageKey, JSON.stringify(this._trustStateInfo), StorageScope.GLOBAL, StorageTarget.MACHINE);
this._onDidChangeTrustedFolders.fire();
await this.updateWorkspaceTrust();
}
@ -168,12 +165,9 @@ export class WorkspaceTrustManagementService extends Disposable implements IWork
private async updateWorkspaceTrust(): Promise<void> {
const trusted = this.calculateWorkspaceTrust();
if (this.isWorkpaceTrusted() === trusted) { return; }
if (this._isWorkspaceTransitionInProgress) { return; }
// Run workspace trust transition participants
this._isWorkspaceTransitionInProgress = true;
await this._trustTransitionManager.participate(trusted);
this._isWorkspaceTransitionInProgress = false;
this._isWorkspaceTrusted = trusted;
this._onDidChangeTrust.fire(trusted);