@codingame/monaco-vscode-notebook-service-override 11.1.2 → 12.0.0

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

@@ -1,4 +1,6 @@
+
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 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';
@@ -6,17 +8,17 @@ import { localize, localize2 } 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.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { EditorsOrder } from 'vscode/vscode/vs/workbench/common/editor';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
-import { CTX_INLINE_CHAT_FOCUSED } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
-import { insertCell } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
-import { NotebookChatController } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
-import { NotebookAction, executeNotebookCondition, getContextFromUri, getContextFromActiveEditor, NotebookMultiCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, cellExecutionArgs, parseMultiCellExecutionArgs, CELL_TITLE_CELL_GROUP_ID, NotebookCellAction } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { CellEditState, EXECUTE_CELL_COMMAND_ID, ScrollToRevealBehavior, CellFocusMode } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { executeAllIcon, executeIcon, executeAboveIcon, executeBelowIcon, stopIcon, executingStateIcon, errorStateIcon } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { CTX_INLINE_CHAT_FOCUSED } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { insertCell } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
+import { NotebookChatController } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
+import { NotebookAction, executeNotebookCondition, getContextFromUri, getContextFromActiveEditor, NotebookMultiCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, cellExecutionArgs, parseMultiCellExecutionArgs, CellToolbarOrder, CELL_TITLE_CELL_GROUP_ID, NotebookCellAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { CellEditState, EXECUTE_CELL_COMMAND_ID, ScrollToRevealBehavior, CellFocusMode } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { executeAllIcon, executeIcon, executeAboveIcon, executeBelowIcon, stopIcon, executingStateIcon, errorStateIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellKind, NotebookSetting, CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_CELL_TYPE, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_LAST_CELL_FAILED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { NOTEBOOK_CELL_TYPE, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_LAST_CELL_FAILED } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -33,15 +35,13 @@ const EXECUTE_CELLS_ABOVE = 'notebook.cell.executeCellsAbove';
 const RENDER_ALL_MARKDOWN_CELLS = 'notebook.renderAllMarkdownCells';
 const REVEAL_RUNNING_CELL = 'notebook.revealRunningCell';
 const REVEAL_LAST_FAILED_CELL = 'notebook.revealLastFailedCell';
-const executeCondition = ( (ContextKeyExpr.and(
-     (NOTEBOOK_CELL_TYPE.isEqualTo('code')),
-     (ContextKeyExpr.or(
-        ContextKeyExpr.greater(NOTEBOOK_KERNEL_COUNT.key, 0),
-        ContextKeyExpr.greater(NOTEBOOK_KERNEL_SOURCE_COUNT.key, 0),
-        NOTEBOOK_MISSING_KERNEL_EXTENSION
-    ))
-)));
-const executeThisCellCondition = ( (ContextKeyExpr.and(executeCondition,  (NOTEBOOK_CELL_EXECUTING.toNegated()))));
+const executeCondition = ( ContextKeyExpr.and(( NOTEBOOK_CELL_TYPE.isEqualTo('code')), ( ContextKeyExpr.or(
+    ContextKeyExpr.greater(NOTEBOOK_KERNEL_COUNT.key, 0),
+    ContextKeyExpr.greater(NOTEBOOK_KERNEL_SOURCE_COUNT.key, 0),
+    NOTEBOOK_MISSING_KERNEL_EXTENSION
+))));
+const executeThisCellCondition = ( ContextKeyExpr.and(executeCondition, ( NOTEBOOK_CELL_EXECUTING.toNegated())));
+const executeSectionCondition = ( ContextKeyExpr.and(( NOTEBOOK_CELL_TYPE.isEqualTo('markup'))));
 function renderAllMarkdownCells(context) {
     for (let i = 0; i < context.notebookEditor.getLength(); i++) {
         const cell = context.notebookEditor.cellAt(i);
@@ -88,7 +88,7 @@ registerAction2(class RenderAllMarkdownCellsAction extends NotebookAction {
     constructor() {
         super({
             id: RENDER_ALL_MARKDOWN_CELLS,
-            title: ( localize(8043, "Render All Markdown Cells")),
+            title: ( localize(7471, "Render All Markdown Cells")),
         });
     }
     async runWithContext(accessor, context) {
@@ -99,10 +99,10 @@ registerAction2(class ExecuteNotebookAction extends NotebookAction {
     constructor() {
         super({
             id: EXECUTE_NOTEBOOK_COMMAND_ID,
-            title: ( localize(8044, "Run All")),
+            title: ( localize(7472, "Run All")),
             icon: executeAllIcon,
             metadata: {
-                description: ( localize(8044, "Run All")),
+                description: ( localize(7472, "Run All")),
                 args: [
                     {
                         name: 'uri',
@@ -115,27 +115,13 @@ registerAction2(class ExecuteNotebookAction extends NotebookAction {
                     id: MenuId.EditorTitle,
                     order: -1,
                     group: 'navigation',
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_IS_ACTIVE_EDITOR,
-                        executeNotebookCondition,
-                         (ContextKeyExpr.or(
-                             (NOTEBOOK_INTERRUPTIBLE_KERNEL.toNegated()),
-                             (NOTEBOOK_HAS_SOMETHING_RUNNING.toNegated())
-                        )),
-                         (ContextKeyExpr.notEquals('config.notebook.globalToolbar', true))
-                    )))
+                    when: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, executeNotebookCondition, ( ContextKeyExpr.or(( NOTEBOOK_INTERRUPTIBLE_KERNEL.toNegated()), ( NOTEBOOK_HAS_SOMETHING_RUNNING.toNegated()))), ( ContextKeyExpr.notEquals('config.notebook.globalToolbar', true))))
                 },
                 {
                     id: MenuId.NotebookToolbar,
                     order: -1,
                     group: 'navigation/execute',
-                    when: ( (ContextKeyExpr.and(executeNotebookCondition,  (ContextKeyExpr.or(
-                         (NOTEBOOK_INTERRUPTIBLE_KERNEL.toNegated()),
-                         (NOTEBOOK_HAS_SOMETHING_RUNNING.toNegated())
-                    )), ( (ContextKeyExpr.and(
-                        NOTEBOOK_HAS_SOMETHING_RUNNING,
-                         (NOTEBOOK_INTERRUPTIBLE_KERNEL.toNegated())
-                    )))?.negate(),  (ContextKeyExpr.equals('config.notebook.globalToolbar', true)))))
+                    when: ( ContextKeyExpr.and(executeNotebookCondition, ( ContextKeyExpr.or(( NOTEBOOK_INTERRUPTIBLE_KERNEL.toNegated()), ( NOTEBOOK_HAS_SOMETHING_RUNNING.toNegated()))), ( ContextKeyExpr.and(NOTEBOOK_HAS_SOMETHING_RUNNING, ( NOTEBOOK_INTERRUPTIBLE_KERNEL.toNegated())))?.negate(), ( ContextKeyExpr.equals('config.notebook.globalToolbar', true))))
                 }
             ]
         });
@@ -146,7 +132,7 @@ registerAction2(class ExecuteNotebookAction extends NotebookAction {
     async runWithContext(accessor, context) {
         renderAllMarkdownCells(context);
         const editorService = accessor.get(IEditorService);
-        const editor = editorService.getEditors(0 ).find(editor => editor.editor instanceof NotebookEditorInput && editor.editor.viewType === context.notebookEditor.textModel.viewType && ( (editor.editor.resource.toString())) === ( (context.notebookEditor.textModel.uri.toString())));
+        const editor = editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).find(editor => editor.editor instanceof NotebookEditorInput && editor.editor.viewType === context.notebookEditor.textModel.viewType && ( editor.editor.resource.toString()) === ( context.notebookEditor.textModel.uri.toString()));
         const editorGroupService = accessor.get(IEditorGroupsService);
         if (editor) {
             const group = editorGroupService.getGroup(editor.groupId);
@@ -160,15 +146,12 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
         super({
             id: EXECUTE_CELL_COMMAND_ID,
             precondition: executeThisCellCondition,
-            title: ( localize(8045, "Execute Cell")),
+            title: ( localize(7473, "Execute Cell")),
             keybinding: {
-                when: ( (ContextKeyExpr.or(
-                    NOTEBOOK_CELL_LIST_FOCUSED,
-                     (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))
-                ))),
-                primary: 256  | 3 ,
+                when: NOTEBOOK_CELL_LIST_FOCUSED,
+                primary: KeyMod.WinCtrl | KeyCode.Enter,
                 win: {
-                    primary: 2048  | 512  | 3
+                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Enter
                 },
                 weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
             },
@@ -178,7 +161,7 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
                 group: 'inline'
             },
             metadata: {
-                description: ( localize(8045, "Execute Cell")),
+                description: ( localize(7473, "Execute Cell")),
                 args: cellExecutionArgs
             },
             icon: executeIcon
@@ -212,23 +195,17 @@ registerAction2(class ExecuteAboveCells extends NotebookMultiCellAction {
         super({
             id: EXECUTE_CELLS_ABOVE,
             precondition: executeCondition,
-            title: ( localize(8046, "Execute Above Cells")),
+            title: ( localize(7474, "Execute Above Cells")),
             menu: [
                 {
                     id: MenuId.NotebookCellExecute,
-                    when: ( (ContextKeyExpr.and(
-                        executeCondition,
-                         (ContextKeyExpr.equals(`config.${NotebookSetting.consolidatedRunButton}`, true))
-                    )))
+                    when: ( ContextKeyExpr.and(executeCondition, ( ContextKeyExpr.equals(`config.${NotebookSetting.consolidatedRunButton}`, true))))
                 },
                 {
                     id: MenuId.NotebookCellTitle,
-                    order: 1 ,
+                    order: CellToolbarOrder.ExecuteAboveCells,
                     group: CELL_TITLE_CELL_GROUP_ID,
-                    when: ( (ContextKeyExpr.and(
-                        executeCondition,
-                         (ContextKeyExpr.equals(`config.${NotebookSetting.consolidatedRunButton}`, false))
-                    )))
+                    when: ( ContextKeyExpr.and(executeCondition, ( ContextKeyExpr.equals(`config.${NotebookSetting.consolidatedRunButton}`, false))))
                 }
             ],
             icon: executeAboveIcon
@@ -244,7 +221,7 @@ registerAction2(class ExecuteAboveCells extends NotebookMultiCellAction {
             await context.notebookEditor.focusNotebookCell(context.cell, 'container', { skipReveal: true });
         }
         else {
-            endCellIdx = Math.min(...( (context.selectedCells.map(cell => context.notebookEditor.getCellIndex(cell)))));
+            endCellIdx = Math.min(...( context.selectedCells.map(cell => context.notebookEditor.getCellIndex(cell))));
         }
         if (typeof endCellIdx === 'number') {
             const range = { start: 0, end: endCellIdx };
@@ -258,23 +235,17 @@ registerAction2(class ExecuteCellAndBelow extends NotebookMultiCellAction {
         super({
             id: EXECUTE_CELL_AND_BELOW,
             precondition: executeCondition,
-            title: ( localize(8047, "Execute Cell and Below")),
+            title: ( localize(7475, "Execute Cell and Below")),
             menu: [
                 {
                     id: MenuId.NotebookCellExecute,
-                    when: ( (ContextKeyExpr.and(
-                        executeCondition,
-                         (ContextKeyExpr.equals(`config.${NotebookSetting.consolidatedRunButton}`, true))
-                    )))
+                    when: ( ContextKeyExpr.and(executeCondition, ( ContextKeyExpr.equals(`config.${NotebookSetting.consolidatedRunButton}`, true))))
                 },
                 {
                     id: MenuId.NotebookCellTitle,
-                    order: 2 ,
+                    order: CellToolbarOrder.ExecuteCellAndBelow,
                     group: CELL_TITLE_CELL_GROUP_ID,
-                    when: ( (ContextKeyExpr.and(
-                        executeCondition,
-                         (ContextKeyExpr.equals(`config.${NotebookSetting.consolidatedRunButton}`, false))
-                    )))
+                    when: ( ContextKeyExpr.and(executeCondition, ( ContextKeyExpr.equals(`config.${NotebookSetting.consolidatedRunButton}`, false))))
                 }
             ],
             icon: executeBelowIcon
@@ -290,7 +261,7 @@ registerAction2(class ExecuteCellAndBelow extends NotebookMultiCellAction {
             await context.notebookEditor.focusNotebookCell(context.cell, 'container', { skipReveal: true });
         }
         else {
-            startCellIdx = Math.min(...( (context.selectedCells.map(cell => context.notebookEditor.getCellIndex(cell)))));
+            startCellIdx = Math.min(...( context.selectedCells.map(cell => context.notebookEditor.getCellIndex(cell))));
         }
         if (typeof startCellIdx === 'number') {
             const range = { start: startCellIdx, end: context.notebookEditor.getLength() };
@@ -304,9 +275,9 @@ registerAction2(class ExecuteCellFocusContainer extends NotebookMultiCellAction
         super({
             id: EXECUTE_CELL_FOCUS_CONTAINER_COMMAND_ID,
             precondition: executeThisCellCondition,
-            title: ( localize(8048, "Execute Cell and Focus Container")),
+            title: ( localize(7476, "Execute Cell and Focus Container")),
             metadata: {
-                description: ( localize(8048, "Execute Cell and Focus Container")),
+                description: ( localize(7476, "Execute Cell and Focus Container")),
                 args: cellExecutionArgs
             },
             icon: executeIcon
@@ -329,16 +300,13 @@ registerAction2(class ExecuteCellFocusContainer extends NotebookMultiCellAction
         await runCell(editorGroupsService, context);
     }
 });
-const cellCancelCondition = ( (ContextKeyExpr.or(
-     (ContextKeyExpr.equals(NOTEBOOK_CELL_EXECUTION_STATE.key, 'executing')),
-     (ContextKeyExpr.equals(NOTEBOOK_CELL_EXECUTION_STATE.key, 'pending'))
-)));
+const cellCancelCondition = ( ContextKeyExpr.or(( ContextKeyExpr.equals(NOTEBOOK_CELL_EXECUTION_STATE.key, 'executing')), ( ContextKeyExpr.equals(NOTEBOOK_CELL_EXECUTION_STATE.key, 'pending'))));
 registerAction2(class CancelExecuteCell extends NotebookMultiCellAction {
     constructor() {
         super({
             id: CANCEL_CELL_COMMAND_ID,
             precondition: cellCancelCondition,
-            title: ( localize(8049, "Stop Cell Execution")),
+            title: ( localize(7477, "Stop Cell Execution")),
             icon: stopIcon,
             menu: {
                 id: MenuId.NotebookCellExecutePrimary,
@@ -346,7 +314,7 @@ registerAction2(class CancelExecuteCell extends NotebookMultiCellAction {
                 group: 'inline'
             },
             metadata: {
-                description: ( localize(8049, "Stop Cell Execution")),
+                description: ( localize(7477, "Stop Cell Execution")),
                 args: [
                     {
                         name: 'options',
@@ -400,17 +368,11 @@ registerAction2(class ExecuteCellSelectBelow extends NotebookCellAction {
     constructor() {
         super({
             id: EXECUTE_CELL_SELECT_BELOW,
-            precondition: ( (ContextKeyExpr.or(
-                executeThisCellCondition,
-                 (NOTEBOOK_CELL_TYPE.isEqualTo('markup'))
-            ))),
-            title: ( localize(8050, "Execute Notebook Cell and Select Below")),
+            precondition: ( ContextKeyExpr.or(executeThisCellCondition, ( NOTEBOOK_CELL_TYPE.isEqualTo('markup')))),
+            title: ( localize(7478, "Execute Notebook Cell and Select Below")),
             keybinding: {
-                when: ( (ContextKeyExpr.and(
-                    NOTEBOOK_CELL_LIST_FOCUSED,
-                     (CTX_INLINE_CHAT_FOCUSED.negate())
-                ))),
-                primary: 1024  | 3 ,
+                when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( CTX_INLINE_CHAT_FOCUSED.negate()))),
+                primary: KeyMod.Shift | KeyCode.Enter,
                 weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
             },
         });
@@ -466,14 +428,11 @@ registerAction2(class ExecuteCellInsertBelow extends NotebookCellAction {
     constructor() {
         super({
             id: EXECUTE_CELL_INSERT_BELOW,
-            precondition: ( (ContextKeyExpr.or(
-                executeThisCellCondition,
-                 (NOTEBOOK_CELL_TYPE.isEqualTo('markup'))
-            ))),
-            title: ( localize(8051, "Execute Notebook Cell and Insert Below")),
+            precondition: ( ContextKeyExpr.or(executeThisCellCondition, ( NOTEBOOK_CELL_TYPE.isEqualTo('markup')))),
+            title: ( localize(7479, "Execute Notebook Cell and Insert Below")),
             keybinding: {
                 when: NOTEBOOK_CELL_LIST_FOCUSED,
-                primary: 512  | 3 ,
+                primary: KeyMod.Alt | KeyCode.Enter,
                 weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
             },
         });
@@ -507,29 +466,20 @@ registerAction2(class CancelAllNotebook extends CancelNotebook {
     constructor() {
         super({
             id: CANCEL_NOTEBOOK_COMMAND_ID,
-            title: ( localize2(8052, "Stop Execution")),
+            title: ( localize2(7480, "Stop Execution")),
             icon: stopIcon,
             menu: [
                 {
                     id: MenuId.EditorTitle,
                     order: -1,
                     group: 'navigation',
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_IS_ACTIVE_EDITOR,
-                        NOTEBOOK_HAS_SOMETHING_RUNNING,
-                         (NOTEBOOK_INTERRUPTIBLE_KERNEL.toNegated()),
-                         (ContextKeyExpr.notEquals('config.notebook.globalToolbar', true))
-                    )))
+                    when: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_HAS_SOMETHING_RUNNING, ( NOTEBOOK_INTERRUPTIBLE_KERNEL.toNegated()), ( ContextKeyExpr.notEquals('config.notebook.globalToolbar', true))))
                 },
                 {
                     id: MenuId.NotebookToolbar,
                     order: -1,
                     group: 'navigation/execute',
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_HAS_SOMETHING_RUNNING,
-                         (NOTEBOOK_INTERRUPTIBLE_KERNEL.toNegated()),
-                         (ContextKeyExpr.equals('config.notebook.globalToolbar', true))
-                    )))
+                    when: ( ContextKeyExpr.and(NOTEBOOK_HAS_SOMETHING_RUNNING, ( NOTEBOOK_INTERRUPTIBLE_KERNEL.toNegated()), ( ContextKeyExpr.equals('config.notebook.globalToolbar', true))))
                 }
             ]
         });
@@ -539,30 +489,30 @@ registerAction2(class InterruptNotebook extends CancelNotebook {
     constructor() {
         super({
             id: INTERRUPT_NOTEBOOK_COMMAND_ID,
-            title: ( localize2(8053, "Interrupt")),
-            precondition: ( (ContextKeyExpr.and(NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL))),
+            title: ( localize2(7481, "Interrupt")),
+            precondition: ( ContextKeyExpr.and(NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL)),
             icon: stopIcon,
             menu: [
                 {
                     id: MenuId.EditorTitle,
                     order: -1,
                     group: 'navigation',
-                    when: ( (ContextKeyExpr.and(
+                    when: ( ContextKeyExpr.and(
                         NOTEBOOK_IS_ACTIVE_EDITOR,
                         NOTEBOOK_HAS_SOMETHING_RUNNING,
                         NOTEBOOK_INTERRUPTIBLE_KERNEL,
-                         (ContextKeyExpr.notEquals('config.notebook.globalToolbar', true))
-                    )))
+                        ( ContextKeyExpr.notEquals('config.notebook.globalToolbar', true))
+                    ))
                 },
                 {
                     id: MenuId.NotebookToolbar,
                     order: -1,
                     group: 'navigation/execute',
-                    when: ( (ContextKeyExpr.and(
+                    when: ( ContextKeyExpr.and(
                         NOTEBOOK_HAS_SOMETHING_RUNNING,
                         NOTEBOOK_INTERRUPTIBLE_KERNEL,
-                         (ContextKeyExpr.equals('config.notebook.globalToolbar', true))
-                    )))
+                        ( ContextKeyExpr.equals('config.notebook.globalToolbar', true))
+                    ))
                 },
                 {
                     id: MenuId.InteractiveToolbar,
@@ -573,7 +523,7 @@ registerAction2(class InterruptNotebook extends CancelNotebook {
     }
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
-    title: ( localize(8054, "Go To")),
+    title: ( localize(7482, "Go To")),
     submenu: MenuId.NotebookCellExecuteGoTo,
     group: 'navigation/execute',
     order: 20,
@@ -583,37 +533,26 @@ registerAction2(class RevealRunningCellAction extends NotebookAction {
     constructor() {
         super({
             id: REVEAL_RUNNING_CELL,
-            title: ( localize(8055, "Go to Running Cell")),
-            tooltip: ( localize(8055, "Go to Running Cell")),
-            shortTitle: ( localize(8055, "Go to Running Cell")),
+            title: ( localize(7483, "Go to Running Cell")),
+            tooltip: ( localize(7483, "Go to Running Cell")),
+            shortTitle: ( localize(7483, "Go to Running Cell")),
             precondition: NOTEBOOK_HAS_RUNNING_CELL,
             menu: [
                 {
                     id: MenuId.EditorTitle,
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_IS_ACTIVE_EDITOR,
-                        NOTEBOOK_HAS_RUNNING_CELL,
-                         (ContextKeyExpr.notEquals('config.notebook.globalToolbar', true))
-                    ))),
+                    when: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_HAS_RUNNING_CELL, ( ContextKeyExpr.notEquals('config.notebook.globalToolbar', true)))),
                     group: 'navigation',
                     order: 0
                 },
                 {
                     id: MenuId.NotebookCellExecuteGoTo,
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_IS_ACTIVE_EDITOR,
-                        NOTEBOOK_HAS_RUNNING_CELL,
-                         (ContextKeyExpr.equals('config.notebook.globalToolbar', true))
-                    ))),
+                    when: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_HAS_RUNNING_CELL, ( ContextKeyExpr.equals('config.notebook.globalToolbar', true)))),
                     group: 'navigation/execute',
                     order: 20
                 },
                 {
                     id: MenuId.InteractiveToolbar,
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_HAS_RUNNING_CELL,
-                         (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))
-                    ))),
+                    when: ( ContextKeyExpr.and(NOTEBOOK_HAS_RUNNING_CELL, ( ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')))),
                     group: 'navigation',
                     order: 10
                 }
@@ -641,7 +580,7 @@ registerAction2(class RevealRunningCellAction extends NotebookAction {
                 const sf = thread.getTopStackFrame();
                 if (sf) {
                     const parsed = CellUri.parse(sf.source.uri);
-                    if (parsed && ( (parsed.notebook.toString())) === ( (notebook.toString()))) {
+                    if (parsed && ( parsed.notebook.toString()) === ( notebook.toString())) {
                         return parsed.handle;
                     }
                 }
@@ -654,30 +593,20 @@ registerAction2(class RevealLastFailedCellAction extends NotebookAction {
     constructor() {
         super({
             id: REVEAL_LAST_FAILED_CELL,
-            title: ( localize(8056, "Go to Most Recently Failed Cell")),
-            tooltip: ( localize(8056, "Go to Most Recently Failed Cell")),
-            shortTitle: ( localize(8057, "Go to Most Recently Failed Cell")),
+            title: ( localize(7484, "Go to Most Recently Failed Cell")),
+            tooltip: ( localize(7484, "Go to Most Recently Failed Cell")),
+            shortTitle: ( localize(7485, "Go to Most Recently Failed Cell")),
             precondition: NOTEBOOK_LAST_CELL_FAILED,
             menu: [
                 {
                     id: MenuId.EditorTitle,
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_IS_ACTIVE_EDITOR,
-                        NOTEBOOK_LAST_CELL_FAILED,
-                         (NOTEBOOK_HAS_RUNNING_CELL.toNegated()),
-                         (ContextKeyExpr.notEquals('config.notebook.globalToolbar', true))
-                    ))),
+                    when: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_LAST_CELL_FAILED, ( NOTEBOOK_HAS_RUNNING_CELL.toNegated()), ( ContextKeyExpr.notEquals('config.notebook.globalToolbar', true)))),
                     group: 'navigation',
                     order: 0
                 },
                 {
                     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))
-                    ))),
+                    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
                 },
@@ -698,4 +627,4 @@ registerAction2(class RevealLastFailedCellAction extends NotebookAction {
     }
 });
 
-export { executeCondition, executeThisCellCondition };
+export { executeCondition, executeSectionCondition, executeThisCellCondition };

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

@@ -0,0 +1,13 @@
+import { IAction2Options } from "vscode/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { INotebookActionContext, NotebookAction } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions";
+import { CellViewModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl";
+import { CellKind } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
+export declare function insertNewCell(accessor: ServicesAccessor, context: INotebookActionContext, kind: CellKind, direction: "above" | "below", focusEditor: boolean): CellViewModel | null;
+export declare abstract class InsertCellCommand extends NotebookAction {
+    private kind;
+    private direction;
+    private focusEditor;
+    constructor(desc: Readonly<IAction2Options>, kind: CellKind, direction: "above" | "below", focusEditor: boolean);
+    runWithContext(accessor: ServicesAccessor, context: INotebookActionContext): Promise<void>;
+}