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

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

@@ -1,11 +1,12 @@
 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 { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { Selection } from 'vscode/vscode/vs/editor/common/core/selection';
+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';
@@ -43,7 +44,7 @@ registerAction2(class EditCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: EDIT_CELL_COMMAND_ID,
-            title: ( localize(8141, "Edit Cell")),
+            title: ( localize(7933, "Edit Cell")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
@@ -89,7 +90,7 @@ registerAction2(class QuitEditCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: QUIT_EDIT_CELL_COMMAND_ID,
-            title: ( localize(8142, "Stop Editing Cell")),
+            title: ( localize(7934, "Stop Editing Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(
@@ -139,7 +140,7 @@ registerAction2(class DeleteCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: DELETE_CELL_COMMAND_ID,
-            title: ( localize(8143, "Delete Cell")),
+            title: ( localize(7935, "Delete Cell")),
             keybinding: {
                 primary: KeyCode.Delete,
                 mac: {
@@ -176,13 +177,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(8144, "Delete"));
+            const primaryButton = ( localize(7936, "Delete"));
             confirmation = await dialogService.confirm({
                 type: 'question',
-                message: ( localize(8145, "This cell is running, are you sure you want to delete it?")),
+                message: ( localize(7937, "This cell is running, are you sure you want to delete it?")),
                 primaryButton: primaryButton,
                 checkbox: {
-                    label: ( localize(8146, "Do not ask me again"))
+                    label: ( localize(7938, "Do not ask me again"))
                 }
             });
         }
@@ -202,7 +203,7 @@ registerAction2(class ClearCellOutputsAction extends NotebookCellAction {
     constructor() {
         super({
             id: CLEAR_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize(8147, 'Clear Cell Outputs')),
+            title: ( localize(7939, 'Clear Cell Outputs')),
             menu: [
                 {
                     id: MenuId.NotebookCellTitle,
@@ -273,7 +274,7 @@ registerAction2(class ClearAllCellOutputsAction extends NotebookAction {
     constructor() {
         super({
             id: CLEAR_ALL_CELLS_OUTPUTS_COMMAND_ID,
-            title: ( localize(8148, 'Clear All Outputs')),
+            title: ( localize(7940, 'Clear All Outputs')),
             precondition: NOTEBOOK_HAS_OUTPUTS,
             menu: [
                 {
@@ -334,9 +335,9 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
     constructor() {
         super({
             id: CHANGE_CELL_LANGUAGE,
-            title: ( localize(8149, 'Change Cell Language')),
+            title: ( localize(7941, 'Change Cell Language')),
             metadata: {
-                description: ( localize(8149, 'Change Cell Language')),
+                description: ( localize(7941, 'Change Cell Language')),
                 args: [
                     {
                         name: 'range',
@@ -409,10 +410,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(8150, "({0}) - Current Language", languageId));
+                description = ( localize(7942, "({0}) - Current Language", languageId));
             }
             else {
-                description = ( localize(8151, "({0})", languageId));
+                description = ( localize(7943, "({0})", languageId));
             }
             const languageName = languageService.getLanguageName(languageId);
             if (!languageName) {
@@ -435,16 +436,16 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
             return a.description.localeCompare(b.description);
         });
         const autoDetectMode = {
-            label: ( localize(8152, "Auto Detect"))
+            label: ( localize(7944, "Auto Detect"))
         };
         const picks = [
             autoDetectMode,
-            { type: 'separator', label: ( localize(8153, "languages (identifier)")) },
+            { type: 'separator', label: ( localize(7945, "languages (identifier)")) },
             ...topItems,
             { type: 'separator' },
             ...mainItems
         ];
-        const selection = await quickInputService.pick(picks, { placeHolder: ( localize(8154, "Select Language Mode")) });
+        const selection = await quickInputService.pick(picks, { placeHolder: ( localize(7946, "Select Language Mode")) });
         const languageId = selection === autoDetectMode
             ? await languageDetectionService.detectLanguage(context.cell.uri)
             : selection?.languageId;
@@ -477,7 +478,7 @@ registerAction2(class DetectCellLanguageAction extends NotebookCellAction {
     constructor() {
         super({
             id: DETECT_CELL_LANGUAGE,
-            title: ( localize2(8155, "Accept Detected Language for Cell")),
+            title: ( localize2(7947, "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 }
@@ -495,7 +496,7 @@ registerAction2(class DetectCellLanguageAction extends NotebookCellAction {
             setCellToLanguage(detection, context);
         }
         else {
-            notificationService.warn(( localize(8156, "Unable to detect cell language")));
+            notificationService.warn(( localize(7948, "Unable to detect cell language")));
         }
     }
 });
@@ -520,7 +521,7 @@ registerAction2(class SelectNotebookIndentation extends NotebookAction {
     constructor() {
         super({
             id: SELECT_NOTEBOOK_INDENTATION_ID,
-            title: ( localize2(8157, 'Select Indentation')),
+            title: ( localize2(7949, 'Select Indentation')),
             f1: true,
             precondition: ( (ContextKeyExpr.and(
                 NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -538,10 +539,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(8158, "No notebook editor active at this time")) }]);
+            return quickInputService.pick([{ label: ( localize(7950, "No notebook editor active at this time")) }]);
         }
         if (activeNotebook.isReadOnly) {
-            return quickInputService.pick([{ label: ( localize(8159, "The active notebook editor is read-only.")) }]);
+            return quickInputService.pick([{ label: ( localize(7951, "The active notebook editor is read-only.")) }]);
         }
         const picks = ( ([
             (
@@ -563,9 +564,9 @@ registerAction2(class SelectNotebookIndentation extends NotebookAction {
                 }
             };
         })));
-        picks.splice(3, 0, { type: 'separator', label: ( localize(8160, "convert file")) });
-        picks.unshift({ type: 'separator', label: ( localize(8161, "change view")) });
-        const action = await quickInputService.pick(picks, { placeHolder: ( localize(8162, "Select Action")), matchOnDetail: true });
+        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 });
         if (!action) {
             return;
         }
@@ -578,7 +579,7 @@ registerAction2(class CommentSelectedCellsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: COMMENT_SELECTED_CELLS_ID,
-            title: ( localize(8163, "Comment Selected Cells")),
+            title: ( localize(7955, "Comment Selected Cells")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
@@ -592,36 +593,34 @@ registerAction2(class CommentSelectedCellsAction extends NotebookMultiCellAction
     }
     async runWithContext(accessor, context) {
         const languageConfigurationService = accessor.get(ILanguageConfigurationService);
-        const selectedCellEditors = [];
-        context.selectedCells.forEach(cell => {
-            const findContext = { notebookEditor: context.notebookEditor, cell };
-            const foundEditor = findTargetCellEditor(findContext, cell);
-            if (foundEditor) {
-                selectedCellEditors.push(foundEditor);
-            }
-        });
-        selectedCellEditors.forEach(editor => {
-            if (!editor.hasModel()) {
-                return;
-            }
-            const model = editor.getModel();
-            const commands = [];
-            const modelOptions = model.getOptions();
-            const commentsOptions = editor.getOption(EditorOption.comments);
-            const selection = editor.getSelection();
-            commands.push(( (new LineCommentCommand(
-                languageConfigurationService,
-                 (new Selection(1, 1, model.getLineCount(), model.getLineMaxColumn(model.getLineCount()))),
-                modelOptions.indentSize,
-                Type.Toggle,
-                commentsOptions.insertSpace,
-                commentsOptions.ignoreEmptyLines,
-                false
-            ))));
-            editor.pushUndoStop();
-            editor.executeCommands(COMMENT_SELECTED_CELLS_ID, commands);
-            editor.pushUndoStop();
-            editor.setSelection(selection);
+        context.selectedCells.forEach(async (cellViewModel) => {
+            const textModel = await cellViewModel.resolveTextModel();
+            const commentsOptions = cellViewModel.commentOptions;
+            const cellCommentCommand = ( (new LineCommentCommand(languageConfigurationService,
+            (new Selection(
+                1,
+                1,
+                textModel.getLineCount(),
+                textModel.getLineMaxColumn(textModel.getLineCount())
+            )), 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, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
+            })));
+            CommandExecutor.executeCommands(textModel, cellEditorSelections, [cellCommentCommand]);
+            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
+                    ))
+                );
+            })));
+            cellViewModel.setSelections(newTrackedSelections ?? []);
         });
     }
 });

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

@@ -90,7 +90,7 @@ registerAction2(class RenderAllMarkdownCellsAction extends NotebookAction {
     constructor() {
         super({
             id: RENDER_ALL_MARKDOWN_CELLS,
-            title: ( localize(8103, "Render All Markdown Cells")),
+            title: ( localize(7895, "Render All Markdown Cells")),
         });
     }
     async runWithContext(accessor, context) {
@@ -101,10 +101,10 @@ registerAction2(class ExecuteNotebookAction extends NotebookAction {
     constructor() {
         super({
             id: EXECUTE_NOTEBOOK_COMMAND_ID,
-            title: ( localize(8104, "Run All")),
+            title: ( localize(7896, "Run All")),
             icon: executeAllIcon,
             metadata: {
-                description: ( localize(8104, "Run All")),
+                description: ( localize(7896, "Run All")),
                 args: [
                     {
                         name: 'uri',
@@ -162,7 +162,7 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
         super({
             id: EXECUTE_CELL_COMMAND_ID,
             precondition: executeThisCellCondition,
-            title: ( localize(8105, "Execute Cell")),
+            title: ( localize(7897, "Execute Cell")),
             keybinding: {
                 when: ( (ContextKeyExpr.or(
                     NOTEBOOK_CELL_LIST_FOCUSED,
@@ -180,7 +180,7 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
                 group: 'inline'
             },
             metadata: {
-                description: ( localize(8105, "Execute Cell")),
+                description: ( localize(7897, "Execute Cell")),
                 args: cellExecutionArgs
             },
             icon: executeIcon
@@ -214,7 +214,7 @@ registerAction2(class ExecuteAboveCells extends NotebookMultiCellAction {
         super({
             id: EXECUTE_CELLS_ABOVE,
             precondition: executeCondition,
-            title: ( localize(8106, "Execute Above Cells")),
+            title: ( localize(7898, "Execute Above Cells")),
             menu: [
                 {
                     id: MenuId.NotebookCellExecute,
@@ -260,7 +260,7 @@ registerAction2(class ExecuteCellAndBelow extends NotebookMultiCellAction {
         super({
             id: EXECUTE_CELL_AND_BELOW,
             precondition: executeCondition,
-            title: ( localize(8107, "Execute Cell and Below")),
+            title: ( localize(7899, "Execute Cell and Below")),
             menu: [
                 {
                     id: MenuId.NotebookCellExecute,
@@ -306,9 +306,9 @@ registerAction2(class ExecuteCellFocusContainer extends NotebookMultiCellAction
         super({
             id: EXECUTE_CELL_FOCUS_CONTAINER_COMMAND_ID,
             precondition: executeThisCellCondition,
-            title: ( localize(8108, "Execute Cell and Focus Container")),
+            title: ( localize(7900, "Execute Cell and Focus Container")),
             metadata: {
-                description: ( localize(8108, "Execute Cell and Focus Container")),
+                description: ( localize(7900, "Execute Cell and Focus Container")),
                 args: cellExecutionArgs
             },
             icon: executeIcon
@@ -340,7 +340,7 @@ registerAction2(class CancelExecuteCell extends NotebookMultiCellAction {
         super({
             id: CANCEL_CELL_COMMAND_ID,
             precondition: cellCancelCondition,
-            title: ( localize(8109, "Stop Cell Execution")),
+            title: ( localize(7901, "Stop Cell Execution")),
             icon: stopIcon,
             menu: {
                 id: MenuId.NotebookCellExecutePrimary,
@@ -348,7 +348,7 @@ registerAction2(class CancelExecuteCell extends NotebookMultiCellAction {
                 group: 'inline'
             },
             metadata: {
-                description: ( localize(8109, "Stop Cell Execution")),
+                description: ( localize(7901, "Stop Cell Execution")),
                 args: [
                     {
                         name: 'options',
@@ -406,7 +406,7 @@ registerAction2(class ExecuteCellSelectBelow extends NotebookCellAction {
                 executeThisCellCondition,
                  (NOTEBOOK_CELL_TYPE.isEqualTo('markup'))
             ))),
-            title: ( localize(8110, "Execute Notebook Cell and Select Below")),
+            title: ( localize(7902, "Execute Notebook Cell and Select Below")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
@@ -472,7 +472,7 @@ registerAction2(class ExecuteCellInsertBelow extends NotebookCellAction {
                 executeThisCellCondition,
                  (NOTEBOOK_CELL_TYPE.isEqualTo('markup'))
             ))),
-            title: ( localize(8111, "Execute Notebook Cell and Insert Below")),
+            title: ( localize(7903, "Execute Notebook Cell and Insert Below")),
             keybinding: {
                 when: NOTEBOOK_CELL_LIST_FOCUSED,
                 primary: KeyMod.Alt | KeyCode.Enter,
@@ -509,7 +509,7 @@ registerAction2(class CancelAllNotebook extends CancelNotebook {
     constructor() {
         super({
             id: CANCEL_NOTEBOOK_COMMAND_ID,
-            title: ( localize2(8112, "Stop Execution")),
+            title: ( localize2(7904, "Stop Execution")),
             icon: stopIcon,
             menu: [
                 {
@@ -541,7 +541,7 @@ registerAction2(class InterruptNotebook extends CancelNotebook {
     constructor() {
         super({
             id: INTERRUPT_NOTEBOOK_COMMAND_ID,
-            title: ( localize2(8113, "Interrupt")),
+            title: ( localize2(7905, "Interrupt")),
             precondition: ( (ContextKeyExpr.and(NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL))),
             icon: stopIcon,
             menu: [
@@ -575,7 +575,7 @@ registerAction2(class InterruptNotebook extends CancelNotebook {
     }
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
-    title: ( localize(8114, "Go To")),
+    title: ( localize(7906, "Go To")),
     submenu: MenuId.NotebookCellExecuteGoTo,
     group: 'navigation/execute',
     order: 20,
@@ -585,9 +585,9 @@ registerAction2(class RevealRunningCellAction extends NotebookAction {
     constructor() {
         super({
             id: REVEAL_RUNNING_CELL,
-            title: ( localize(8115, "Go to Running Cell")),
-            tooltip: ( localize(8115, "Go to Running Cell")),
-            shortTitle: ( localize(8115, "Go to Running Cell")),
+            title: ( localize(7907, "Go to Running Cell")),
+            tooltip: ( localize(7907, "Go to Running Cell")),
+            shortTitle: ( localize(7907, "Go to Running Cell")),
             precondition: NOTEBOOK_HAS_RUNNING_CELL,
             menu: [
                 {
@@ -656,9 +656,9 @@ registerAction2(class RevealLastFailedCellAction extends NotebookAction {
     constructor() {
         super({
             id: REVEAL_LAST_FAILED_CELL,
-            title: ( localize(8116, "Go to Most Recently Failed Cell")),
-            tooltip: ( localize(8116, "Go to Most Recently Failed Cell")),
-            shortTitle: ( localize(8117, "Go to Most Recently 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")),
             precondition: NOTEBOOK_LAST_CELL_FAILED,
             menu: [
                 {

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

@@ -55,7 +55,7 @@ registerAction2(class InsertCodeCellAboveAction extends InsertCellCommand {
     constructor() {
         super({
             id: INSERT_CODE_CELL_ABOVE_COMMAND_ID,
-            title: ( localize(8087, "Insert Code Cell Above")),
+            title: ( localize(7879, "Insert Code Cell Above")),
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter,
                 when: ( (ContextKeyExpr.and(
@@ -75,7 +75,7 @@ registerAction2(class InsertCodeCellAboveAndFocusContainerAction extends InsertC
     constructor() {
         super({
             id: INSERT_CODE_CELL_ABOVE_AND_FOCUS_CONTAINER_COMMAND_ID,
-            title: ( localize(8088, "Insert Code Cell Above and Focus Container"))
+            title: ( localize(7880, "Insert Code Cell Above and Focus Container"))
         }, CellKind.Code, 'above', false);
     }
 });
@@ -83,7 +83,7 @@ registerAction2(class InsertCodeCellBelowAction extends InsertCellCommand {
     constructor() {
         super({
             id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
-            title: ( localize(8089, "Insert Code Cell Below")),
+            title: ( localize(7881, "Insert Code Cell Below")),
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.Enter,
                 when: ( (ContextKeyExpr.and(
@@ -104,7 +104,7 @@ registerAction2(class InsertCodeCellBelowAndFocusContainerAction extends InsertC
     constructor() {
         super({
             id: INSERT_CODE_CELL_BELOW_AND_FOCUS_CONTAINER_COMMAND_ID,
-            title: ( localize(8090, "Insert Code Cell Below and Focus Container")),
+            title: ( localize(7882, "Insert Code Cell Below and Focus Container")),
         }, CellKind.Code, 'below', false);
     }
 });
@@ -112,7 +112,7 @@ registerAction2(class InsertMarkdownCellAboveAction extends InsertCellCommand {
     constructor() {
         super({
             id: INSERT_MARKDOWN_CELL_ABOVE_COMMAND_ID,
-            title: ( localize(8091, "Insert Markdown Cell Above")),
+            title: ( localize(7883, "Insert Markdown Cell Above")),
             menu: {
                 id: MenuId.NotebookCellInsert,
                 order: 2
@@ -124,7 +124,7 @@ registerAction2(class InsertMarkdownCellBelowAction extends InsertCellCommand {
     constructor() {
         super({
             id: INSERT_MARKDOWN_CELL_BELOW_COMMAND_ID,
-            title: ( localize(8092, "Insert Markdown Cell Below")),
+            title: ( localize(7884, "Insert Markdown Cell Below")),
             menu: {
                 id: MenuId.NotebookCellInsert,
                 order: 3
@@ -136,7 +136,7 @@ registerAction2(class InsertCodeCellAtTopAction extends NotebookAction {
     constructor() {
         super({
             id: INSERT_CODE_CELL_AT_TOP_COMMAND_ID,
-            title: ( localize(8093, "Add Code Cell At Top")),
+            title: ( localize(7885, "Add Code Cell At Top")),
             f1: false
         });
     }
@@ -158,7 +158,7 @@ registerAction2(class InsertMarkdownCellAtTopAction extends NotebookAction {
     constructor() {
         super({
             id: INSERT_MARKDOWN_CELL_AT_TOP_COMMAND_ID,
-            title: ( localize(8094, "Add Markdown Cell At Top")),
+            title: ( localize(7886, "Add Markdown Cell At Top")),
             f1: false
         });
     }
@@ -179,8 +179,8 @@ registerAction2(class InsertMarkdownCellAtTopAction extends NotebookAction {
 MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
     command: {
         id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
-        title: '$(add) ' + ( localize(8095, "Code")),
-        tooltip: ( localize(8096, "Add Code Cell"))
+        title: '$(add) ' + ( localize(7887, "Code")),
+        tooltip: ( localize(7888, "Add Code Cell"))
     },
     order: 0,
     group: 'inline',
@@ -192,9 +192,9 @@ MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
 MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
     command: {
         id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
-        title: ( localize(8097, "Add Code")),
+        title: ( localize(7889, "Add Code")),
         icon: Codicon.add,
-        tooltip: ( localize(8096, "Add Code Cell"))
+        tooltip: ( localize(7888, "Add Code Cell"))
     },
     order: 0,
     group: 'inline',
@@ -207,8 +207,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
         icon: Codicon.add,
-        title: ( localize(8098, "Code")),
-        tooltip: ( localize(8096, "Add Code Cell"))
+        title: ( localize(7890, "Code")),
+        tooltip: ( localize(7888, "Add Code Cell"))
     },
     order: -5,
     group: 'navigation/add',
@@ -221,8 +221,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
 MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
     command: {
         id: INSERT_CODE_CELL_AT_TOP_COMMAND_ID,
-        title: '$(add) ' + ( localize(8095, "Code")),
-        tooltip: ( localize(8096, "Add Code Cell"))
+        title: '$(add) ' + ( localize(7887, "Code")),
+        tooltip: ( localize(7888, "Add Code Cell"))
     },
     order: 0,
     group: 'inline',
@@ -234,9 +234,9 @@ MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
 MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
     command: {
         id: INSERT_CODE_CELL_AT_TOP_COMMAND_ID,
-        title: ( localize(8099, "Add Code")),
+        title: ( localize(7891, "Add Code")),
         icon: Codicon.add,
-        tooltip: ( localize(8096, "Add Code Cell"))
+        tooltip: ( localize(7888, "Add Code Cell"))
     },
     order: 0,
     group: 'inline',
@@ -248,8 +248,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
 MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
     command: {
         id: INSERT_MARKDOWN_CELL_BELOW_COMMAND_ID,
-        title: '$(add) ' + ( localize(8100, "Markdown")),
-        tooltip: ( localize(8101, "Add Markdown Cell"))
+        title: '$(add) ' + ( localize(7892, "Markdown")),
+        tooltip: ( localize(7893, "Add Markdown Cell"))
     },
     order: 1,
     group: 'inline',
@@ -262,8 +262,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: INSERT_MARKDOWN_CELL_BELOW_COMMAND_ID,
         icon: Codicon.add,
-        title: ( localize(8102, "Markdown")),
-        tooltip: ( localize(8101, "Add Markdown Cell"))
+        title: ( localize(7894, "Markdown")),
+        tooltip: ( localize(7893, "Add Markdown Cell"))
     },
     order: -5,
     group: 'navigation/add',
@@ -278,8 +278,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
 MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
     command: {
         id: INSERT_MARKDOWN_CELL_AT_TOP_COMMAND_ID,
-        title: '$(add) ' + ( localize(8100, "Markdown")),
-        tooltip: ( localize(8101, "Add Markdown Cell"))
+        title: '$(add) ' + ( localize(7892, "Markdown")),
+        tooltip: ( localize(7893, "Add Markdown Cell"))
     },
     order: 1,
     group: 'inline',