From b3ae173294c4abcf08212479ec676c63937535d3 Mon Sep 17 00:00:00 2001 From: gjsjohnmurray Date: Fri, 19 Dec 2025 16:48:59 +0000 Subject: [PATCH 1/5] Standardize the breadcrumb toggle option label (fix #257550) --- .../contrib/stickyScroll/browser/stickyScrollController.ts | 1 + src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts index 0ae4b70ae4543..2c8b1c55fcac8 100644 --- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts +++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts @@ -411,6 +411,7 @@ export class StickyScrollController extends Disposable implements IEditorContrib this._contextMenuService.showContextMenu({ menuId: MenuId.StickyScrollContext, getAnchor: () => event, + menuActionOptions: { renderShortTitle: true }, }); } diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts index e254ff4dbde96..094ee8995fa4b 100644 --- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts +++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts @@ -692,10 +692,11 @@ registerAction2(class ToggleBreadcrumb extends Action2 { super({ id: 'breadcrumbs.toggle', title: localize2('cmd.toggle', "Toggle Breadcrumbs"), + shortTitle: localize2('cmd.toggle.short', "Breadcrumbs"), category: Categories.View, toggled: { condition: ContextKeyExpr.equals('config.breadcrumbs.enabled', true), - title: localize('cmd.toggle2', "Toggle Breadcrumbs"), + title: localize('cmd.toggle2', "Breadcrumbs"), mnemonicTitle: localize({ key: 'miBreadcrumbs2', comment: ['&& denotes a mnemonic'] }, "&&Breadcrumbs") }, menu: [ From 5621c515399a45cf83fc6a529f7494ca6d7f89c3 Mon Sep 17 00:00:00 2001 From: gjsjohnmurray Date: Fri, 19 Dec 2025 17:49:51 +0000 Subject: [PATCH 2/5] Equivalent changes for notebooks --- .../notebook/browser/controller/layoutActions.ts | 10 ++++++---- .../browser/view/cellParts/cellEditorOptions.ts | 3 ++- .../browser/viewParts/notebookEditorStickyScroll.ts | 2 +- .../browser/viewParts/notebookEditorToolbar.ts | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts index e1bc6e7451142..9283f61895267 100644 --- a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts +++ b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts @@ -117,6 +117,7 @@ registerAction2(class ToggleLineNumberFromEditorTitle extends Action2 { super({ id: 'notebook.toggleLineNumbersFromEditorTitle', title: localize2('notebook.toggleLineNumbers', 'Toggle Notebook Line Numbers'), + shortTitle: localize2('notebook.toggleLineNumbers.short', 'Line Numbers'), precondition: NOTEBOOK_EDITOR_FOCUSED, menu: [ { @@ -129,7 +130,7 @@ registerAction2(class ToggleLineNumberFromEditorTitle extends Action2 { f1: true, toggled: { condition: ContextKeyExpr.notEquals('config.notebook.lineNumbers', 'off'), - title: localize('notebook.showLineNumbers', "Notebook Line Numbers"), + title: localize('notebook.showLineNumbers', "Line Numbers"), } }); } @@ -251,13 +252,14 @@ registerAction2(class ToggleNotebookStickyScroll extends Action2 { id: 'notebook.action.toggleNotebookStickyScroll', title: { ...localize2('toggleStickyScroll', "Toggle Notebook Sticky Scroll"), - mnemonicTitle: localize({ key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Toggle Notebook Sticky Scroll"), + mnemonicTitle: localize({ key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Sticky Scroll"), }, + shortTitle: localize2('toggleStickyScroll.short', "Sticky Scroll"), category: Categories.View, toggled: { condition: ContextKeyExpr.equals('config.notebook.stickyScroll.enabled', true), - title: localize('notebookStickyScroll', "Toggle Notebook Sticky Scroll"), - mnemonicTitle: localize({ key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Toggle Notebook Sticky Scroll"), + title: localize('notebookStickyScroll', "Sticky Scroll"), + mnemonicTitle: localize({ key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Sticky Scroll"), }, menu: [ { id: MenuId.CommandPalette }, diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts index 58ae569e6e4eb..a2350b6824ab0 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts @@ -198,6 +198,7 @@ registerAction2(class ToggleLineNumberAction extends Action2 { super({ id: 'notebook.toggleLineNumbers', title: localize2('notebook.toggleLineNumbers', 'Toggle Notebook Line Numbers'), + shortTitle: localize2('notebook.toggleLineNumbers.short', 'Line Numbers'), precondition: NOTEBOOK_EDITOR_FOCUSED, menu: [ { @@ -210,7 +211,7 @@ registerAction2(class ToggleLineNumberAction extends Action2 { f1: true, toggled: { condition: ContextKeyExpr.notEquals('config.notebook.lineNumbers', 'off'), - title: localize('notebook.showLineNumbers', "Notebook Line Numbers"), + title: localize('notebook.showLineNumbers', "Line Numbers"), } }); } diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts index f186efdae0d1b..93331ab07cb90 100644 --- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts +++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts @@ -188,7 +188,7 @@ export class NotebookStickyScroll extends Disposable { this._contextMenuService.showContextMenu({ menuId: MenuId.NotebookStickyScrollContext, getAnchor: () => event, - menuActionOptions: { shouldForwardArgs: true, arg: args }, + menuActionOptions: { shouldForwardArgs: true, arg: args, renderShortTitle: true }, }); } diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts index 91c2ebf389f20..c01fa7525ae6c 100644 --- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts +++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts @@ -284,6 +284,7 @@ export class NotebookEditorWorkbenchToolbar extends Disposable { this.contextMenuService.showContextMenu({ menuId: MenuId.NotebookToolbarContext, getAnchor: () => event, + menuActionOptions: { renderShortTitle: true } }); })); } From 2fd5bc334d610f058347b122ee56119af7604ef8 Mon Sep 17 00:00:00 2001 From: gjsjohnmurray Date: Fri, 19 Dec 2025 18:18:22 +0000 Subject: [PATCH 3/5] Make EditorTitle menu prefer shortTitle --- src/vs/workbench/browser/parts/editor/editorGroupView.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts index a1050be0194de..a2344eaf8f200 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts @@ -2099,7 +2099,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView { const shouldInlineGroup = (action: SubmenuAction, group: string) => group === 'navigation' && action.actions.length <= 1; actions = getActionBarActions( - editorTitleMenu.getActions({ arg: this.resourceContext.get(), shouldForwardArgs: true }), + editorTitleMenu.getActions({ arg: this.resourceContext.get(), shouldForwardArgs: true, renderShortTitle: true }), 'navigation', shouldInlineGroup ); From f00a2a69a4bf66b566f6898a7e66f6f2d752970c Mon Sep 17 00:00:00 2001 From: gjsjohnmurray Date: Fri, 19 Dec 2025 18:19:47 +0000 Subject: [PATCH 4/5] Show breadcrumb toggle state in notebook EditorTitle submenu --- .../contrib/notebook/browser/controller/layoutActions.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts index 9283f61895267..c9511d4624f80 100644 --- a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts +++ b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts @@ -164,7 +164,11 @@ registerAction2(class ToggleBreadcrumbFromEditorTitle extends Action2 { constructor() { super({ id: 'breadcrumbs.toggleFromEditorTitle', - title: localize2('notebook.toggleBreadcrumb', 'Toggle Breadcrumbs'), + title: localize2('notebook.toggleBreadcrumb', 'Breadcrumbs'), + toggled: { + condition: ContextKeyExpr.equals('config.breadcrumbs.enabled', true), + title: localize('cmd.toggle2', "Breadcrumbs") + }, menu: [{ id: MenuId.NotebookEditorLayoutConfigure, group: 'notebookLayoutDetails', From b39aa659175824f66573fa075db4a11e7db2299c Mon Sep 17 00:00:00 2001 From: gjsjohnmurray Date: Mon, 22 Dec 2025 11:02:39 +0000 Subject: [PATCH 5/5] Adopt Copilot feedback --- .../contrib/notebook/browser/controller/layoutActions.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts index c9511d4624f80..167161bc10e34 100644 --- a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts +++ b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts @@ -164,7 +164,8 @@ registerAction2(class ToggleBreadcrumbFromEditorTitle extends Action2 { constructor() { super({ id: 'breadcrumbs.toggleFromEditorTitle', - title: localize2('notebook.toggleBreadcrumb', 'Breadcrumbs'), + title: localize2('notebook.toggleBreadcrumb', 'Toggle Breadcrumbs'), + shortTitle: localize2('notebook.toggleBreadcrumb.short', 'Breadcrumbs'), toggled: { condition: ContextKeyExpr.equals('config.breadcrumbs.enabled', true), title: localize('cmd.toggle2', "Breadcrumbs") @@ -174,6 +175,7 @@ registerAction2(class ToggleBreadcrumbFromEditorTitle extends Action2 { group: 'notebookLayoutDetails', order: 2 }], + category: NOTEBOOK_ACTIONS_CATEGORY, f1: false }); }