Skip to content

fix: re-assert active editor context on workspace trust change #335615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Birarpanjot Singh Kanwer (arpankanwer) wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −0
Open

fix: re-assert active editor context on workspace trust change #335615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/vs/workbench/browser/parts/editor/editorGroupView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import { IEditorResolverService } from '../../../services/editor/common/editorRe
import { IHostService } from '../../../services/host/browser/host.js';
import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
import { FileSystemProviderCapabilities, IFileService } from '../../../../platform/files/common/files.js';
import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';

export class EditorGroupView extends Themable implements IEditorGroupView {

Expand Down Expand Up @@ -175,6 +176,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
@IHostService private readonly hostService: IHostService,
@IDialogService private readonly dialogService: IDialogService,
@IFileService private readonly fileService: IFileService,
@IWorkspaceTrustManagementService private readonly workspaceTrustService: IWorkspaceTrustManagementService,
@ICommandService private readonly commandService: ICommandService
) {
super(themeService);
Expand Down Expand Up @@ -391,6 +393,9 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
// the dirty state of this editor
this._register(this.onDidActiveEditorChange(() => observeActiveEditor()));

// Re-assert active editor context keys on trust change.
this._register(this.workspaceTrustService.onDidChangeTrust(() => observeActiveEditor()));

// Update context keys on startup
observeActiveEditor();
updateGroupContextKeys({ kind: GroupModelChangeKind.EDITOR_ACTIVE });
Expand Down