views - support aux sidebar for menu (#233075)

pull/233081/head^2
Benjamin Pasero 2024-11-05 13:01:38 +01:00 committed by GitHub
parent 234dcfa82d
commit 8f61775e3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 5 deletions

View File

@ -308,13 +308,15 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
canMoveView: true,
openCommandActionDescriptor: {
id: CHAT_SIDEBAR_PANEL_ID,
title: this._viewContainer.title,
mnemonicTitle: localize({ key: 'miToggleChat', comment: ['&& denotes a mnemonic'] }, "&&Chat"),
keybindings: {
primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyI,
mac: {
primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KeyI
}
},
order: 100
order: 1
},
ctorDescriptor: new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.Panel }]),
when: ContextKeyExpr.or(ChatContextKeys.panelParticipantRegistered, ChatContextKeys.extensionInvalid)
@ -351,13 +353,15 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
canMoveView: true,
openCommandActionDescriptor: {
id: viewContainerId,
title,
mnemonicTitle: localize({ key: 'miToggleEdits', comment: ['&& denotes a mnemonic'] }, "Copilot Ed&&its"),
keybindings: {
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI,
linux: {
primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyI
}
},
order: 101
order: 2
},
ctorDescriptor: new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.EditingSession }]),
when: ChatContextKeys.editingParticipantRegistered

View File

@ -358,5 +358,5 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
precondition: CAN_TOGGLE_WORD_WRAP
},
order: 1,
group: '5_editor'
group: '6_editor'
});

View File

@ -455,7 +455,7 @@ export class ViewsService extends Disposable implements IViewsService {
id,
title: mnemonicTitle,
},
group: defaultLocation === ViewContainerLocation.Sidebar ? '3_views' : '4_panels',
group: defaultLocation === ViewContainerLocation.Sidebar ? '3_sidebar' : defaultLocation === ViewContainerLocation.AuxiliaryBar ? '4_auxbar' : '5_panel',
when: ContextKeyExpr.has(getEnabledViewContainerContextKey(viewContainer.id)),
order: order ?? Number.MAX_VALUE
}));
@ -524,7 +524,7 @@ export class ViewsService extends Disposable implements IViewsService {
id: commandId,
title: viewDescriptor.openCommandActionDescriptor.mnemonicTitle,
},
group: defaultLocation === ViewContainerLocation.Sidebar ? '3_views' : '4_panels',
group: defaultLocation === ViewContainerLocation.Sidebar ? '3_sidebar' : defaultLocation === ViewContainerLocation.AuxiliaryBar ? '4_auxbar' : '5_panel',
when: ContextKeyExpr.has(`${viewDescriptor.id}.active`),
order: viewDescriptor.openCommandActionDescriptor.order ?? Number.MAX_VALUE
}));