@codingame/monaco-vscode-notebook-service-override 9.0.2 → 10.0.0

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

@@ -1,4 +1,3 @@
-import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Mimes } from 'vscode/vscode/vs/base/common/mime';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Selection } from 'vscode/vscode/vs/editor/common/core/selection';
@@ -6,10 +5,9 @@ import { CommandExecutor } from 'vscode/vscode/vs/editor/common/cursor/cursor';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { ILanguageConfigurationService } from 'vscode/vscode/vs/editor/common/languages/languageConfigurationRegistry';
-import { TrackedRangeStickiness } from 'vscode/vscode/vs/editor/common/model';
 import { getIconClasses } from 'vscode/vscode/vs/editor/common/services/getIconClasses';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
-import { LineCommentCommand, Type } from 'vscode/vscode/vs/editor/contrib/comment/browser/lineCommentCommand';
+import { LineCommentCommand } from 'vscode/vscode/vs/editor/contrib/comment/browser/lineCommentCommand';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -17,17 +15,16 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { InputFocusedContextKey, InputFocusedContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { CTX_INLINE_CHAT_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { runDeleteAction, changeCellToKind } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { NotebookCellAction, CellToolbarOrder, CELL_TITLE_CELL_GROUP_ID, findTargetCellEditor, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, executeNotebookCondition, CELL_TITLE_OUTPUT_GROUP_ID, NotebookAction, NotebookMultiCellAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { NotebookCellAction, CELL_TITLE_CELL_GROUP_ID, findTargetCellEditor, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, executeNotebookCondition, CELL_TITLE_OUTPUT_GROUP_ID, NotebookAction, NotebookMultiCellAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { NotebookIndentUsingTabs, NotebookIndentUsingSpaces, NotebookChangeTabDisplaySize, NotebookIndentationToTabsAction, NotebookIndentationToSpacesAction } from './notebookIndentationActions.js';
 import { QUIT_EDIT_CELL_COMMAND_ID, CellEditState, CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE, getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { editIcon, stopEditIcon, deleteCellIcon, clearIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
-import { CellKind, NotebookCellExecutionState, NotebookSetting, CellEditType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellKind, NotebookCellExecutionState, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_CELL_IS_FIRST_OUTPUT, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_IS_ACTIVE_EDITOR } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
@@ -44,7 +41,7 @@ registerAction2(class EditCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: EDIT_CELL_COMMAND_ID,
-            title: ( localize(7933, "Edit Cell")),
+            title: ( localize(7992, "Edit Cell")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
@@ -53,8 +50,8 @@ registerAction2(class EditCellAction extends NotebookCellAction {
                      (EditorContextKeys.hoverFocused.toNegated()),
                      (NOTEBOOK_OUTPUT_INPUT_FOCUSED.toNegated())
                 ))),
-                primary: KeyCode.Enter,
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 3 ,
+                weight: 200
             },
             menu: {
                 id: MenuId.NotebookCellTitle,
@@ -64,7 +61,7 @@ registerAction2(class EditCellAction extends NotebookCellAction {
                      (NOTEBOOK_CELL_MARKDOWN_EDIT_MODE.toNegated()),
                     NOTEBOOK_CELL_EDITABLE
                 ))),
-                order: CellToolbarOrder.EditCell,
+                order: 0 ,
                 group: CELL_TITLE_CELL_GROUP_ID
             },
             icon: editIcon,
@@ -90,7 +87,7 @@ registerAction2(class QuitEditCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: QUIT_EDIT_CELL_COMMAND_ID,
-            title: ( localize(7934, "Stop Editing Cell")),
+            title: ( localize(7993, "Stop Editing Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(
@@ -98,7 +95,7 @@ registerAction2(class QuitEditCellAction extends NotebookCellAction {
                     NOTEBOOK_CELL_MARKDOWN_EDIT_MODE,
                     NOTEBOOK_CELL_EDITABLE
                 ))),
-                order: CellToolbarOrder.SaveCell,
+                order: 3 ,
                 group: CELL_TITLE_CELL_GROUP_ID
             },
             icon: stopEditIcon,
@@ -110,19 +107,19 @@ registerAction2(class QuitEditCellAction extends NotebookCellAction {
                          (EditorContextKeys.hasNonEmptySelection.toNegated()),
                          (EditorContextKeys.hasMultipleSelections.toNegated())
                     ))),
-                    primary: KeyCode.Escape,
+                    primary: 9 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT - 5
                 },
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
-                    primary: KeyCode.Escape,
-                    weight: KeybindingWeight.WorkbenchContrib + 5
+                    primary: 9 ,
+                    weight: 200  + 5
                 },
                 {
                     when: ( (ContextKeyExpr.and(quitEditCondition,  (NOTEBOOK_CELL_TYPE.isEqualTo('markup'))))),
-                    primary: KeyMod.WinCtrl | KeyCode.Enter,
+                    primary: 256  | 3 ,
                     win: {
-                        primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Enter
+                        primary: 2048  | 512  | 3
                     },
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT - 5
                 },
@@ -140,18 +137,18 @@ registerAction2(class DeleteCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: DELETE_CELL_COMMAND_ID,
-            title: ( localize(7935, "Delete Cell")),
+            title: ( localize(7994, "Delete Cell")),
             keybinding: {
-                primary: KeyCode.Delete,
+                primary: 20 ,
                 mac: {
-                    primary: KeyMod.CtrlCmd | KeyCode.Backspace
+                    primary: 2048  | 1
                 },
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
                     ContextKeyExpr.not(InputFocusedContextKey),
                      (NOTEBOOK_OUTPUT_INPUT_FOCUSED.toNegated())
                 ))),
-                weight: KeybindingWeight.WorkbenchContrib
+                weight: 200
             },
             menu: [
                 {
@@ -177,13 +174,13 @@ registerAction2(class DeleteCellAction extends NotebookCellAction {
         const configService = accessor.get(IConfigurationService);
         if (runState === NotebookCellExecutionState.Executing && configService.getValue(NotebookSetting.confirmDeleteRunningCell)) {
             const dialogService = accessor.get(IDialogService);
-            const primaryButton = ( localize(7936, "Delete"));
+            const primaryButton = ( localize(7995, "Delete"));
             confirmation = await dialogService.confirm({
                 type: 'question',
-                message: ( localize(7937, "This cell is running, are you sure you want to delete it?")),
+                message: ( localize(7996, "This cell is running, are you sure you want to delete it?")),
                 primaryButton: primaryButton,
                 checkbox: {
-                    label: ( localize(7938, "Do not ask me again"))
+                    label: ( localize(7997, "Do not ask me again"))
                 }
             });
         }
@@ -203,7 +200,7 @@ registerAction2(class ClearCellOutputsAction extends NotebookCellAction {
     constructor() {
         super({
             id: CLEAR_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize(7939, 'Clear Cell Outputs')),
+            title: ( localize(7998, 'Clear Cell Outputs')),
             menu: [
                 {
                     id: MenuId.NotebookCellTitle,
@@ -215,7 +212,7 @@ registerAction2(class ClearCellOutputsAction extends NotebookCellAction {
                         NOTEBOOK_CELL_EDITABLE,
                          (NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON.toNegated())
                     ))),
-                    order: CellToolbarOrder.ClearCellOutput,
+                    order: 5 ,
                     group: CELL_TITLE_OUTPUT_GROUP_ID
                 },
                 {
@@ -237,8 +234,8 @@ registerAction2(class ClearCellOutputsAction extends NotebookCellAction {
                     NOTEBOOK_EDITOR_EDITABLE,
                     NOTEBOOK_CELL_EDITABLE
                 ))),
-                primary: KeyMod.Alt | KeyCode.Delete,
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 512  | 20 ,
+                weight: 200
             },
             icon: clearIcon
         });
@@ -255,11 +252,11 @@ registerAction2(class ClearCellOutputsAction extends NotebookCellAction {
             return;
         }
         const computeUndoRedo = !editor.isReadOnly;
-        editor.textModel.applyEdits([{ editType: CellEditType.Output, index, outputs: [] }], true, undefined, () => undefined, undefined, computeUndoRedo);
+        editor.textModel.applyEdits([{ editType: 2 , index, outputs: [] }], true, undefined, () => undefined, undefined, computeUndoRedo);
         const runState = notebookExecutionStateService.getCellExecution(context.cell.uri)?.state;
         if (runState !== NotebookCellExecutionState.Executing) {
             context.notebookEditor.textModel.applyEdits([{
-                    editType: CellEditType.PartialInternalMetadata, index, internalMetadata: {
+                    editType: 9 , index, internalMetadata: {
                         runStartTime: null,
                         runStartTimeAdjustment: null,
                         runEndTime: null,
@@ -274,7 +271,7 @@ registerAction2(class ClearAllCellOutputsAction extends NotebookAction {
     constructor() {
         super({
             id: CLEAR_ALL_CELLS_OUTPUTS_COMMAND_ID,
-            title: ( localize(7940, 'Clear All Outputs')),
+            title: ( localize(7999, 'Clear All Outputs')),
             precondition: NOTEBOOK_HAS_OUTPUTS,
             menu: [
                 {
@@ -307,13 +304,13 @@ registerAction2(class ClearAllCellOutputsAction extends NotebookAction {
         }
         const computeUndoRedo = !editor.isReadOnly;
         editor.textModel.applyEdits(( (editor.textModel.cells.map((cell, index) => ({
-            editType: CellEditType.Output, index, outputs: []
+            editType: 2 , index, outputs: []
         })))), true, undefined, () => undefined, undefined, computeUndoRedo);
         const clearExecutionMetadataEdits = ( (editor.textModel.cells.map((cell, index) => {
             const runState = notebookExecutionStateService.getCellExecution(cell.uri)?.state;
             if (runState !== NotebookCellExecutionState.Executing) {
                 return {
-                    editType: CellEditType.PartialInternalMetadata, index, internalMetadata: {
+                    editType: 9 , index, internalMetadata: {
                         runStartTime: null,
                         runStartTimeAdjustment: null,
                         runEndTime: null,
@@ -335,9 +332,9 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
     constructor() {
         super({
             id: CHANGE_CELL_LANGUAGE,
-            title: ( localize(7941, 'Change Cell Language')),
+            title: ( localize(8000, 'Change Cell Language')),
             metadata: {
-                description: ( localize(7941, 'Change Cell Language')),
+                description: ( localize(8000, 'Change Cell Language')),
                 args: [
                     {
                         name: 'range',
@@ -410,10 +407,10 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
         providerLanguages.forEach(languageId => {
             let description;
             if (context.cell.cellKind === CellKind.Markup ? (languageId === 'markdown') : (languageId === context.cell.language)) {
-                description = ( localize(7942, "({0}) - Current Language", languageId));
+                description = ( localize(8001, "({0}) - Current Language", languageId));
             }
             else {
-                description = ( localize(7943, "({0})", languageId));
+                description = ( localize(8002, "({0})", languageId));
             }
             const languageName = languageService.getLanguageName(languageId);
             if (!languageName) {
@@ -436,16 +433,16 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
             return a.description.localeCompare(b.description);
         });
         const autoDetectMode = {
-            label: ( localize(7944, "Auto Detect"))
+            label: ( localize(8003, "Auto Detect"))
         };
         const picks = [
             autoDetectMode,
-            { type: 'separator', label: ( localize(7945, "languages (identifier)")) },
+            { type: 'separator', label: ( localize(8004, "languages (identifier)")) },
             ...topItems,
             { type: 'separator' },
             ...mainItems
         ];
-        const selection = await quickInputService.pick(picks, { placeHolder: ( localize(7946, "Select Language Mode")) });
+        const selection = await quickInputService.pick(picks, { placeHolder: ( localize(8005, "Select Language Mode")) });
         const languageId = selection === autoDetectMode
             ? await languageDetectionService.detectLanguage(context.cell.uri)
             : selection?.languageId;
@@ -478,10 +475,10 @@ registerAction2(class DetectCellLanguageAction extends NotebookCellAction {
     constructor() {
         super({
             id: DETECT_CELL_LANGUAGE,
-            title: ( localize2(7947, "Accept Detected Language for Cell")),
+            title: ( localize2(8006, "Accept Detected Language for Cell")),
             f1: true,
             precondition: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE))),
-            keybinding: { primary: KeyCode.KeyD | KeyMod.Alt | KeyMod.Shift, weight: KeybindingWeight.WorkbenchContrib }
+            keybinding: { primary: 34  | 512  | 1024 , weight: 200  }
         });
     }
     async runWithContext(accessor, context) {
@@ -496,7 +493,7 @@ registerAction2(class DetectCellLanguageAction extends NotebookCellAction {
             setCellToLanguage(detection, context);
         }
         else {
-            notificationService.warn(( localize(7948, "Unable to detect cell language")));
+            notificationService.warn(( localize(8007, "Unable to detect cell language")));
         }
     }
 });
@@ -514,14 +511,14 @@ async function setCellToLanguage(languageId, context) {
     }
     else {
         const index = context.notebookEditor.textModel.cells.indexOf(context.cell.model);
-        context.notebookEditor.textModel.applyEdits([{ editType: CellEditType.CellLanguage, index, language: languageId }], true, undefined, () => undefined, undefined, !context.notebookEditor.isReadOnly);
+        context.notebookEditor.textModel.applyEdits([{ editType: 4 , index, language: languageId }], true, undefined, () => undefined, undefined, !context.notebookEditor.isReadOnly);
     }
 }
 registerAction2(class SelectNotebookIndentation extends NotebookAction {
     constructor() {
         super({
             id: SELECT_NOTEBOOK_INDENTATION_ID,
-            title: ( localize2(7949, 'Select Indentation')),
+            title: ( localize2(8008, 'Select Indentation')),
             f1: true,
             precondition: ( (ContextKeyExpr.and(
                 NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -539,10 +536,10 @@ registerAction2(class SelectNotebookIndentation extends NotebookAction {
         const instantiationService = accessor.get(IInstantiationService);
         const activeNotebook = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
         if (!activeNotebook || activeNotebook.isDisposed) {
-            return quickInputService.pick([{ label: ( localize(7950, "No notebook editor active at this time")) }]);
+            return quickInputService.pick([{ label: ( localize(8009, "No notebook editor active at this time")) }]);
         }
         if (activeNotebook.isReadOnly) {
-            return quickInputService.pick([{ label: ( localize(7951, "The active notebook editor is read-only.")) }]);
+            return quickInputService.pick([{ label: ( localize(8010, "The active notebook editor is read-only.")) }]);
         }
         const picks = ( ([
             (
@@ -564,9 +561,9 @@ registerAction2(class SelectNotebookIndentation extends NotebookAction {
                 }
             };
         })));
-        picks.splice(3, 0, { type: 'separator', label: ( localize(7952, "convert file")) });
-        picks.unshift({ type: 'separator', label: ( localize(7953, "change view")) });
-        const action = await quickInputService.pick(picks, { placeHolder: ( localize(7954, "Select Action")), matchOnDetail: true });
+        picks.splice(3, 0, { type: 'separator', label: ( localize(8011, "convert file")) });
+        picks.unshift({ type: 'separator', label: ( localize(8012, "change view")) });
+        const action = await quickInputService.pick(picks, { placeHolder: ( localize(8013, "Select Action")), matchOnDetail: true });
         if (!action) {
             return;
         }
@@ -579,15 +576,15 @@ registerAction2(class CommentSelectedCellsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: COMMENT_SELECTED_CELLS_ID,
-            title: ( localize(7955, "Comment Selected Cells")),
+            title: ( localize(8014, "Comment Selected Cells")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
                     NOTEBOOK_EDITOR_EDITABLE,
                     ContextKeyExpr.not(InputFocusedContextKey)
                 ))),
-                primary: KeyMod.CtrlCmd | KeyCode.Slash,
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 2048  | 90 ,
+                weight: 200
             }
         });
     }
@@ -602,10 +599,10 @@ registerAction2(class CommentSelectedCellsAction extends NotebookMultiCellAction
                 1,
                 textModel.getLineCount(),
                 textModel.getLineMaxColumn(textModel.getLineCount())
-            )), textModel.getOptions().tabSize, Type.Toggle, commentsOptions.insertSpace ?? true, commentsOptions.ignoreEmptyLines ?? true, false)));
+            )), textModel.getOptions().tabSize, 0 , commentsOptions.insertSpace ?? true, commentsOptions.ignoreEmptyLines ?? true, false)));
             const cellEditorSelections = cellViewModel.getSelections();
             const initialTrackedRangesIDs = ( (cellEditorSelections.map(selection => {
-                return textModel._setTrackedRange(null, selection, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
+                return textModel._setTrackedRange(null, selection, 1 );
             })));
             CommandExecutor.executeCommands(textModel, cellEditorSelections, [cellCommentCommand]);
             const newTrackedSelections = ( (( (initialTrackedRangesIDs.map(i => {

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

@@ -1,5 +1,4 @@
 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';
@@ -7,13 +6,12 @@ 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 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { insertCell } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
 import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
 import { NotebookChatController } from 'vscode/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 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { NotebookAction, executeNotebookCondition, getContextFromUri, getContextFromActiveEditor, NotebookMultiCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, cellExecutionArgs, parseMultiCellExecutionArgs, CELL_TITLE_CELL_GROUP_ID, NotebookCellAction } from 'vscode/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 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellKind, NotebookSetting, CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
@@ -90,7 +88,7 @@ registerAction2(class RenderAllMarkdownCellsAction extends NotebookAction {
     constructor() {
         super({
             id: RENDER_ALL_MARKDOWN_CELLS,
-            title: ( localize(7895, "Render All Markdown Cells")),
+            title: ( localize(7954, "Render All Markdown Cells")),
         });
     }
     async runWithContext(accessor, context) {
@@ -101,10 +99,10 @@ registerAction2(class ExecuteNotebookAction extends NotebookAction {
     constructor() {
         super({
             id: EXECUTE_NOTEBOOK_COMMAND_ID,
-            title: ( localize(7896, "Run All")),
+            title: ( localize(7955, "Run All")),
             icon: executeAllIcon,
             metadata: {
-                description: ( localize(7896, "Run All")),
+                description: ( localize(7955, "Run All")),
                 args: [
                     {
                         name: 'uri',
@@ -148,7 +146,7 @@ registerAction2(class ExecuteNotebookAction extends NotebookAction {
     async runWithContext(accessor, context) {
         renderAllMarkdownCells(context);
         const editorService = accessor.get(IEditorService);
-        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 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 editorGroupService = accessor.get(IEditorGroupsService);
         if (editor) {
             const group = editorGroupService.getGroup(editor.groupId);
@@ -162,15 +160,15 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
         super({
             id: EXECUTE_CELL_COMMAND_ID,
             precondition: executeThisCellCondition,
-            title: ( localize(7897, "Execute Cell")),
+            title: ( localize(7956, "Execute Cell")),
             keybinding: {
                 when: ( (ContextKeyExpr.or(
                     NOTEBOOK_CELL_LIST_FOCUSED,
                      (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))
                 ))),
-                primary: KeyMod.WinCtrl | KeyCode.Enter,
+                primary: 256  | 3 ,
                 win: {
-                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Enter
+                    primary: 2048  | 512  | 3
                 },
                 weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
             },
@@ -180,7 +178,7 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
                 group: 'inline'
             },
             metadata: {
-                description: ( localize(7897, "Execute Cell")),
+                description: ( localize(7956, "Execute Cell")),
                 args: cellExecutionArgs
             },
             icon: executeIcon
@@ -214,7 +212,7 @@ registerAction2(class ExecuteAboveCells extends NotebookMultiCellAction {
         super({
             id: EXECUTE_CELLS_ABOVE,
             precondition: executeCondition,
-            title: ( localize(7898, "Execute Above Cells")),
+            title: ( localize(7957, "Execute Above Cells")),
             menu: [
                 {
                     id: MenuId.NotebookCellExecute,
@@ -225,7 +223,7 @@ registerAction2(class ExecuteAboveCells extends NotebookMultiCellAction {
                 },
                 {
                     id: MenuId.NotebookCellTitle,
-                    order: CellToolbarOrder.ExecuteAboveCells,
+                    order: 1 ,
                     group: CELL_TITLE_CELL_GROUP_ID,
                     when: ( (ContextKeyExpr.and(
                         executeCondition,
@@ -260,7 +258,7 @@ registerAction2(class ExecuteCellAndBelow extends NotebookMultiCellAction {
         super({
             id: EXECUTE_CELL_AND_BELOW,
             precondition: executeCondition,
-            title: ( localize(7899, "Execute Cell and Below")),
+            title: ( localize(7958, "Execute Cell and Below")),
             menu: [
                 {
                     id: MenuId.NotebookCellExecute,
@@ -271,7 +269,7 @@ registerAction2(class ExecuteCellAndBelow extends NotebookMultiCellAction {
                 },
                 {
                     id: MenuId.NotebookCellTitle,
-                    order: CellToolbarOrder.ExecuteCellAndBelow,
+                    order: 2 ,
                     group: CELL_TITLE_CELL_GROUP_ID,
                     when: ( (ContextKeyExpr.and(
                         executeCondition,
@@ -306,9 +304,9 @@ registerAction2(class ExecuteCellFocusContainer extends NotebookMultiCellAction
         super({
             id: EXECUTE_CELL_FOCUS_CONTAINER_COMMAND_ID,
             precondition: executeThisCellCondition,
-            title: ( localize(7900, "Execute Cell and Focus Container")),
+            title: ( localize(7959, "Execute Cell and Focus Container")),
             metadata: {
-                description: ( localize(7900, "Execute Cell and Focus Container")),
+                description: ( localize(7959, "Execute Cell and Focus Container")),
                 args: cellExecutionArgs
             },
             icon: executeIcon
@@ -340,7 +338,7 @@ registerAction2(class CancelExecuteCell extends NotebookMultiCellAction {
         super({
             id: CANCEL_CELL_COMMAND_ID,
             precondition: cellCancelCondition,
-            title: ( localize(7901, "Stop Cell Execution")),
+            title: ( localize(7960, "Stop Cell Execution")),
             icon: stopIcon,
             menu: {
                 id: MenuId.NotebookCellExecutePrimary,
@@ -348,7 +346,7 @@ registerAction2(class CancelExecuteCell extends NotebookMultiCellAction {
                 group: 'inline'
             },
             metadata: {
-                description: ( localize(7901, "Stop Cell Execution")),
+                description: ( localize(7960, "Stop Cell Execution")),
                 args: [
                     {
                         name: 'options',
@@ -406,13 +404,13 @@ registerAction2(class ExecuteCellSelectBelow extends NotebookCellAction {
                 executeThisCellCondition,
                  (NOTEBOOK_CELL_TYPE.isEqualTo('markup'))
             ))),
-            title: ( localize(7902, "Execute Notebook Cell and Select Below")),
+            title: ( localize(7961, "Execute Notebook Cell and Select Below")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
                      (CTX_INLINE_CHAT_FOCUSED.negate())
                 ))),
-                primary: KeyMod.Shift | KeyCode.Enter,
+                primary: 1024  | 3 ,
                 weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
             },
         });
@@ -472,10 +470,10 @@ registerAction2(class ExecuteCellInsertBelow extends NotebookCellAction {
                 executeThisCellCondition,
                  (NOTEBOOK_CELL_TYPE.isEqualTo('markup'))
             ))),
-            title: ( localize(7903, "Execute Notebook Cell and Insert Below")),
+            title: ( localize(7962, "Execute Notebook Cell and Insert Below")),
             keybinding: {
                 when: NOTEBOOK_CELL_LIST_FOCUSED,
-                primary: KeyMod.Alt | KeyCode.Enter,
+                primary: 512  | 3 ,
                 weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
             },
         });
@@ -509,7 +507,7 @@ registerAction2(class CancelAllNotebook extends CancelNotebook {
     constructor() {
         super({
             id: CANCEL_NOTEBOOK_COMMAND_ID,
-            title: ( localize2(7904, "Stop Execution")),
+            title: ( localize2(7963, "Stop Execution")),
             icon: stopIcon,
             menu: [
                 {
@@ -541,7 +539,7 @@ registerAction2(class InterruptNotebook extends CancelNotebook {
     constructor() {
         super({
             id: INTERRUPT_NOTEBOOK_COMMAND_ID,
-            title: ( localize2(7905, "Interrupt")),
+            title: ( localize2(7964, "Interrupt")),
             precondition: ( (ContextKeyExpr.and(NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL))),
             icon: stopIcon,
             menu: [
@@ -575,7 +573,7 @@ registerAction2(class InterruptNotebook extends CancelNotebook {
     }
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
-    title: ( localize(7906, "Go To")),
+    title: ( localize(7965, "Go To")),
     submenu: MenuId.NotebookCellExecuteGoTo,
     group: 'navigation/execute',
     order: 20,
@@ -585,9 +583,9 @@ registerAction2(class RevealRunningCellAction extends NotebookAction {
     constructor() {
         super({
             id: REVEAL_RUNNING_CELL,
-            title: ( localize(7907, "Go to Running Cell")),
-            tooltip: ( localize(7907, "Go to Running Cell")),
-            shortTitle: ( localize(7907, "Go to Running Cell")),
+            title: ( localize(7966, "Go to Running Cell")),
+            tooltip: ( localize(7966, "Go to Running Cell")),
+            shortTitle: ( localize(7966, "Go to Running Cell")),
             precondition: NOTEBOOK_HAS_RUNNING_CELL,
             menu: [
                 {
@@ -656,9 +654,9 @@ registerAction2(class RevealLastFailedCellAction extends NotebookAction {
     constructor() {
         super({
             id: REVEAL_LAST_FAILED_CELL,
-            title: ( localize(7908, "Go to Most Recently Failed Cell")),
-            tooltip: ( localize(7908, "Go to Most Recently Failed Cell")),
-            shortTitle: ( localize(7909, "Go to Most Recently Failed Cell")),
+            title: ( localize(7967, "Go to Most Recently Failed Cell")),
+            tooltip: ( localize(7967, "Go to Most Recently Failed Cell")),
+            shortTitle: ( localize(7968, "Go to Most Recently Failed Cell")),
             precondition: NOTEBOOK_LAST_CELL_FAILED,
             menu: [
                 {