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

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.js

@@ -1,17 +1,19 @@
-import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+
+import { KeyMod, KeyCode, KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Mimes } from 'vscode/vscode/vs/base/common/mime';
 import { IBulkEditService, ResourceTextEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContext, InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
-import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { moveCellRange, copyCellRange, computeCellLinesContents, joinCellsWithSurrounds, joinSelectedCells, changeCellToKind } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { NotebookCellAction, CELL_TITLE_CELL_GROUP_ID, NotebookMultiCellAction, parseMultiCellExecutionArgs, cellExecutionArgs } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, EXPAND_CELL_OUTPUT_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_HAS_OUTPUTS } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { moveUpIcon, moveDownIcon, splitCellIcon } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
-import { CellKind, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { moveCellRange, copyCellRange, computeCellLinesContents, joinCellsWithSurrounds, joinSelectedCells, changeCellToKind } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
+import { NotebookCellAction, CellOverflowToolbarGroups, CellToolbarOrder, CELL_TITLE_CELL_GROUP_ID, NotebookMultiCellAction, parseMultiCellExecutionArgs, cellExecutionArgs } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, EXPAND_CELL_OUTPUT_COMMAND_ID } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_HAS_OUTPUTS } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { moveUpIcon, moveDownIcon, splitCellIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { CellEditType, CellKind, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -24,17 +26,17 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: MOVE_CELL_UP_COMMAND_ID,
-            title: ( localize2(8176, "Move Cell Up")),
+            title: ( localize2(7279, "Move Cell Up")),
             icon: moveUpIcon,
             keybinding: {
-                primary: 512  | 16 ,
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED,  (InputFocusedContext.toNegated())))),
-                weight: 200
+                primary: KeyMod.Alt | KeyCode.UpArrow,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( InputFocusedContext.toNegated()))),
+                weight: KeybindingWeight.WorkbenchContrib
             },
             menu: {
                 id: MenuId.NotebookCellTitle,
-                when: ( (ContextKeyExpr.equals('config.notebook.dragAndDropEnabled', false))),
-                group: "3_edit" ,
+                when: ( ContextKeyExpr.equals('config.notebook.dragAndDropEnabled', false)),
+                group: CellOverflowToolbarGroups.Edit,
                 order: 14
             }
         });
@@ -47,17 +49,17 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: MOVE_CELL_DOWN_COMMAND_ID,
-            title: ( localize2(8177, "Move Cell Down")),
+            title: ( localize2(7280, "Move Cell Down")),
             icon: moveDownIcon,
             keybinding: {
-                primary: 512  | 18 ,
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED,  (InputFocusedContext.toNegated())))),
-                weight: 200
+                primary: KeyMod.Alt | KeyCode.DownArrow,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( InputFocusedContext.toNegated()))),
+                weight: KeybindingWeight.WorkbenchContrib
             },
             menu: {
                 id: MenuId.NotebookCellTitle,
-                when: ( (ContextKeyExpr.equals('config.notebook.dragAndDropEnabled', false))),
-                group: "3_edit" ,
+                when: ( ContextKeyExpr.equals('config.notebook.dragAndDropEnabled', false)),
+                group: CellOverflowToolbarGroups.Edit,
                 order: 14
             }
         });
@@ -70,11 +72,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_UP_COMMAND_ID,
-            title: ( localize2(8178, "Copy Cell Up")),
+            title: ( localize2(7281, "Copy Cell Up")),
             keybinding: {
-                primary: 512  | 1024  | 16 ,
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED,  (InputFocusedContext.toNegated())))),
-                weight: 200
+                primary: KeyMod.Alt | KeyMod.Shift | KeyCode.UpArrow,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( InputFocusedContext.toNegated()))),
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
@@ -86,16 +88,16 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_DOWN_COMMAND_ID,
-            title: ( localize2(8179, "Copy Cell Down")),
+            title: ( localize2(7282, "Copy Cell Down")),
             keybinding: {
-                primary: 512  | 1024  | 18 ,
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED,  (InputFocusedContext.toNegated())))),
-                weight: 200
+                primary: KeyMod.Alt | KeyMod.Shift | KeyCode.DownArrow,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( InputFocusedContext.toNegated()))),
+                weight: KeybindingWeight.WorkbenchContrib
             },
             menu: {
                 id: MenuId.NotebookCellTitle,
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE))),
-                group: "3_edit" ,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE)),
+                group: CellOverflowToolbarGroups.Edit,
                 order: 13
             }
         });
@@ -112,27 +114,23 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: SPLIT_CELL_COMMAND_ID,
-            title: ( localize2(8180, "Split Cell")),
+            title: ( localize2(7283, "Split Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
-                when: ( (ContextKeyExpr.and(
-                    NOTEBOOK_EDITOR_EDITABLE,
-                    NOTEBOOK_CELL_EDITABLE,
-                     (NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated())
-                ))),
-                order: 4 ,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, ( NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated()))),
+                order: CellToolbarOrder.SplitCell,
                 group: CELL_TITLE_CELL_GROUP_ID
             },
             icon: splitCellIcon,
             keybinding: {
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
                     NOTEBOOK_EDITOR_EDITABLE,
                     NOTEBOOK_CELL_EDITABLE,
                     EditorContextKeys.editorTextFocus
-                ))),
-                primary: KeyChord(2048  | 41 , 2048  | 1024  | 93 ),
-                weight: 200
+                )),
+                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Backslash),
+                weight: KeybindingWeight.WorkbenchContrib
             },
         });
     }
@@ -156,23 +154,23 @@ registerAction2(class extends NotebookCellAction {
                 const mime = cell.mime;
                 const textModel = await cell.resolveTextModel();
                 await bulkEditService.apply([
-                    ( (new ResourceTextEdit(
-                    cell.uri,
-                    { range: textModel.getFullModelRange(), text: newLinesContents[0] }
-                ))),
-                    ( (new ResourceNotebookCellEdit(context.notebookEditor.textModel.uri, {
-                        editType: 1 ,
+                    ( new ResourceTextEdit(
+                        cell.uri,
+                        { range: textModel.getFullModelRange(), text: newLinesContents[0] }
+                    )),
+                    ( new ResourceNotebookCellEdit(context.notebookEditor.textModel.uri, {
+                        editType: CellEditType.Replace,
                         index: index + 1,
                         count: 0,
-                        cells: ( (newLinesContents.slice(1).map(line => ({
+                        cells: ( newLinesContents.slice(1).map(line => ({
                             cellKind: kind,
                             language,
                             mime,
                             source: line,
                             outputs: [],
                             metadata: {}
-                        }))))
-                    })))
+                        })))
+                    }))
                 ], { quotableLabel: 'Split Notebook Cell' });
             }
         }
@@ -182,16 +180,16 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_CELL_ABOVE_COMMAND_ID,
-            title: ( localize2(8181, "Join With Previous Cell")),
+            title: ( localize2(7284, "Join With Previous Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
-                primary: 256  | 512  | 1024  | 40 ,
-                weight: 200
+                primary: KeyMod.WinCtrl | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyJ,
+                weight: KeybindingWeight.WorkbenchContrib
             },
             menu: {
                 id: MenuId.NotebookCellTitle,
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE))),
-                group: "3_edit" ,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE)),
+                group: CellOverflowToolbarGroups.Edit,
                 order: 10
             }
         });
@@ -205,16 +203,16 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_CELL_BELOW_COMMAND_ID,
-            title: ( localize2(8182, "Join With Next Cell")),
+            title: ( localize2(7285, "Join With Next Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
-                primary: 256  | 512  | 40 ,
-                weight: 200
+                primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.KeyJ,
+                weight: KeybindingWeight.WorkbenchContrib
             },
             menu: {
                 id: MenuId.NotebookCellTitle,
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE))),
-                group: "3_edit" ,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE)),
+                group: CellOverflowToolbarGroups.Edit,
                 order: 11
             }
         });
@@ -228,11 +226,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_SELECTED_CELLS_COMMAND_ID,
-            title: ( localize2(8183, "Join Selected Cells")),
+            title: ( localize2(7286, "Join Selected Cells")),
             menu: {
                 id: MenuId.NotebookCellTitle,
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE))),
-                group: "3_edit" ,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE)),
+                group: CellOverflowToolbarGroups.Edit,
                 order: 12
             }
         });
@@ -249,29 +247,26 @@ registerAction2(class ChangeCellToCodeAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: CHANGE_CELL_TO_CODE_COMMAND_ID,
-            title: ( localize2(8184, "Change Cell to Code")),
+            title: ( localize2(7287, "Change Cell to Code")),
             keybinding: {
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
                     ContextKeyExpr.not(InputFocusedContextKey),
-                     (NOTEBOOK_OUTPUT_FOCUSED.toNegated())
-                ))),
-                primary: 55 ,
-                weight: 200
+                    ( NOTEBOOK_OUTPUT_FOCUSED.toNegated())
+                )),
+                primary: KeyCode.KeyY,
+                weight: KeybindingWeight.WorkbenchContrib
             },
-            precondition: ( (ContextKeyExpr.and(
-                NOTEBOOK_IS_ACTIVE_EDITOR,
-                 (NOTEBOOK_CELL_TYPE.isEqualTo('markup'))
-            ))),
+            precondition: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, ( NOTEBOOK_CELL_TYPE.isEqualTo('markup')))),
             menu: {
                 id: MenuId.NotebookCellTitle,
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
                     NOTEBOOK_EDITOR_EDITABLE,
                     NOTEBOOK_CELL_EDITABLE,
-                     (NOTEBOOK_CELL_TYPE.isEqualTo('markup'))
-                ))),
-                group: "3_edit" ,
+                    ( NOTEBOOK_CELL_TYPE.isEqualTo('markup'))
+                )),
+                group: CellOverflowToolbarGroups.Edit,
             }
         });
     }
@@ -283,29 +278,26 @@ registerAction2(class ChangeCellToMarkdownAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: CHANGE_CELL_TO_MARKDOWN_COMMAND_ID,
-            title: ( localize2(8185, "Change Cell to Markdown")),
+            title: ( localize2(7288, "Change Cell to Markdown")),
             keybinding: {
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
                     ContextKeyExpr.not(InputFocusedContextKey),
-                     (NOTEBOOK_OUTPUT_FOCUSED.toNegated())
-                ))),
-                primary: 43 ,
-                weight: 200
+                    ( NOTEBOOK_OUTPUT_FOCUSED.toNegated())
+                )),
+                primary: KeyCode.KeyM,
+                weight: KeybindingWeight.WorkbenchContrib
             },
-            precondition: ( (ContextKeyExpr.and(
-                NOTEBOOK_IS_ACTIVE_EDITOR,
-                 (NOTEBOOK_CELL_TYPE.isEqualTo('code'))
-            ))),
+            precondition: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, ( NOTEBOOK_CELL_TYPE.isEqualTo('code')))),
             menu: {
                 id: MenuId.NotebookCellTitle,
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
                     NOTEBOOK_EDITOR_EDITABLE,
                     NOTEBOOK_CELL_EDITABLE,
-                     (NOTEBOOK_CELL_TYPE.isEqualTo('code'))
-                ))),
-                group: "3_edit" ,
+                    ( NOTEBOOK_CELL_TYPE.isEqualTo('code'))
+                )),
+                group: CellOverflowToolbarGroups.Edit,
             }
         });
     }
@@ -325,15 +317,11 @@ registerAction2(class CollapseCellInputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: COLLAPSE_CELL_INPUT_COMMAND_ID,
-            title: ( localize2(8186, "Collapse Cell Input")),
+            title: ( localize2(7289, "Collapse Cell Input")),
             keybinding: {
-                when: ( (ContextKeyExpr.and(
-                    NOTEBOOK_CELL_LIST_FOCUSED,
-                     (NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated()),
-                     (InputFocusedContext.toNegated())
-                ))),
-                primary: KeyChord(2048  | 41 , 2048  | 33 ),
-                weight: 200
+                when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated()), ( InputFocusedContext.toNegated()))),
+                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyC),
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
@@ -353,11 +341,11 @@ registerAction2(class ExpandCellInputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: EXPAND_CELL_INPUT_COMMAND_ID,
-            title: ( localize2(8187, "Expand Cell Input")),
+            title: ( localize2(7290, "Expand Cell Input")),
             keybinding: {
-                when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_INPUT_COLLAPSED))),
-                primary: KeyChord(2048  | 41 , 2048  | 33 ),
-                weight: 200
+                when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_INPUT_COLLAPSED)),
+                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyC),
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
@@ -377,16 +365,11 @@ registerAction2(class CollapseCellOutputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: COLLAPSE_CELL_OUTPUT_COMMAND_ID,
-            title: ( localize2(8188, "Collapse Cell Output")),
+            title: ( localize2(7291, "Collapse Cell Output")),
             keybinding: {
-                when: ( (ContextKeyExpr.and(
-                    NOTEBOOK_CELL_LIST_FOCUSED,
-                     (NOTEBOOK_CELL_OUTPUT_COLLAPSED.toNegated()),
-                     (InputFocusedContext.toNegated()),
-                    NOTEBOOK_CELL_HAS_OUTPUTS
-                ))),
-                primary: KeyChord(2048  | 41 , 50 ),
-                weight: 200
+                when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( NOTEBOOK_CELL_OUTPUT_COLLAPSED.toNegated()), ( InputFocusedContext.toNegated()), NOTEBOOK_CELL_HAS_OUTPUTS)),
+                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyT),
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
@@ -403,11 +386,11 @@ registerAction2(class ExpandCellOuputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: EXPAND_CELL_OUTPUT_COMMAND_ID,
-            title: ( localize2(8189, "Expand Cell Output")),
+            title: ( localize2(7292, "Expand Cell Output")),
             keybinding: {
-                when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED))),
-                primary: KeyChord(2048  | 41 , 50 ),
-                weight: 200
+                when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED)),
+                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyT),
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
@@ -425,9 +408,9 @@ registerAction2(class extends NotebookMultiCellAction {
         super({
             id: TOGGLE_CELL_OUTPUTS_COMMAND_ID,
             precondition: NOTEBOOK_CELL_LIST_FOCUSED,
-            title: ( localize2(8190, "Toggle Outputs")),
+            title: ( localize2(7293, "Toggle Outputs")),
             metadata: {
-                description: ( localize(8190, "Toggle Outputs")),
+                description: ( localize(7293, "Toggle Outputs")),
                 args: cellExecutionArgs
             }
         });
@@ -452,7 +435,7 @@ registerAction2(class CollapseAllCellInputsAction extends NotebookMultiCellActio
     constructor() {
         super({
             id: COLLAPSE_ALL_CELL_INPUTS_COMMAND_ID,
-            title: ( localize2(8191, "Collapse All Cell Inputs")),
+            title: ( localize2(7294, "Collapse All Cell Inputs")),
             f1: true,
         });
     }
@@ -464,7 +447,7 @@ registerAction2(class ExpandAllCellInputsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: EXPAND_ALL_CELL_INPUTS_COMMAND_ID,
-            title: ( localize2(8192, "Expand All Cell Inputs")),
+            title: ( localize2(7295, "Expand All Cell Inputs")),
             f1: true
         });
     }
@@ -476,7 +459,7 @@ registerAction2(class CollapseAllCellOutputsAction extends NotebookMultiCellActi
     constructor() {
         super({
             id: COLLAPSE_ALL_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize2(8193, "Collapse All Cell Outputs")),
+            title: ( localize2(7296, "Collapse All Cell Outputs")),
             f1: true,
         });
     }
@@ -488,7 +471,7 @@ registerAction2(class ExpandAllCellOutputsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: EXPAND_ALL_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize2(8194, "Expand All Cell Outputs")),
+            title: ( localize2(7297, "Expand All Cell Outputs")),
             f1: true
         });
     }
@@ -500,15 +483,11 @@ registerAction2(class ToggleCellOutputScrolling extends NotebookMultiCellAction
     constructor() {
         super({
             id: TOGGLE_CELL_OUTPUT_SCROLLING,
-            title: ( localize2(8195, "Toggle Scroll Cell Output")),
+            title: ( localize2(7298, "Toggle Scroll Cell Output")),
             keybinding: {
-                when: ( (ContextKeyExpr.and(
-                    NOTEBOOK_CELL_LIST_FOCUSED,
-                     (InputFocusedContext.toNegated()),
-                    NOTEBOOK_CELL_HAS_OUTPUTS
-                ))),
-                primary: KeyChord(2048  | 41 , 55 ),
-                weight: 200
+                when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( InputFocusedContext.toNegated()), NOTEBOOK_CELL_HAS_OUTPUTS)),
+                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyY),
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.d.ts

@@ -0,0 +1,25 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IMarkerService } from "vscode/vscode/vs/platform/markers/common/markers.service";
+import { INotebookExecutionStateService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { IChatAgentService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
+export declare class CellDiagnostics extends Disposable implements INotebookEditorContribution {
+    private readonly notebookEditor;
+    private readonly notebookExecutionStateService;
+    private readonly markerService;
+    private readonly chatAgentService;
+    private readonly configurationService;
+    static ID: string;
+    private enabled;
+    private listening;
+    private diagnosticsByHandle;
+    constructor(notebookEditor: INotebookEditor, notebookExecutionStateService: INotebookExecutionStateService, markerService: IMarkerService, chatAgentService: IChatAgentService, configurationService: IConfigurationService);
+    private updateEnabled;
+    private handleChangeExecutionState;
+    private clearAll;
+    clear(cellHandle: number): void;
+    private setDiagnostics;
+    private createMarkerData;
+    dispose(): void;
+}

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.js

@@ -1,13 +1,14 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers.service';
-import { NotebookExecutionType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { NotebookExecutionType } from '@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { NotebookSetting, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
-import { CodeCellViewModel } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
+import { CodeCellViewModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 
@@ -71,9 +72,9 @@ let CellDiagnostics = class CellDiagnostics extends Disposable {
         }
     }
     clear(cellHandle) {
-        const diagnostic = this.diagnosticsByHandle.get(cellHandle);
-        if (diagnostic) {
-            for (const disposable of diagnostic.disposables) {
+        const disposables = this.diagnosticsByHandle.get(cellHandle);
+        if (disposables) {
+            for (const disposable of disposables) {
                 disposable.dispose();
             }
             this.diagnosticsByHandle.delete(cellHandle);
@@ -90,11 +91,12 @@ let CellDiagnostics = class CellDiagnostics extends Disposable {
         const metadata = cell.model.internalMetadata;
         if (cell instanceof CodeCellViewModel && !metadata.lastRunSuccess && metadata?.error?.location) {
             const disposables = [];
-            const marker = this.createMarkerData(metadata.error.message, metadata.error.location);
+            const errorLabel = metadata.error.name ? `${metadata.error.name}: ${metadata.error.message}` : metadata.error.message;
+            const marker = this.createMarkerData(errorLabel, metadata.error.location);
             this.markerService.changeOne(CellDiagnostics_1.ID, cell.uri, [marker]);
             disposables.push(toDisposable(() => this.markerService.changeOne(CellDiagnostics_1.ID, cell.uri, [])));
-            cell.excecutionError.set(metadata.error, undefined);
-            disposables.push(toDisposable(() => cell.excecutionError.set(undefined, undefined)));
+            cell.executionErrorDiagnostic.set(metadata.error, undefined);
+            disposables.push(toDisposable(() => cell.executionErrorDiagnostic.set(undefined, undefined)));
             disposables.push(cell.model.onDidChangeOutputs(() => {
                 if (cell.model.outputs.length === 0) {
                     this.clear(cellHandle);
@@ -103,7 +105,7 @@ let CellDiagnostics = class CellDiagnostics extends Disposable {
             disposables.push(cell.model.onDidChangeContent(() => {
                 this.clear(cellHandle);
             }));
-            this.diagnosticsByHandle.set(cellHandle, { cellUri: cell.uri, error: metadata.error, disposables });
+            this.diagnosticsByHandle.set(cellHandle, disposables);
         }
     }
     createMarkerData(message, location) {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.d.ts

@@ -0,0 +1,3 @@
+export declare const OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID = "notebook.cell.openFailureActions";
+export declare const FIX_CELL_ERROR_COMMAND_ID = "notebook.cell.chat.fixError";
+export declare const EXPLAIN_CELL_ERROR_COMMAND_ID = "notebook.cell.chat.explainError";