@codingame/monaco-vscode-notebook-service-override 25.1.2 → 26.0.0

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

@@ -22,168 +22,171 @@ import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/work
 registerAction2(class NotebookConfigureLayoutAction extends Action2 {
     constructor() {
         super({
-            id: 'workbench.notebook.layout.select',
-            title: ( localize2(9431, "Select between Notebook Layouts")),
+            id: "workbench.notebook.layout.select",
+            title: ( localize2(9751, "Select between Notebook Layouts")),
             f1: true,
             precondition: ( ContextKeyExpr.equals(`config.${NotebookSetting.openGettingStarted}`, true)),
             category: NOTEBOOK_ACTIONS_CATEGORY,
-            menu: [
-                {
-                    id: MenuId.EditorTitle,
-                    group: 'notebookLayout',
-                    when: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, ( ContextKeyExpr.notEquals('config.notebook.globalToolbar', true)), ( ContextKeyExpr.equals(`config.${NotebookSetting.openGettingStarted}`, true)))),
-                    order: 0
-                },
-                {
-                    id: MenuId.NotebookToolbar,
-                    group: 'notebookLayout',
-                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.globalToolbar', true)), ( ContextKeyExpr.equals(`config.${NotebookSetting.openGettingStarted}`, true)))),
-                    order: 0
-                }
-            ]
+            menu: [{
+                id: MenuId.EditorTitle,
+                group: "notebookLayout",
+                when: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, ( ContextKeyExpr.notEquals("config.notebook.globalToolbar", true)), ( ContextKeyExpr.equals(`config.${NotebookSetting.openGettingStarted}`, true)))),
+                order: 0
+            }, {
+                id: MenuId.NotebookToolbar,
+                group: "notebookLayout",
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("config.notebook.globalToolbar", true)), ( ContextKeyExpr.equals(`config.${NotebookSetting.openGettingStarted}`, true)))),
+                order: 0
+            }]
         });
     }
     run(accessor) {
-        accessor.get(ICommandService).executeCommand('workbench.action.openWalkthrough', { category: 'notebooks', step: 'notebookProfile' }, true);
+        accessor.get(ICommandService).executeCommand("workbench.action.openWalkthrough", {
+            category: "notebooks",
+            step: "notebookProfile"
+        }, true);
     }
 });
 registerAction2(class NotebookConfigureLayoutAction extends Action2 {
     constructor() {
         super({
-            id: 'workbench.notebook.layout.configure',
-            title: ( localize2(9432, "Customize Notebook Layout")),
+            id: "workbench.notebook.layout.configure",
+            title: ( localize2(9752, "Customize Notebook Layout")),
             f1: true,
             category: NOTEBOOK_ACTIONS_CATEGORY,
-            menu: [
-                {
-                    id: MenuId.NotebookToolbar,
-                    group: 'notebookLayout',
-                    when: ( ContextKeyExpr.equals('config.notebook.globalToolbar', true)),
-                    order: 1
-                }
-            ]
+            menu: [{
+                id: MenuId.NotebookToolbar,
+                group: "notebookLayout",
+                when: ( ContextKeyExpr.equals("config.notebook.globalToolbar", true)),
+                order: 1
+            }]
         });
     }
     run(accessor) {
-        accessor.get(IPreferencesService).openSettings({ jsonEditor: false, query: '@tag:notebookLayout' });
+        accessor.get(IPreferencesService).openSettings({
+            jsonEditor: false,
+            query: "@tag:notebookLayout"
+        });
     }
 });
 registerAction2(class NotebookConfigureLayoutFromEditorTitle extends Action2 {
     constructor() {
         super({
-            id: 'workbench.notebook.layout.configure.editorTitle',
-            title: ( localize2(9432, "Customize Notebook Layout")),
+            id: "workbench.notebook.layout.configure.editorTitle",
+            title: ( localize2(9752, "Customize Notebook Layout")),
             f1: false,
             category: NOTEBOOK_ACTIONS_CATEGORY,
-            menu: [
-                {
-                    id: MenuId.NotebookEditorLayoutConfigure,
-                    group: 'notebookLayout',
-                    when: NOTEBOOK_IS_ACTIVE_EDITOR,
-                    order: 1
-                }
-            ]
+            menu: [{
+                id: MenuId.NotebookEditorLayoutConfigure,
+                group: "notebookLayout",
+                when: NOTEBOOK_IS_ACTIVE_EDITOR,
+                order: 1
+            }]
         });
     }
     run(accessor) {
-        accessor.get(IPreferencesService).openSettings({ jsonEditor: false, query: '@tag:notebookLayout' });
+        accessor.get(IPreferencesService).openSettings({
+            jsonEditor: false,
+            query: "@tag:notebookLayout"
+        });
     }
 });
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     submenu: MenuId.NotebookEditorLayoutConfigure,
-    title: ( localize2(9433, "Customize Notebook...")),
+    title: ( localize2(9753, "Customize Notebook...")),
     icon: Codicon.gear,
-    group: 'navigation',
+    group: "navigation",
     order: -1,
     when: NOTEBOOK_IS_ACTIVE_EDITOR
 });
 registerAction2(class ToggleLineNumberFromEditorTitle extends Action2 {
     constructor() {
         super({
-            id: 'notebook.toggleLineNumbersFromEditorTitle',
-            title: ( localize2(9434, 'Toggle Notebook Line Numbers')),
-            shortTitle: ( localize2(9435, 'Line Numbers')),
+            id: "notebook.toggleLineNumbersFromEditorTitle",
+            title: ( localize2(9754, "Toggle Notebook Line Numbers")),
+            shortTitle: ( localize2(9755, "Line Numbers")),
             precondition: NOTEBOOK_EDITOR_FOCUSED,
-            menu: [
-                {
-                    id: MenuId.NotebookEditorLayoutConfigure,
-                    group: 'notebookLayoutDetails',
-                    order: 1,
-                    when: NOTEBOOK_IS_ACTIVE_EDITOR
-                }
-            ],
+            menu: [{
+                id: MenuId.NotebookEditorLayoutConfigure,
+                group: "notebookLayoutDetails",
+                order: 1,
+                when: NOTEBOOK_IS_ACTIVE_EDITOR
+            }],
             category: NOTEBOOK_ACTIONS_CATEGORY,
             f1: true,
             toggled: {
-                condition: ( ContextKeyExpr.notEquals('config.notebook.lineNumbers', 'off')),
-                title: ( localize(9436, "Line Numbers")),
+                condition: ( ContextKeyExpr.notEquals("config.notebook.lineNumbers", "off")),
+                title: ( localize(9756, "Line Numbers"))
             }
         });
     }
     async run(accessor) {
-        return accessor.get(ICommandService).executeCommand('notebook.toggleLineNumbers');
+        return accessor.get(ICommandService).executeCommand("notebook.toggleLineNumbers");
     }
 });
 registerAction2(class ToggleCellToolbarPositionFromEditorTitle extends Action2 {
     constructor() {
         super({
-            id: 'notebook.toggleCellToolbarPositionFromEditorTitle',
-            title: ( localize2(9437, 'Toggle Cell Toolbar Position')),
+            id: "notebook.toggleCellToolbarPositionFromEditorTitle",
+            title: ( localize2(9757, "Toggle Cell Toolbar Position")),
             menu: [{
-                    id: MenuId.NotebookEditorLayoutConfigure,
-                    group: 'notebookLayoutDetails',
-                    order: 3
-                }],
+                id: MenuId.NotebookEditorLayoutConfigure,
+                group: "notebookLayoutDetails",
+                order: 3
+            }],
             category: NOTEBOOK_ACTIONS_CATEGORY,
             f1: false
         });
     }
     async run(accessor, ...args) {
-        return accessor.get(ICommandService).executeCommand('notebook.toggleCellToolbarPosition', ...args);
+        return accessor.get(ICommandService).executeCommand("notebook.toggleCellToolbarPosition", ...args);
     }
 });
 registerAction2(class ToggleBreadcrumbFromEditorTitle extends Action2 {
     constructor() {
         super({
-            id: 'breadcrumbs.toggleFromEditorTitle',
-            title: ( localize2(9438, 'Toggle Breadcrumbs')),
-            shortTitle: ( localize2(9439, 'Breadcrumbs')),
+            id: "breadcrumbs.toggleFromEditorTitle",
+            title: ( localize2(9758, "Toggle Breadcrumbs")),
+            shortTitle: ( localize2(9759, "Breadcrumbs")),
             toggled: {
-                condition: ( ContextKeyExpr.equals('config.breadcrumbs.enabled', true)),
-                title: ( localize(9440, "Breadcrumbs"))
+                condition: ( ContextKeyExpr.equals("config.breadcrumbs.enabled", true)),
+                title: ( localize(9760, "Breadcrumbs"))
             },
             menu: [{
-                    id: MenuId.NotebookEditorLayoutConfigure,
-                    group: 'notebookLayoutDetails',
-                    order: 2
-                }],
+                id: MenuId.NotebookEditorLayoutConfigure,
+                group: "notebookLayoutDetails",
+                order: 2
+            }],
             category: NOTEBOOK_ACTIONS_CATEGORY,
             f1: false
         });
     }
     async run(accessor) {
-        return accessor.get(ICommandService).executeCommand('breadcrumbs.toggle');
+        return accessor.get(ICommandService).executeCommand("breadcrumbs.toggle");
     }
 });
 registerAction2(class SaveMimeTypeDisplayOrder extends Action2 {
     constructor() {
         super({
-            id: 'notebook.saveMimeTypeOrder',
-            title: ( localize2(9441, "Save Mimetype Display Order")),
+            id: "notebook.saveMimeTypeOrder",
+            title: ( localize2(9761, "Save Mimetype Display Order")),
             f1: true,
             category: NOTEBOOK_ACTIONS_CATEGORY,
-            precondition: NOTEBOOK_IS_ACTIVE_EDITOR,
+            precondition: NOTEBOOK_IS_ACTIVE_EDITOR
         });
     }
     run(accessor) {
         const service = accessor.get(INotebookService);
         const disposables = ( new DisposableStore());
         const qp = disposables.add(accessor.get(IQuickInputService).createQuickPick());
-        qp.placeholder = ( localize(9442, 'Settings file to save in'));
-        qp.items = [
-            { target: ConfigurationTarget.USER, label: ( localize(9443, 'User Settings')) },
-            { target: ConfigurationTarget.WORKSPACE, label: ( localize(9444, 'Workspace Settings')) },
-        ];
+        qp.placeholder = ( localize(9762, "Settings file to save in"));
+        qp.items = [{
+            target: ConfigurationTarget.USER,
+            label: ( localize(9763, "User Settings"))
+        }, {
+            target: ConfigurationTarget.WORKSPACE,
+            label: ( localize(9764, "Workspace Settings"))
+        }];
         disposables.add(qp.onDidAccept(() => {
             const target = qp.selectedItems[0]?.target;
             if (target !== undefined) {
@@ -198,8 +201,8 @@ registerAction2(class SaveMimeTypeDisplayOrder extends Action2 {
 registerAction2(class NotebookWebviewResetAction extends Action2 {
     constructor() {
         super({
-            id: 'workbench.notebook.layout.webview.reset',
-            title: ( localize2(9445, "Reset Notebook Webview")),
+            id: "workbench.notebook.layout.webview.reset",
+            title: ( localize2(9765, "Reset Notebook Webview")),
             f1: false,
             category: NOTEBOOK_ACTIONS_CATEGORY
         });
@@ -215,8 +218,7 @@ registerAction2(class NotebookWebviewResetAction extends Action2 {
                     widget.getInnerWebview()?.reload();
                 }
             }
-        }
-        else {
+        } else {
             const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
             if (!editor) {
                 return;
@@ -228,28 +230,34 @@ registerAction2(class NotebookWebviewResetAction extends Action2 {
 registerAction2(class ToggleNotebookStickyScroll extends Action2 {
     constructor() {
         super({
-            id: 'notebook.action.toggleNotebookStickyScroll',
+            id: "notebook.action.toggleNotebookStickyScroll",
             title: {
-                ...( localize2(9446, "Toggle Notebook Sticky Scroll")),
-                mnemonicTitle: ( localize(9447, "&&Sticky Scroll")),
+                ...( localize2(9766, "Toggle Notebook Sticky Scroll")),
+                mnemonicTitle: ( localize(9767, "&&Sticky Scroll"))
             },
-            shortTitle: ( localize2(9448, "Sticky Scroll")),
+            shortTitle: ( localize2(9768, "Sticky Scroll")),
             category: Categories.View,
             toggled: {
-                condition: ( ContextKeyExpr.equals('config.notebook.stickyScroll.enabled', true)),
-                title: ( localize(9449, "Sticky Scroll")),
-                mnemonicTitle: ( localize(9447, "&&Sticky Scroll")),
+                condition: ( ContextKeyExpr.equals("config.notebook.stickyScroll.enabled", true)),
+                title: ( localize(9769, "Sticky Scroll")),
+                mnemonicTitle: ( localize(9767, "&&Sticky Scroll"))
             },
-            menu: [
-                { id: MenuId.CommandPalette },
-                { id: MenuId.NotebookStickyScrollContext, group: 'notebookView', order: 2 },
-                { id: MenuId.NotebookToolbarContext, group: 'notebookView', order: 2 }
-            ]
+            menu: [{
+                id: MenuId.CommandPalette
+            }, {
+                id: MenuId.NotebookStickyScrollContext,
+                group: "notebookView",
+                order: 2
+            }, {
+                id: MenuId.NotebookToolbarContext,
+                group: "notebookView",
+                order: 2
+            }]
         });
     }
     async run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        const newValue = !configurationService.getValue('notebook.stickyScroll.enabled');
-        return configurationService.updateValue('notebook.stickyScroll.enabled', newValue);
+        const newValue = !configurationService.getValue("notebook.stickyScroll.enabled");
+        return configurationService.updateValue("notebook.stickyScroll.enabled", newValue);
     }
 });

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

@@ -15,12 +15,14 @@ import { isNotebookEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/wo
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 class NotebookIndentUsingTabs extends Action2 {
-    static { this.ID = 'notebook.action.indentUsingTabs'; }
+    static {
+        this.ID = "notebook.action.indentUsingTabs";
+    }
     constructor() {
         super({
             id: NotebookIndentUsingTabs.ID,
-            title: ( localize(9450, "Indent Using Tabs")),
-            precondition: undefined,
+            title: ( localize(9770, "Indent Using Tabs")),
+            precondition: undefined
         });
     }
     run(accessor, ...args) {
@@ -28,12 +30,14 @@ class NotebookIndentUsingTabs extends Action2 {
     }
 }
 class NotebookIndentUsingSpaces extends Action2 {
-    static { this.ID = 'notebook.action.indentUsingSpaces'; }
+    static {
+        this.ID = "notebook.action.indentUsingSpaces";
+    }
     constructor() {
         super({
             id: NotebookIndentUsingSpaces.ID,
-            title: ( localize(9451, "Indent Using Spaces")),
-            precondition: undefined,
+            title: ( localize(9771, "Indent Using Spaces")),
+            precondition: undefined
         });
     }
     run(accessor, ...args) {
@@ -41,12 +45,14 @@ class NotebookIndentUsingSpaces extends Action2 {
     }
 }
 class NotebookChangeTabDisplaySize extends Action2 {
-    static { this.ID = 'notebook.action.changeTabDisplaySize'; }
+    static {
+        this.ID = "notebook.action.changeTabDisplaySize";
+    }
     constructor() {
         super({
             id: NotebookChangeTabDisplaySize.ID,
-            title: ( localize(9452, "Change Tab Display Size")),
-            precondition: undefined,
+            title: ( localize(9772, "Change Tab Display Size")),
+            precondition: undefined
         });
     }
     run(accessor, ...args) {
@@ -54,12 +60,14 @@ class NotebookChangeTabDisplaySize extends Action2 {
     }
 }
 class NotebookIndentationToSpacesAction extends Action2 {
-    static { this.ID = 'notebook.action.convertIndentationToSpaces'; }
+    static {
+        this.ID = "notebook.action.convertIndentationToSpaces";
+    }
     constructor() {
         super({
             id: NotebookIndentationToSpacesAction.ID,
-            title: ( localize(9453, "Convert Indentation to Spaces")),
-            precondition: undefined,
+            title: ( localize(9773, "Convert Indentation to Spaces")),
+            precondition: undefined
         });
     }
     run(accessor, ...args) {
@@ -67,12 +75,14 @@ class NotebookIndentationToSpacesAction extends Action2 {
     }
 }
 class NotebookIndentationToTabsAction extends Action2 {
-    static { this.ID = 'notebook.action.convertIndentationToTabs'; }
+    static {
+        this.ID = "notebook.action.convertIndentationToTabs";
+    }
     constructor() {
         super({
             id: NotebookIndentationToTabsAction.ID,
-            title: ( localize(9454, "Convert Indentation to Tabs")),
-            precondition: undefined,
+            title: ( localize(9774, "Convert Indentation to Tabs")),
+            precondition: undefined
         });
     }
     run(accessor, ...args) {
@@ -95,31 +105,32 @@ function changeNotebookIndentation(accessor, insertSpaces, displaySizeOnly) {
     }
     const picks = ( [1, 2, 3, 4, 5, 6, 7, 8].map(n => ({
         id: ( n.toString()),
-        label: ( n.toString()),
+        label: ( n.toString())
     })));
     const initialConfig = configurationService.getValue(NotebookSetting.cellEditorOptionsCustomizations);
-    const initialInsertSpaces = initialConfig['editor.insertSpaces'];
-    delete initialConfig['editor.indentSize'];
-    delete initialConfig['editor.tabSize'];
-    delete initialConfig['editor.insertSpaces'];
+    const initialInsertSpaces = initialConfig["editor.insertSpaces"];
+    delete initialConfig["editor.indentSize"];
+    delete initialConfig["editor.tabSize"];
+    delete initialConfig["editor.insertSpaces"];
     setTimeout(() => {
-        quickInputService.pick(picks, { placeHolder: ( localize(9455, "Select Tab Size for Current File")) }).then(pick => {
+        quickInputService.pick(picks, {
+            placeHolder: ( localize(9775, "Select Tab Size for Current File"))
+        }).then(pick => {
             if (pick) {
                 const pickedVal = parseInt(pick.label, 10);
                 if (displaySizeOnly) {
                     configurationService.updateValue(NotebookSetting.cellEditorOptionsCustomizations, {
                         ...initialConfig,
-                        'editor.tabSize': pickedVal,
-                        'editor.indentSize': pickedVal,
-                        'editor.insertSpaces': initialInsertSpaces
+                        "editor.tabSize": pickedVal,
+                        "editor.indentSize": pickedVal,
+                        "editor.insertSpaces": initialInsertSpaces
                     });
-                }
-                else {
+                } else {
                     configurationService.updateValue(NotebookSetting.cellEditorOptionsCustomizations, {
                         ...initialConfig,
-                        'editor.tabSize': pickedVal,
-                        'editor.indentSize': pickedVal,
-                        'editor.insertSpaces': insertSpaces
+                        "editor.tabSize": pickedVal,
+                        "editor.indentSize": pickedVal,
+                        "editor.insertSpaces": insertSpaces
                     });
                 }
             }
@@ -144,7 +155,7 @@ function convertNotebookIndentation(accessor, tabsToSpaces) {
     }
     const disposable = ( new DisposableStore());
     try {
-        Promise.all(( notebookTextModel.cells.map(async (cell) => {
+        Promise.all(( notebookTextModel.cells.map(async cell => {
             const ref = await textModelService.createModelReference(cell.uri);
             disposable.add(ref);
             const textEditorModel = ref.object.textEditorModel;
@@ -153,36 +164,38 @@ function convertNotebookIndentation(accessor, tabsToSpaces) {
                 return;
             }
             const edits = getIndentationEditOperations(textEditorModel, modelOpts.tabSize, tabsToSpaces);
-            bulkEditService.apply(edits, { label: ( localize(9456, "Convert Indentation")), code: 'undoredo.convertIndentation', });
+            bulkEditService.apply(edits, {
+                label: ( localize(9776, "Convert Indentation")),
+                code: "undoredo.convertIndentation"
+            });
         }))).then(() => {
             const initialConfig = configurationService.getValue(NotebookSetting.cellEditorOptionsCustomizations);
-            const initialIndentSize = initialConfig['editor.indentSize'];
-            const initialTabSize = initialConfig['editor.tabSize'];
-            delete initialConfig['editor.indentSize'];
-            delete initialConfig['editor.tabSize'];
-            delete initialConfig['editor.insertSpaces'];
+            const initialIndentSize = initialConfig["editor.indentSize"];
+            const initialTabSize = initialConfig["editor.tabSize"];
+            delete initialConfig["editor.indentSize"];
+            delete initialConfig["editor.tabSize"];
+            delete initialConfig["editor.insertSpaces"];
             configurationService.updateValue(NotebookSetting.cellEditorOptionsCustomizations, {
                 ...initialConfig,
-                'editor.tabSize': initialTabSize,
-                'editor.indentSize': initialIndentSize,
-                'editor.insertSpaces': tabsToSpaces
+                "editor.tabSize": initialTabSize,
+                "editor.indentSize": initialIndentSize,
+                "editor.insertSpaces": tabsToSpaces
             });
             disposable.dispose();
         });
-    }
-    catch {
-        logService.error('Failed to convert indentation to spaces for notebook cells.');
+    } catch {
+        logService.error("Failed to convert indentation to spaces for notebook cells.");
     }
 }
 function getIndentationEditOperations(model, tabSize, tabsToSpaces) {
     if (model.getLineCount() === 1 && model.getLineMaxColumn(1) === 1) {
         return [];
     }
-    let spaces = '';
+    let spaces = "";
     for (let i = 0; i < tabSize; i++) {
-        spaces += ' ';
+        spaces += " ";
     }
-    const spacesRegExp = ( new RegExp(spaces, 'gi'));
+    const spacesRegExp = ( new RegExp(spaces, "gi"));
     const edits = [];
     for (let lineNumber = 1, lineCount = model.getLineCount(); lineNumber <= lineCount; lineNumber++) {
         let lastIndentationColumn = model.getLineFirstNonWhitespaceColumn(lineNumber);
@@ -194,10 +207,11 @@ function getIndentationEditOperations(model, tabSize, tabsToSpaces) {
         }
         const originalIndentationRange = ( new Range(lineNumber, 1, lineNumber, lastIndentationColumn));
         const originalIndentation = model.getValueInRange(originalIndentationRange);
-        const newIndentation = (tabsToSpaces
-            ? originalIndentation.replace(/\t/ig, spaces)
-            : originalIndentation.replace(spacesRegExp, '\t'));
-        edits.push(( new ResourceTextEdit(model.uri, { range: originalIndentationRange, text: newIndentation })));
+        const newIndentation = (tabsToSpaces ? originalIndentation.replace(/\t/ig, spaces) : originalIndentation.replace(spacesRegExp, "\t"));
+        edits.push(( new ResourceTextEdit(model.uri, {
+            range: originalIndentationRange,
+            text: newIndentation
+        })));
     }
     return edits;
 }