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

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

@@ -1,3 +1,5 @@
+
+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';
@@ -5,9 +7,10 @@ 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 } from 'vscode/vscode/vs/editor/contrib/comment/browser/lineCommentCommand';
+import { LineCommentCommand, Type } 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';
@@ -15,17 +18,18 @@ 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 '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_FOCUSED } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
-import { runDeleteAction, 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, findTargetCellEditor, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, executeNotebookCondition, CELL_TITLE_OUTPUT_GROUP_ID, NotebookAction, NotebookMultiCellAction } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { InlineChatController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { CTX_INLINE_CHAT_FOCUSED } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { runDeleteAction, changeCellToKind } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/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 '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/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 '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
-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 { QUIT_EDIT_CELL_COMMAND_ID, CellEditState, CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE, getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { editIcon, stopEditIcon, deleteCellIcon, clearIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { CellKind, NotebookCellExecutionState, NotebookSetting, CellEditType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, 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 '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/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';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -41,34 +45,28 @@ registerAction2(class EditCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: EDIT_CELL_COMMAND_ID,
-            title: ( localize(8084, "Edit Cell")),
+            title: ( localize(7448, "Edit Cell")),
             keybinding: {
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
                     ContextKeyExpr.not(InputFocusedContextKey),
-                     (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
-                     (EditorContextKeys.hoverFocused.toNegated()),
-                     (NOTEBOOK_OUTPUT_INPUT_FOCUSED.toNegated())
-                ))),
-                primary: 3 ,
-                weight: 200
+                    ( EditorContextKeys.hoverFocused.toNegated()),
+                    ( NOTEBOOK_OUTPUT_INPUT_FOCUSED.toNegated())
+                )),
+                primary: KeyCode.Enter,
+                weight: KeybindingWeight.WorkbenchContrib
             },
             menu: {
                 id: MenuId.NotebookCellTitle,
-                when: ( (ContextKeyExpr.and(
-                     (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
-                     (NOTEBOOK_CELL_TYPE.isEqualTo('markup')),
-                     (NOTEBOOK_CELL_MARKDOWN_EDIT_MODE.toNegated()),
-                    NOTEBOOK_CELL_EDITABLE
-                ))),
-                order: 0 ,
+                when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( NOTEBOOK_CELL_TYPE.isEqualTo('markup')), ( NOTEBOOK_CELL_MARKDOWN_EDIT_MODE.toNegated()), NOTEBOOK_CELL_EDITABLE)),
+                order: CellToolbarOrder.EditCell,
                 group: CELL_TITLE_CELL_GROUP_ID
             },
             icon: editIcon,
         });
     }
     async runWithContext(accessor, context) {
-        if (!context.notebookEditor.hasModel() || context.notebookEditor.isReadOnly) {
+        if (!context.notebookEditor.hasModel()) {
             return;
         }
         await context.notebookEditor.focusNotebookCell(context.cell, 'editor');
@@ -78,48 +76,35 @@ registerAction2(class EditCellAction extends NotebookCellAction {
         }
     }
 });
-const quitEditCondition = ( (ContextKeyExpr.and(
-    NOTEBOOK_EDITOR_FOCUSED,
-    InputFocusedContext,
-     (CTX_INLINE_CHAT_FOCUSED.toNegated())
-)));
+const quitEditCondition = ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, InputFocusedContext, ( CTX_INLINE_CHAT_FOCUSED.toNegated())));
 registerAction2(class QuitEditCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: QUIT_EDIT_CELL_COMMAND_ID,
-            title: ( localize(8085, "Stop Editing Cell")),
+            title: ( localize(7449, "Stop Editing Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
-                when: ( (ContextKeyExpr.and(
-                     (NOTEBOOK_CELL_TYPE.isEqualTo('markup')),
-                    NOTEBOOK_CELL_MARKDOWN_EDIT_MODE,
-                    NOTEBOOK_CELL_EDITABLE
-                ))),
-                order: 3 ,
+                when: ( ContextKeyExpr.and(( NOTEBOOK_CELL_TYPE.isEqualTo('markup')), NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EDITABLE)),
+                order: CellToolbarOrder.SaveCell,
                 group: CELL_TITLE_CELL_GROUP_ID
             },
             icon: stopEditIcon,
             keybinding: [
                 {
-                    when: ( (ContextKeyExpr.and(
-                        quitEditCondition,
-                         (EditorContextKeys.hoverVisible.toNegated()),
-                         (EditorContextKeys.hasNonEmptySelection.toNegated()),
-                         (EditorContextKeys.hasMultipleSelections.toNegated())
-                    ))),
-                    primary: 9 ,
+                    when: ( ContextKeyExpr.and(quitEditCondition, ( EditorContextKeys.hoverVisible.toNegated()), ( EditorContextKeys.hasNonEmptySelection.toNegated()), ( EditorContextKeys.hasMultipleSelections.toNegated()))),
+                    primary: KeyCode.Escape,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT - 5
                 },
                 {
-                    when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
-                    primary: 9 ,
-                    weight: 200  + 5
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED)),
+                    primary: KeyCode.Escape,
+                    weight: KeybindingWeight.WorkbenchContrib + 5
                 },
                 {
-                    when: ( (ContextKeyExpr.and(quitEditCondition,  (NOTEBOOK_CELL_TYPE.isEqualTo('markup'))))),
-                    primary: 256  | 3 ,
+                    when: ( ContextKeyExpr.and(quitEditCondition, ( NOTEBOOK_CELL_TYPE.isEqualTo('markup')))),
+                    primary: KeyMod.WinCtrl | KeyCode.Enter,
                     win: {
-                        primary: 2048  | 512  | 3
+                        primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Enter
                     },
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT - 5
                 },
@@ -137,18 +122,18 @@ registerAction2(class DeleteCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: DELETE_CELL_COMMAND_ID,
-            title: ( localize(8086, "Delete Cell")),
+            title: ( localize(7450, "Delete Cell")),
             keybinding: {
-                primary: 20 ,
+                primary: KeyCode.Delete,
                 mac: {
-                    primary: 2048  | 1
+                    primary: KeyMod.CtrlCmd | KeyCode.Backspace
                 },
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
                     ContextKeyExpr.not(InputFocusedContextKey),
-                     (NOTEBOOK_OUTPUT_INPUT_FOCUSED.toNegated())
-                ))),
-                weight: 200
+                    ( NOTEBOOK_OUTPUT_INPUT_FOCUSED.toNegated())
+                )),
+                weight: KeybindingWeight.WorkbenchContrib
             },
             menu: [
                 {
@@ -174,13 +159,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(8087, "Delete"));
+            const primaryButton = ( localize(7451, "Delete"));
             confirmation = await dialogService.confirm({
                 type: 'question',
-                message: ( localize(8088, "This cell is running, are you sure you want to delete it?")),
+                message: ( localize(7452, "This cell is running, are you sure you want to delete it?")),
                 primaryButton: primaryButton,
                 checkbox: {
-                    label: ( localize(8089, "Do not ask me again"))
+                    label: ( localize(7453, "Do not ask me again"))
                 }
             });
         }
@@ -200,42 +185,35 @@ registerAction2(class ClearCellOutputsAction extends NotebookCellAction {
     constructor() {
         super({
             id: CLEAR_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize(8090, 'Clear Cell Outputs')),
+            title: ( localize(7454, 'Clear Cell Outputs')),
             menu: [
                 {
                     id: MenuId.NotebookCellTitle,
-                    when: ( (ContextKeyExpr.and(
-                         (NOTEBOOK_CELL_TYPE.isEqualTo('code')),
-                        executeNotebookCondition,
-                        NOTEBOOK_CELL_HAS_OUTPUTS,
-                        NOTEBOOK_EDITOR_EDITABLE,
-                        NOTEBOOK_CELL_EDITABLE,
-                         (NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON.toNegated())
-                    ))),
-                    order: 5 ,
+                    when: ( ContextKeyExpr.and(( NOTEBOOK_CELL_TYPE.isEqualTo('code')), executeNotebookCondition, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, ( NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON.toNegated()))),
+                    order: CellToolbarOrder.ClearCellOutput,
                     group: CELL_TITLE_OUTPUT_GROUP_ID
                 },
                 {
                     id: MenuId.NotebookOutputToolbar,
-                    when: ( (ContextKeyExpr.and(
+                    when: ( ContextKeyExpr.and(
                         NOTEBOOK_CELL_HAS_OUTPUTS,
                         NOTEBOOK_EDITOR_EDITABLE,
                         NOTEBOOK_CELL_EDITABLE,
                         NOTEBOOK_CELL_IS_FIRST_OUTPUT,
                         NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON
-                    )))
+                    ))
                 },
             ],
             keybinding: {
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
                     ContextKeyExpr.not(InputFocusedContextKey),
                     NOTEBOOK_CELL_HAS_OUTPUTS,
                     NOTEBOOK_EDITOR_EDITABLE,
                     NOTEBOOK_CELL_EDITABLE
-                ))),
-                primary: 512  | 20 ,
-                weight: 200
+                )),
+                primary: KeyMod.Alt | KeyCode.Delete,
+                weight: KeybindingWeight.WorkbenchContrib
             },
             icon: clearIcon
         });
@@ -252,11 +230,11 @@ registerAction2(class ClearCellOutputsAction extends NotebookCellAction {
             return;
         }
         const computeUndoRedo = !editor.isReadOnly;
-        editor.textModel.applyEdits([{ editType: 2 , index, outputs: [] }], true, undefined, () => undefined, undefined, computeUndoRedo);
+        editor.textModel.applyEdits([{ editType: CellEditType.Output, index, outputs: [] }], true, undefined, () => undefined, undefined, computeUndoRedo);
         const runState = notebookExecutionStateService.getCellExecution(context.cell.uri)?.state;
         if (runState !== NotebookCellExecutionState.Executing) {
             context.notebookEditor.textModel.applyEdits([{
-                    editType: 9 , index, internalMetadata: {
+                    editType: CellEditType.PartialInternalMetadata, index, internalMetadata: {
                         runStartTime: null,
                         runStartTimeAdjustment: null,
                         runEndTime: null,
@@ -271,24 +249,18 @@ registerAction2(class ClearAllCellOutputsAction extends NotebookAction {
     constructor() {
         super({
             id: CLEAR_ALL_CELLS_OUTPUTS_COMMAND_ID,
-            title: ( localize(8091, 'Clear All Outputs')),
+            title: ( localize(7455, 'Clear All Outputs')),
             precondition: NOTEBOOK_HAS_OUTPUTS,
             menu: [
                 {
                     id: MenuId.EditorTitle,
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_IS_ACTIVE_EDITOR,
-                         (ContextKeyExpr.notEquals('config.notebook.globalToolbar', true))
-                    ))),
+                    when: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, ( ContextKeyExpr.notEquals('config.notebook.globalToolbar', true)))),
                     group: 'navigation',
                     order: 0
                 },
                 {
                     id: MenuId.NotebookToolbar,
-                    when: ( (ContextKeyExpr.and(
-                        executeNotebookCondition,
-                         (ContextKeyExpr.equals('config.notebook.globalToolbar', true))
-                    ))),
+                    when: ( ContextKeyExpr.and(executeNotebookCondition, ( ContextKeyExpr.equals('config.notebook.globalToolbar', true)))),
                     group: 'navigation/execute',
                     order: 10
                 }
@@ -303,14 +275,14 @@ registerAction2(class ClearAllCellOutputsAction extends NotebookAction {
             return;
         }
         const computeUndoRedo = !editor.isReadOnly;
-        editor.textModel.applyEdits(( (editor.textModel.cells.map((cell, index) => ({
-            editType: 2 , index, outputs: []
-        })))), true, undefined, () => undefined, undefined, computeUndoRedo);
-        const clearExecutionMetadataEdits = ( (editor.textModel.cells.map((cell, index) => {
+        editor.textModel.applyEdits(( editor.textModel.cells.map((cell, index) => ({
+            editType: CellEditType.Output, 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: 9 , index, internalMetadata: {
+                    editType: CellEditType.PartialInternalMetadata, index, internalMetadata: {
                         runStartTime: null,
                         runStartTimeAdjustment: null,
                         runEndTime: null,
@@ -322,7 +294,7 @@ registerAction2(class ClearAllCellOutputsAction extends NotebookAction {
             else {
                 return undefined;
             }
-        }))).filter(edit => !!edit);
+        })).filter(edit => !!edit);
         if (clearExecutionMetadataEdits.length) {
             context.notebookEditor.textModel.applyEdits(clearExecutionMetadataEdits, true, undefined, () => undefined, undefined, computeUndoRedo);
         }
@@ -332,9 +304,9 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
     constructor() {
         super({
             id: CHANGE_CELL_LANGUAGE,
-            title: ( localize(8092, 'Change Cell Language')),
+            title: ( localize(7456, 'Change Cell Language')),
             metadata: {
-                description: ( localize(8092, 'Change Cell Language')),
+                description: ( localize(7456, 'Change Cell Language')),
                 args: [
                     {
                         name: 'range',
@@ -400,17 +372,17 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
             const allSupportedLanguages = matchResult.all.flatMap(kernel => kernel.supportedLanguages);
             languages = allSupportedLanguages.length > 0 ? allSupportedLanguages : languageService.getRegisteredLanguageIds();
         }
-        const providerLanguages = ( (new Set([
+        const providerLanguages = ( new Set([
             ...languages,
             'markdown'
-        ])));
+        ]));
         providerLanguages.forEach(languageId => {
             let description;
             if (context.cell.cellKind === CellKind.Markup ? (languageId === 'markdown') : (languageId === context.cell.language)) {
-                description = ( localize(8093, "({0}) - Current Language", languageId));
+                description = ( localize(7457, "({0}) - Current Language", languageId));
             }
             else {
-                description = ( localize(8094, "({0})", languageId));
+                description = ( localize(7458, "({0})", languageId));
             }
             const languageName = languageService.getLanguageName(languageId);
             if (!languageName) {
@@ -433,16 +405,16 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
             return a.description.localeCompare(b.description);
         });
         const autoDetectMode = {
-            label: ( localize(8095, "Auto Detect"))
+            label: ( localize(7459, "Auto Detect"))
         };
         const picks = [
             autoDetectMode,
-            { type: 'separator', label: ( localize(8096, "languages (identifier)")) },
+            { type: 'separator', label: ( localize(7460, "languages (identifier)")) },
             ...topItems,
             { type: 'separator' },
             ...mainItems
         ];
-        const selection = await quickInputService.pick(picks, { placeHolder: ( localize(8097, "Select Language Mode")) });
+        const selection = await quickInputService.pick(picks, { placeHolder: ( localize(7461, "Select Language Mode")) });
         const languageId = selection === autoDetectMode
             ? await languageDetectionService.detectLanguage(context.cell.uri)
             : selection?.languageId;
@@ -475,10 +447,10 @@ registerAction2(class DetectCellLanguageAction extends NotebookCellAction {
     constructor() {
         super({
             id: DETECT_CELL_LANGUAGE,
-            title: ( localize2(8098, "Accept Detected Language for Cell")),
+            title: ( localize2(7462, "Accept Detected Language for Cell")),
             f1: true,
-            precondition: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE))),
-            keybinding: { primary: 34  | 512  | 1024 , weight: 200  }
+            precondition: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE)),
+            keybinding: { primary: KeyCode.KeyD | KeyMod.Alt | KeyMod.Shift, weight: KeybindingWeight.WorkbenchContrib }
         });
     }
     async runWithContext(accessor, context) {
@@ -493,7 +465,7 @@ registerAction2(class DetectCellLanguageAction extends NotebookCellAction {
             setCellToLanguage(detection, context);
         }
         else {
-            notificationService.warn(( localize(8099, "Unable to detect cell language")));
+            notificationService.warn(( localize(7463, "Unable to detect cell language")));
         }
     }
 });
@@ -511,20 +483,20 @@ async function setCellToLanguage(languageId, context) {
     }
     else {
         const index = context.notebookEditor.textModel.cells.indexOf(context.cell.model);
-        context.notebookEditor.textModel.applyEdits([{ editType: 4 , index, language: languageId }], true, undefined, () => undefined, undefined, !context.notebookEditor.isReadOnly);
+        context.notebookEditor.textModel.applyEdits([{ editType: CellEditType.CellLanguage, index, language: languageId }], true, undefined, () => undefined, undefined, !context.notebookEditor.isReadOnly);
     }
 }
 registerAction2(class SelectNotebookIndentation extends NotebookAction {
     constructor() {
         super({
             id: SELECT_NOTEBOOK_INDENTATION_ID,
-            title: ( localize2(8100, 'Select Indentation')),
+            title: ( localize2(7464, 'Select Indentation')),
             f1: true,
-            precondition: ( (ContextKeyExpr.and(
+            precondition: ( ContextKeyExpr.and(
                 NOTEBOOK_IS_ACTIVE_EDITOR,
                 NOTEBOOK_EDITOR_EDITABLE,
                 NOTEBOOK_CELL_EDITABLE
-            ))),
+            )),
         });
     }
     async runWithContext(accessor, context) {
@@ -536,34 +508,34 @@ registerAction2(class SelectNotebookIndentation extends NotebookAction {
         const instantiationService = accessor.get(IInstantiationService);
         const activeNotebook = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
         if (!activeNotebook || activeNotebook.isDisposed) {
-            return quickInputService.pick([{ label: ( localize(8101, "No notebook editor active at this time")) }]);
+            return quickInputService.pick([{ label: ( localize(7465, "No notebook editor active at this time")) }]);
         }
         if (activeNotebook.isReadOnly) {
-            return quickInputService.pick([{ label: ( localize(8102, "The active notebook editor is read-only.")) }]);
+            return quickInputService.pick([{ label: ( localize(7466, "The active notebook editor is read-only.")) }]);
         }
-        const picks = ( ([
+        const picks = ( [
             (
-            (new NotebookIndentUsingTabs())),
+            new NotebookIndentUsingTabs()),
             (
-            (new NotebookIndentUsingSpaces())),
+            new NotebookIndentUsingSpaces()),
             (
-            (new NotebookChangeTabDisplaySize())),
+            new NotebookChangeTabDisplaySize()),
             (
-            (new NotebookIndentationToTabsAction())),
+            new NotebookIndentationToTabsAction()),
             (
-            (new NotebookIndentationToSpacesAction()))
+            new NotebookIndentationToSpacesAction())
         ].map(item => {
             return {
                 id: item.desc.id,
-                label: ( (item.desc.title.toString())),
+                label: ( item.desc.title.toString()),
                 run: () => {
                     instantiationService.invokeFunction(item.run);
                 }
             };
-        })));
-        picks.splice(3, 0, { type: 'separator', label: ( localize(8103, "convert file")) });
-        picks.unshift({ type: 'separator', label: ( localize(8104, "change view")) });
-        const action = await quickInputService.pick(picks, { placeHolder: ( localize(8105, "Select Action")), matchOnDetail: true });
+        }));
+        picks.splice(3, 0, { type: 'separator', label: ( localize(7467, "convert file")) });
+        picks.unshift({ type: 'separator', label: ( localize(7468, "change view")) });
+        const action = await quickInputService.pick(picks, { placeHolder: ( localize(7469, "Select Action")), matchOnDetail: true });
         if (!action) {
             return;
         }
@@ -576,15 +548,15 @@ registerAction2(class CommentSelectedCellsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: COMMENT_SELECTED_CELLS_ID,
-            title: ( localize(8106, "Comment Selected Cells")),
+            title: ( localize(7470, "Comment Selected Cells")),
             keybinding: {
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
                     NOTEBOOK_EDITOR_EDITABLE,
                     ContextKeyExpr.not(InputFocusedContextKey)
-                ))),
-                primary: 2048  | 90 ,
-                weight: 200
+                )),
+                primary: KeyMod.CtrlCmd | KeyCode.Slash,
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
@@ -593,30 +565,28 @@ registerAction2(class CommentSelectedCellsAction extends NotebookMultiCellAction
         context.selectedCells.forEach(async (cellViewModel) => {
             const textModel = await cellViewModel.resolveTextModel();
             const commentsOptions = cellViewModel.commentOptions;
-            const cellCommentCommand = ( (new LineCommentCommand(languageConfigurationService,
-            (new Selection(
+            const cellCommentCommand = ( new LineCommentCommand(languageConfigurationService, (
+            new Selection(
                 1,
                 1,
                 textModel.getLineCount(),
                 textModel.getLineMaxColumn(textModel.getLineCount())
-            )), textModel.getOptions().tabSize, 0 , commentsOptions.insertSpace ?? true, commentsOptions.ignoreEmptyLines ?? true, false)));
+            )), textModel.getOptions().tabSize, Type.Toggle, commentsOptions.insertSpace ?? true, commentsOptions.ignoreEmptyLines ?? true, false));
             const cellEditorSelections = cellViewModel.getSelections();
-            const initialTrackedRangesIDs = ( (cellEditorSelections.map(selection => {
-                return textModel._setTrackedRange(null, selection, 1 );
-            })));
+            const initialTrackedRangesIDs = ( cellEditorSelections.map(selection => {
+                return textModel._setTrackedRange(null, selection, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
+            }));
             CommandExecutor.executeCommands(textModel, cellEditorSelections, [cellCommentCommand]);
-            const newTrackedSelections = ( (( (initialTrackedRangesIDs.map(i => {
+            const newTrackedSelections = ( ( initialTrackedRangesIDs.map(i => {
                 return textModel._getTrackedRange(i);
-            }))).filter(r => !!r).map((range) => {
-                return (
-                     (new Selection(
-                        range.startLineNumber,
-                        range.startColumn,
-                        range.endLineNumber,
-                        range.endColumn
-                    ))
-                );
-            })));
+            })).filter(r => !!r).map((range) => {
+                return ( new Selection(
+                    range.startLineNumber,
+                    range.startColumn,
+                    range.endLineNumber,
+                    range.endColumn
+                ));
+            }));
             cellViewModel.setSelections(newTrackedSelections ?? []);
         });
     }

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

@@ -0,0 +1,3 @@
+export declare const executeCondition: import("vscode/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression | undefined;
+export declare const executeThisCellCondition: import("vscode/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression | undefined;
+export declare const executeSectionCondition: import("vscode/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression | undefined;