Skip to content
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

Jump to bottom

aux window - scope editor service in title bar #198450

Merged
merged 1 commit into from
Nov 16, 2023
Merged

aux window - scope editor service in title bar #198450

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ export class TitlebarPart extends Part implements ITitleService {

private readonly windowTitle: WindowTitle;

private readonly editorService: IEditorService;

constructor(
@IContextMenuService private readonly contextMenuService: IContextMenuService,
@IConfigurationService protected readonly configurationService: IConfigurationService,
Expand All @@ -121,12 +123,13 @@ export class TitlebarPart extends Part implements ITitleService {
@IHostService private readonly hostService: IHostService,
@IHoverService hoverService: IHoverService,
@IEditorGroupsService private editorGroupService: IEditorGroupsService,
@IEditorService private editorService: IEditorService,
@IEditorService editorService: IEditorService,
@IMenuService private readonly menuService: IMenuService,
@IKeybindingService private readonly keybindingService: IKeybindingService,
) {
super(Parts.TITLEBAR_PART, { hasTitle: false }, themeService, storageService, layoutService);
this.windowTitle = this._register(instantiationService.createInstance(WindowTitle, mainWindow, 'main'));
this.editorService = editorService.createScoped('main', this._store);

this.titleBarStyle = getTitleBarStyle(this.configurationService);

Expand Down Expand Up @@ -371,7 +374,7 @@ export class TitlebarPart extends Part implements ITitleService {
}

// --- Editor Actions
const activeEditorPane = this.editorGroupService.activeGroup?.activeEditorPane;
const activeEditorPane = this.editorGroupService.mainPart.activeGroup?.activeEditorPane;
if (activeEditorPane && activeEditorPane instanceof EditorPane) {
const result = activeEditorPane.getActionViewItem(action);

Expand All @@ -385,7 +388,7 @@ export class TitlebarPart extends Part implements ITitleService {
}

protected getKeybinding(action: IAction): ResolvedKeybinding | undefined {
const editorPaneAwareContextKeyService = this.editorGroupService.activeGroup?.activeEditorPane?.scopedContextKeyService ?? this.contextKeyService;
const editorPaneAwareContextKeyService = this.editorGroupService.mainPart.activeGroup?.activeEditorPane?.scopedContextKeyService ?? this.contextKeyService;
return this.keybindingService.lookupKeybinding(action.id, editorPaneAwareContextKeyService);
}

Expand All @@ -410,7 +413,7 @@ export class TitlebarPart extends Part implements ITitleService {
this.actionToolBarDisposable.add(this.actionToolBar);

if (this.editorActionsEnabled) {
this.actionToolBarDisposable.add(this.editorGroupService.onDidChangeActiveGroup(() => this.createActionToolBarMenus({ editorActions: true })));
this.actionToolBarDisposable.add(this.editorGroupService.mainPart.onDidChangeActiveGroup(() => this.createActionToolBarMenus({ editorActions: true })));
}
}

Expand All @@ -426,7 +429,7 @@ export class TitlebarPart extends Part implements ITitleService {
if (this.editorActionsEnabled) {
this.editorActionsChangeDisposable.clear();

const activeGroup = this.editorGroupService.activeGroup;
const activeGroup = this.editorGroupService.mainPart.activeGroup;
if (activeGroup) { // Can be undefined on startup
const editorActions = activeGroup.createEditorActions(this.editorActionsChangeDisposable);

Expand Down Expand Up @@ -464,7 +467,7 @@ export class TitlebarPart extends Part implements ITitleService {
// The editor toolbar menu is handled by the editor group so we do not need to manage it here.
// However, depending on the active editor, we need to update the context and action runner of the toolbar menu.
if (this.editorActionsEnabled && this.editorService.activeEditor !== undefined) {
const context: IEditorCommandsContext = { groupId: this.editorGroupService.activeGroup.id };
const context: IEditorCommandsContext = { groupId: this.editorGroupService.mainPart.activeGroup.id };

this.actionToolBar.actionRunner = new EditorCommandsContextActionRunner(context);
this.actionToolBar.context = context;
Expand Down