@codingame/monaco-vscode-notebook-service-override 2.2.2 → 3.1.0

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/executeActions.js

@@ -2,8 +2,8 @@ import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
@@ -507,14 +507,11 @@ registerAction2(class CancelAllNotebook extends CancelNotebook {
     constructor() {
         super({
             id: CANCEL_NOTEBOOK_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/controller/executeActions',
-                    'notebookActions.cancelNotebook',
-                    "Stop Execution"
-                )),
-                original: 'Stop Execution'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/controller/executeActions',
+                'notebookActions.cancelNotebook',
+                "Stop Execution"
+            )),
             icon: stopIcon,
             menu: [
                 {
@@ -537,14 +534,11 @@ registerAction2(class InterruptNotebook extends CancelNotebook {
     constructor() {
         super({
             id: INTERRUPT_NOTEBOOK_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/controller/executeActions',
-                    'notebookActions.interruptNotebook',
-                    "Interrupt"
-                )),
-                original: 'Interrupt'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/controller/executeActions',
+                'notebookActions.interruptNotebook',
+                "Interrupt"
+            )),
             precondition: ( ContextKeyExpr.and(NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL)),
             icon: stopIcon,
             menu: [
@@ -577,6 +571,17 @@ registerAction2(class InterruptNotebook extends CancelNotebook {
         });
     }
 });
+MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
+    title: ( localizeWithPath(
+        'vs/workbench/contrib/notebook/browser/controller/executeActions',
+        'revealRunningCellShort',
+        "Go To"
+    )),
+    submenu: MenuId.NotebookCellExecuteGoTo,
+    group: 'navigation/execute',
+    order: 20,
+    icon: ThemeIcon.modify(executingStateIcon, 'spin')
+});
 registerAction2(class RevealRunningCellAction extends NotebookAction {
     constructor() {
         super({
@@ -593,8 +598,8 @@ registerAction2(class RevealRunningCellAction extends NotebookAction {
             )),
             shortTitle: ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/controller/executeActions',
-                'revealRunningCellShort',
-                "Go To"
+                'revealRunningCell',
+                "Go to Running Cell"
             )),
             precondition: NOTEBOOK_HAS_RUNNING_CELL,
             menu: [
@@ -605,7 +610,7 @@ registerAction2(class RevealRunningCellAction extends NotebookAction {
                     order: 0
                 },
                 {
-                    id: MenuId.NotebookToolbar,
+                    id: MenuId.NotebookCellExecuteGoTo,
                     when: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_HAS_RUNNING_CELL, ( ContextKeyExpr.equals('config.notebook.globalToolbar', true)))),
                     group: 'navigation/execute',
                     order: 20
@@ -666,7 +671,7 @@ registerAction2(class RevealLastFailedCellAction extends NotebookAction {
             shortTitle: ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/controller/executeActions',
                 'revealLastFailedCellShort',
-                "Go To"
+                "Go to Most Recently Failed Cell"
             )),
             precondition: NOTEBOOK_LAST_CELL_FAILED,
             menu: [
@@ -677,7 +682,7 @@ registerAction2(class RevealLastFailedCellAction extends NotebookAction {
                     order: 0
                 },
                 {
-                    id: MenuId.NotebookToolbar,
+                    id: MenuId.NotebookCellExecuteGoTo,
                     when: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_LAST_CELL_FAILED, ( NOTEBOOK_HAS_RUNNING_CELL.toNegated()), ( ContextKeyExpr.equals('config.notebook.globalToolbar', true)))),
                     group: 'navigation/execute',
                     order: 20

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/insertCellActions.js

@@ -0,0 +1,351 @@
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { InputFocusedContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
+import { insertCell } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
+import { NotebookAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_EDITABLE } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { CellKind, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from './chat/notebookChatContext.js';
+
+const INSERT_CODE_CELL_ABOVE_COMMAND_ID = 'notebook.cell.insertCodeCellAbove';
+const INSERT_CODE_CELL_BELOW_COMMAND_ID = 'notebook.cell.insertCodeCellBelow';
+const INSERT_CODE_CELL_ABOVE_AND_FOCUS_CONTAINER_COMMAND_ID = 'notebook.cell.insertCodeCellAboveAndFocusContainer';
+const INSERT_CODE_CELL_BELOW_AND_FOCUS_CONTAINER_COMMAND_ID = 'notebook.cell.insertCodeCellBelowAndFocusContainer';
+const INSERT_CODE_CELL_AT_TOP_COMMAND_ID = 'notebook.cell.insertCodeCellAtTop';
+const INSERT_MARKDOWN_CELL_ABOVE_COMMAND_ID = 'notebook.cell.insertMarkdownCellAbove';
+const INSERT_MARKDOWN_CELL_BELOW_COMMAND_ID = 'notebook.cell.insertMarkdownCellBelow';
+const INSERT_MARKDOWN_CELL_AT_TOP_COMMAND_ID = 'notebook.cell.insertMarkdownCellAtTop';
+function insertNewCell(accessor, context, kind, direction, focusEditor) {
+    let newCell = null;
+    if (context.ui) {
+        context.notebookEditor.focus();
+    }
+    const languageService = accessor.get(ILanguageService);
+    if (context.cell) {
+        const idx = context.notebookEditor.getCellIndex(context.cell);
+        newCell = insertCell(languageService, context.notebookEditor, idx, kind, direction, undefined, true);
+    }
+    else {
+        const focusRange = context.notebookEditor.getFocus();
+        const next = Math.max(focusRange.end - 1, 0);
+        newCell = insertCell(languageService, context.notebookEditor, next, kind, direction, undefined, true);
+    }
+    return newCell;
+}
+class InsertCellCommand extends NotebookAction {
+    constructor(desc, kind, direction, focusEditor) {
+        super(desc);
+        this.kind = kind;
+        this.direction = direction;
+        this.focusEditor = focusEditor;
+    }
+    async runWithContext(accessor, context) {
+        const newCell = await insertNewCell(accessor, context, this.kind, this.direction);
+        if (newCell) {
+            await context.notebookEditor.focusNotebookCell(newCell, this.focusEditor ? 'editor' : 'container');
+        }
+    }
+}
+registerAction2(class InsertCodeCellAboveAction extends InsertCellCommand {
+    constructor() {
+        super({
+            id: INSERT_CODE_CELL_ABOVE_COMMAND_ID,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+                'notebookActions.insertCodeCellAbove',
+                "Insert Code Cell Above"
+            )),
+            keybinding: {
+                primary: 2048  | 1024  | 3 ,
+                when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( InputFocusedContext.toNegated()))),
+                weight: 200
+            },
+            menu: {
+                id: MenuId.NotebookCellInsert,
+                order: 0
+            }
+        }, CellKind.Code, 'above', true);
+    }
+});
+registerAction2(class InsertCodeCellAboveAndFocusContainerAction extends InsertCellCommand {
+    constructor() {
+        super({
+            id: INSERT_CODE_CELL_ABOVE_AND_FOCUS_CONTAINER_COMMAND_ID,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+                'notebookActions.insertCodeCellAboveAndFocusContainer',
+                "Insert Code Cell Above and Focus Container"
+            ))
+        }, CellKind.Code, 'above', false);
+    }
+});
+registerAction2(class InsertCodeCellBelowAction extends InsertCellCommand {
+    constructor() {
+        super({
+            id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+                'notebookActions.insertCodeCellBelow',
+                "Insert Code Cell Below"
+            )),
+            keybinding: {
+                primary: 2048  | 3 ,
+                when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( InputFocusedContext.toNegated()), ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('')))),
+                weight: 200
+            },
+            menu: {
+                id: MenuId.NotebookCellInsert,
+                order: 1
+            }
+        }, CellKind.Code, 'below', true);
+    }
+});
+registerAction2(class InsertCodeCellBelowAndFocusContainerAction extends InsertCellCommand {
+    constructor() {
+        super({
+            id: INSERT_CODE_CELL_BELOW_AND_FOCUS_CONTAINER_COMMAND_ID,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+                'notebookActions.insertCodeCellBelowAndFocusContainer',
+                "Insert Code Cell Below and Focus Container"
+            )),
+        }, CellKind.Code, 'below', false);
+    }
+});
+registerAction2(class InsertMarkdownCellAboveAction extends InsertCellCommand {
+    constructor() {
+        super({
+            id: INSERT_MARKDOWN_CELL_ABOVE_COMMAND_ID,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+                'notebookActions.insertMarkdownCellAbove',
+                "Insert Markdown Cell Above"
+            )),
+            menu: {
+                id: MenuId.NotebookCellInsert,
+                order: 2
+            }
+        }, CellKind.Markup, 'above', true);
+    }
+});
+registerAction2(class InsertMarkdownCellBelowAction extends InsertCellCommand {
+    constructor() {
+        super({
+            id: INSERT_MARKDOWN_CELL_BELOW_COMMAND_ID,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+                'notebookActions.insertMarkdownCellBelow',
+                "Insert Markdown Cell Below"
+            )),
+            menu: {
+                id: MenuId.NotebookCellInsert,
+                order: 3
+            }
+        }, CellKind.Markup, 'below', true);
+    }
+});
+registerAction2(class InsertCodeCellAtTopAction extends NotebookAction {
+    constructor() {
+        super({
+            id: INSERT_CODE_CELL_AT_TOP_COMMAND_ID,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+                'notebookActions.insertCodeCellAtTop',
+                "Add Code Cell At Top"
+            )),
+            f1: false
+        });
+    }
+    async run(accessor, context) {
+        context = context ?? this.getEditorContextFromArgsOrActive(accessor);
+        if (context) {
+            this.runWithContext(accessor, context);
+        }
+    }
+    async runWithContext(accessor, context) {
+        const languageService = accessor.get(ILanguageService);
+        const newCell = insertCell(languageService, context.notebookEditor, 0, CellKind.Code, 'above', undefined, true);
+        if (newCell) {
+            await context.notebookEditor.focusNotebookCell(newCell, 'editor');
+        }
+    }
+});
+registerAction2(class InsertMarkdownCellAtTopAction extends NotebookAction {
+    constructor() {
+        super({
+            id: INSERT_MARKDOWN_CELL_AT_TOP_COMMAND_ID,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+                'notebookActions.insertMarkdownCellAtTop',
+                "Add Markdown Cell At Top"
+            )),
+            f1: false
+        });
+    }
+    async run(accessor, context) {
+        context = context ?? this.getEditorContextFromArgsOrActive(accessor);
+        if (context) {
+            this.runWithContext(accessor, context);
+        }
+    }
+    async runWithContext(accessor, context) {
+        const languageService = accessor.get(ILanguageService);
+        const newCell = insertCell(languageService, context.notebookEditor, 0, CellKind.Markup, 'above', undefined, true);
+        if (newCell) {
+            await context.notebookEditor.focusNotebookCell(newCell, 'editor');
+        }
+    }
+});
+MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
+    command: {
+        id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
+        title: '$(add) ' + ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertCode',
+            "Code"
+        )),
+        tooltip: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertCode.tooltip',
+            "Add Code Cell"
+        ))
+    },
+    order: 0,
+    group: 'inline',
+    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( ContextKeyExpr.notEquals('config.notebook.experimental.insertToolbarAlignment', 'left'))))
+});
+MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
+    command: {
+        id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertCode.minimalToolbar',
+            "Add Code"
+        )),
+        icon: Codicon.add,
+        tooltip: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertCode.tooltip',
+            "Add Code Cell"
+        ))
+    },
+    order: 0,
+    group: 'inline',
+    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( ContextKeyExpr.equals('config.notebook.experimental.insertToolbarAlignment', 'left'))))
+});
+MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
+    command: {
+        id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
+        icon: Codicon.add,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertCode.ontoolbar',
+            "Code"
+        )),
+        tooltip: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertCode.tooltip',
+            "Add Code Cell"
+        ))
+    },
+    order: -5,
+    group: 'navigation/add',
+    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'betweenCells')), ( ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'hidden'))))
+});
+MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
+    command: {
+        id: INSERT_CODE_CELL_AT_TOP_COMMAND_ID,
+        title: '$(add) ' + ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertCode',
+            "Code"
+        )),
+        tooltip: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertCode.tooltip',
+            "Add Code Cell"
+        ))
+    },
+    order: 0,
+    group: 'inline',
+    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( ContextKeyExpr.notEquals('config.notebook.experimental.insertToolbarAlignment', 'left'))))
+});
+MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
+    command: {
+        id: INSERT_CODE_CELL_AT_TOP_COMMAND_ID,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertCode.minimaltoolbar',
+            "Add Code"
+        )),
+        icon: Codicon.add,
+        tooltip: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertCode.tooltip',
+            "Add Code Cell"
+        ))
+    },
+    order: 0,
+    group: 'inline',
+    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( ContextKeyExpr.equals('config.notebook.experimental.insertToolbarAlignment', 'left'))))
+});
+MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
+    command: {
+        id: INSERT_MARKDOWN_CELL_BELOW_COMMAND_ID,
+        title: '$(add) ' + ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertMarkdown',
+            "Markdown"
+        )),
+        tooltip: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertMarkdown.tooltip',
+            "Add Markdown Cell"
+        ))
+    },
+    order: 1,
+    group: 'inline',
+    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( ContextKeyExpr.notEquals('config.notebook.experimental.insertToolbarAlignment', 'left'))))
+});
+MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
+    command: {
+        id: INSERT_MARKDOWN_CELL_BELOW_COMMAND_ID,
+        icon: Codicon.add,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertMarkdown.ontoolbar',
+            "Markdown"
+        )),
+        tooltip: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertMarkdown.tooltip',
+            "Add Markdown Cell"
+        ))
+    },
+    order: -5,
+    group: 'navigation/add',
+    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'betweenCells')), ( ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'hidden')), ( ContextKeyExpr.notEquals(`config.${NotebookSetting.globalToolbarShowLabel}`, false)), ( ContextKeyExpr.notEquals(`config.${NotebookSetting.globalToolbarShowLabel}`, 'never'))))
+});
+MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
+    command: {
+        id: INSERT_MARKDOWN_CELL_AT_TOP_COMMAND_ID,
+        title: '$(add) ' + ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertMarkdown',
+            "Markdown"
+        )),
+        tooltip: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/insertCellActions',
+            'notebookActions.menu.insertMarkdown.tooltip',
+            "Add Markdown Cell"
+        ))
+    },
+    order: 1,
+    group: 'inline',
+    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( ContextKeyExpr.notEquals('config.notebook.experimental.insertToolbarAlignment', 'left'))))
+});
+
+export { InsertCellCommand, insertNewCell };

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.js

@@ -1,6 +1,7 @@
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
-import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, Action2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
@@ -17,14 +18,11 @@ registerAction2(class NotebookConfigureLayoutAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.notebook.layout.select',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/controller/layoutActions',
-                    'workbench.notebook.layout.select.label',
-                    "Select between Notebook Layouts"
-                )),
-                original: 'Select between Notebook Layouts'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/controller/layoutActions',
+                'workbench.notebook.layout.select.label',
+                "Select between Notebook Layouts"
+            )),
             f1: true,
             precondition: ( ContextKeyExpr.equals(`config.${NotebookSetting.openGettingStarted}`, true)),
             category: NOTEBOOK_ACTIONS_CATEGORY,
@@ -52,14 +50,11 @@ registerAction2(class NotebookConfigureLayoutAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.notebook.layout.configure',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/controller/layoutActions',
-                    'workbench.notebook.layout.configure.label',
-                    "Customize Notebook Layout"
-                )),
-                original: 'Customize Notebook Layout'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/controller/layoutActions',
+                'workbench.notebook.layout.configure.label',
+                "Customize Notebook Layout"
+            )),
             f1: true,
             category: NOTEBOOK_ACTIONS_CATEGORY,
             menu: [
@@ -80,14 +75,11 @@ registerAction2(class NotebookConfigureLayoutFromEditorTitle extends Action2 {
     constructor() {
         super({
             id: 'workbench.notebook.layout.configure.editorTitle',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/controller/layoutActions',
-                    'workbench.notebook.layout.configure.label',
-                    "Customize Notebook Layout"
-                )),
-                original: 'Customize Notebook Layout'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/controller/layoutActions',
+                'workbench.notebook.layout.configure.label',
+                "Customize Notebook Layout"
+            )),
             f1: false,
             category: NOTEBOOK_ACTIONS_CATEGORY,
             menu: [
@@ -104,6 +96,19 @@ registerAction2(class NotebookConfigureLayoutFromEditorTitle extends Action2 {
         accessor.get(IPreferencesService).openSettings({ jsonEditor: false, query: '@tag:notebookLayout' });
     }
 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
+    submenu: MenuId.NotebookEditorLayoutConfigure,
+    rememberDefaultAction: false,
+    title: ( localize2WithPath(
+        'vs/workbench/contrib/notebook/browser/controller/layoutActions',
+        'customizeNotebook',
+        "Customize Notebook..."
+    )),
+    icon: Codicon.gear,
+    group: 'navigation',
+    order: -1,
+    when: NOTEBOOK_IS_ACTIVE_EDITOR
+});
 registerAction2(class ToggleLineNumberFromEditorTitle extends Action2 {
     constructor() {
         super({
@@ -185,14 +190,11 @@ registerAction2(class SaveMimeTypeDisplayOrder extends Action2 {
     constructor() {
         super({
             id: 'notebook.saveMimeTypeOrder',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/controller/layoutActions',
-                    'notebook.saveMimeTypeOrder',
-                    'Save Mimetype Display Order'
-                )),
-                original: 'Save Mimetype Display Order'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/controller/layoutActions',
+                'notebook.saveMimeTypeOrder',
+                "Save Mimetype Display Order"
+            )),
             f1: true,
             category: NOTEBOOK_ACTIONS_CATEGORY,
             precondition: NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -233,14 +235,11 @@ registerAction2(class NotebookWebviewResetAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.notebook.layout.webview.reset',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/controller/layoutActions',
-                    'workbench.notebook.layout.webview.reset.label',
-                    "Reset Notebook Webview"
-                )),
-                original: 'Reset Notebook Webview'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/controller/layoutActions',
+                'workbench.notebook.layout.webview.reset.label',
+                "Reset Notebook Webview"
+            )),
             f1: false,
             category: NOTEBOOK_ACTIONS_CATEGORY
         });