development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-18 01:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

update workspace trust status bar visibility

Browse source
This commit is contained in:
SteVen Batten 2021-02-22 13:00:41 -08:00
parent a776fe9af7
commit 9703977dab
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
View file

@ -20,7 +20,7 @@ import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
import { Codicon } from 'vs/base/common/codicons';
import { ThemeColor } from 'vs/workbench/api/common/extHostTypes';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IHostService } from 'vs/workbench/services/host/browser/host';
@ -141,10 +141,13 @@ Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).regi
class WorkspaceTrustStatusbarItem extends Disposable implements IWorkbenchContribution {
private static readonly ID = 'status.workspaceTrust';
private readonly statusBarEntryAccessor: MutableDisposable<IStatusbarEntryAccessor>;
private pendingRequestContextKey = WorkspaceTrustContext.PendingRequest.key;
private contextKeys = new Set([this.pendingRequestContextKey]);
constructor(
@IStatusbarService private readonly statusbarService: IStatusbarService,
@IWorkspaceTrustService private readonly workspaceTrustService: IWorkspaceTrustService
@IWorkspaceTrustService private readonly workspaceTrustService: IWorkspaceTrustService,
@IContextKeyService private readonly contextKeyService: IContextKeyService
) {
super();
@ -154,6 +157,13 @@ class WorkspaceTrustStatusbarItem extends Disposable implements IWorkbenchContri
const entry = this.getStatusbarEntry(this.workspaceTrustService.getWorkspaceTrustState());
this.statusBarEntryAccessor.value = this.statusbarService.addEntry(entry, WorkspaceTrustStatusbarItem.ID, localize('status.WorkspaceTrust', "Workspace Trust"), StatusbarAlignment.LEFT, 0.99 * Number.MAX_VALUE /* Right of remote indicator */);
this._register(this.workspaceTrustService.onDidChangeTrustState(trustState => this.updateStatusbarEntry(trustState)));
this._register(this.contextKeyService.onDidChangeContext((contextChange) => {
if (contextChange.affectsSome(this.contextKeys)) {
this.updateVisibility(this.workspaceTrustService.getWorkspaceTrustState());
}
}));
this.updateVisibility(this.workspaceTrustService.getWorkspaceTrustState());
}
}
@ -173,9 +183,14 @@ class WorkspaceTrustStatusbarItem extends Disposable implements IWorkbenchContri
};
}
private updateStatusbarEntry(trustState: WorkspaceTrustStateChangeEvent): void {
this.statusBarEntryAccessor.value?.update(this.getStatusbarEntry(trustState.currentTrustState));
this.statusbarService.updateEntryVisibility(WorkspaceTrustStatusbarItem.ID, trustState.currentTrustState !== WorkspaceTrustState.Unknown);
private updateVisibility(trustState: WorkspaceTrustState): void {
const pendingRequest = this.contextKeyService.getContextKeyValue(this.pendingRequestContextKey) === true;
this.statusbarService.updateEntryVisibility(WorkspaceTrustStatusbarItem.ID, trustState === WorkspaceTrustState.Untrusted || pendingRequest);
}
private updateStatusbarEntry(trustStateChange: WorkspaceTrustStateChangeEvent): void {
this.statusBarEntryAccessor.value?.update(this.getStatusbarEntry(trustStateChange.currentTrustState));
this.updateVisibility(trustStateChange.currentTrustState);
}
}