Skip to content

Commit 8f61775

Browse files
authored
views - support aux sidebar for menu (microsoft#233075)
1 parent 234dcfa commit 8f61775

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

src/vs/workbench/contrib/chat/browser/chatParticipantContributions.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,13 +308,15 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
308308
canMoveView: true,
309309
openCommandActionDescriptor: {
310310
id: CHAT_SIDEBAR_PANEL_ID,
311+
title: this._viewContainer.title,
312+
mnemonicTitle: localize({ key: 'miToggleChat', comment: ['&& denotes a mnemonic'] }, "&&Chat"),
311313
keybindings: {
312314
primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyI,
313315
mac: {
314316
primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KeyI
315317
}
316318
},
317-
order: 100
319+
order: 1
318320
},
319321
ctorDescriptor: new SyncDescriptor(ChatViewPane, [{ ___location: ChatAgentLocation.Panel }]),
320322
when: ContextKeyExpr.or(ChatContextKeys.panelParticipantRegistered, ChatContextKeys.extensionInvalid)
@@ -351,13 +353,15 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
351353
canMoveView: true,
352354
openCommandActionDescriptor: {
353355
id: viewContainerId,
356+
title,
357+
mnemonicTitle: localize({ key: 'miToggleEdits', comment: ['&& denotes a mnemonic'] }, "Copilot Ed&&its"),
354358
keybindings: {
355359
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI,
356360
linux: {
357361
primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyI
358362
}
359363
},
360-
order: 101
364+
order: 2
361365
},
362366
ctorDescriptor: new SyncDescriptor(ChatViewPane, [{ ___location: ChatAgentLocation.EditingSession }]),
363367
when: ChatContextKeys.editingParticipantRegistered

src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,5 +358,5 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
358358
precondition: CAN_TOGGLE_WORD_WRAP
359359
},
360360
order: 1,
361-
group: '5_editor'
361+
group: '6_editor'
362362
});

src/vs/workbench/services/views/browser/viewsService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ export class ViewsService extends Disposable implements IViewsService {
455455
id,
456456
title: mnemonicTitle,
457457
},
458-
group: defaultLocation === ViewContainerLocation.Sidebar ? '3_views' : '4_panels',
458+
group: defaultLocation === ViewContainerLocation.Sidebar ? '3_sidebar' : defaultLocation === ViewContainerLocation.AuxiliaryBar ? '4_auxbar' : '5_panel',
459459
when: ContextKeyExpr.has(getEnabledViewContainerContextKey(viewContainer.id)),
460460
order: order ?? Number.MAX_VALUE
461461
}));
@@ -524,7 +524,7 @@ export class ViewsService extends Disposable implements IViewsService {
524524
id: commandId,
525525
title: viewDescriptor.openCommandActionDescriptor.mnemonicTitle,
526526
},
527-
group: defaultLocation === ViewContainerLocation.Sidebar ? '3_views' : '4_panels',
527+
group: defaultLocation === ViewContainerLocation.Sidebar ? '3_sidebar' : defaultLocation === ViewContainerLocation.AuxiliaryBar ? '4_auxbar' : '5_panel',
528528
when: ContextKeyExpr.has(`${viewDescriptor.id}.active`),
529529
order: viewDescriptor.openCommandActionDescriptor.order ?? Number.MAX_VALUE
530530
}));

0 commit comments

Comments
 (0)