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

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFind.js

@@ -12,7 +12,7 @@ import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { NotebookFindContrib } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
+import { NotebookFindContrib } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
 import { NotebookMultiCellAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { registerNotebookContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
@@ -26,8 +26,8 @@ registerNotebookContribution(NotebookFindContrib.id, NotebookFindContrib);
 registerAction2(class extends Action2 {
     constructor() {
         super({
-            id: 'notebook.hideFind',
-            title: ( localize2(9269, 'Hide Find in Notebook')),
+            id: "notebook.hideFind",
+            title: ( localize2(9589, "Hide Find in Notebook")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, CONTEXT_FIND_WIDGET_VISIBLE)),
                 primary: KeyCode.Escape,
@@ -49,8 +49,8 @@ registerAction2(class extends Action2 {
 registerAction2(class extends NotebookMultiCellAction {
     constructor() {
         super({
-            id: 'notebook.find',
-            title: ( localize2(9270, 'Find in Notebook')),
+            id: "notebook.find",
+            title: ( localize2(9590, "Find in Notebook")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.or(NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR)), ( EditorContextKeys.focus.toNegated()))),
                 primary: KeyCode.KeyF | KeyMod.CtrlCmd,
@@ -65,7 +65,11 @@ registerAction2(class extends NotebookMultiCellAction {
             return;
         }
         const controller = editor.getContribution(NotebookFindContrib.id);
-        controller.show(undefined, { findScope: { findScopeType: NotebookFindScopeType.None } });
+        controller.show(undefined, {
+            findScope: {
+                findScopeType: NotebookFindScopeType.None
+            }
+        });
     }
 });
 function notebookContainsTextModel(uri, textModel) {
@@ -78,16 +82,19 @@ function notebookContainsTextModel(uri, textModel) {
     return false;
 }
 function getSearchStringOptions(editor, opts) {
-    if (opts.seedSearchStringFromSelection === 'single') {
-        const selectionSearchString = getSelectionSearchString(editor, opts.seedSearchStringFromSelection, opts.seedSearchStringFromNonEmptySelection);
+    if (opts.seedSearchStringFromSelection === "single") {
+        const selectionSearchString = getSelectionSearchString(
+            editor,
+            opts.seedSearchStringFromSelection,
+            opts.seedSearchStringFromNonEmptySelection
+        );
         if (selectionSearchString) {
             return {
                 searchString: selectionSearchString,
                 selection: editor.getSelection()
             };
         }
-    }
-    else if (opts.seedSearchStringFromSelection === 'multiple' && !opts.updateSearchScope) {
+    } else if (opts.seedSearchStringFromSelection === "multiple" && !opts.updateSearchScope) {
         const selectionSearchString = getSelectionSearchString(editor, opts.seedSearchStringFromSelection);
         if (selectionSearchString) {
             return {
@@ -110,8 +117,7 @@ function isNotebookEditorValidForSearch(accessor, editor, codeEditor) {
         const textEditor = codeEditorService.getFocusedCodeEditor() || codeEditorService.getActiveCodeEditor();
         if (editor.hasModel() && textEditor && textEditor.hasModel() && notebookContainsTextModel(editor.textModel.uri, textEditor.getModel())) {
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -125,8 +131,8 @@ function openFindWidget(controller, editor, codeEditor, focusWidget = true) {
         return false;
     }
     const searchStringOptions = getSearchStringOptions(codeEditor, {
-        seedSearchStringFromSelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-        seedSearchStringFromNonEmptySelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection === 'selection',
+        seedSearchStringFromSelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection !== "never" ? "single" : "none",
+        seedSearchStringFromNonEmptySelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection === "selection",
         seedSearchStringFromGlobalClipboard: codeEditor.getOption(EditorOption.find).globalFindClipboard,
         updateSearchScope: false,
         loop: codeEditor.getOption(EditorOption.find).loop
@@ -138,13 +144,17 @@ function openFindWidget(controller, editor, codeEditor, focusWidget = true) {
         const cell = editor.getCellByHandle(data.handle);
         if (cell) {
             options = {
-                searchStringSeededFrom: { cell, range: searchStringOptions.selection },
+                searchStringSeededFrom: {
+                    cell,
+                    range: searchStringOptions.selection
+                },
                 focus: focusWidget
             };
         }
-    }
-    else {
-        options = { focus: focusWidget };
+    } else {
+        options = {
+            focus: focusWidget
+        };
     }
     controller.show(searchStringOptions?.searchString, options);
     return true;
@@ -162,8 +172,7 @@ function findWidgetAction(accessor, codeEditor, next) {
     if (controller.isVisible()) {
         next ? controller.findNext() : controller.findPrevious();
         return true;
-    }
-    else {
+    } else {
         return openFindWidget(controller, editor, codeEditor, false);
     }
 }
@@ -198,8 +207,8 @@ StartFindReplaceAction.addImplementation(100, (accessor, codeEditor, args) => {
     }
     const controller = editor.getContribution(NotebookFindContrib.id);
     const searchStringOptions = getSearchStringOptions(codeEditor, {
-        seedSearchStringFromSelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-        seedSearchStringFromNonEmptySelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection === 'selection',
+        seedSearchStringFromSelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection !== "never" ? "single" : "none",
+        seedSearchStringFromNonEmptySelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection === "selection",
         seedSearchStringFromGlobalClipboard: codeEditor.getOption(EditorOption.find).globalFindClipboard,
         updateSearchScope: false,
         loop: codeEditor.getOption(EditorOption.find).loop
@@ -219,12 +228,15 @@ PreviousMatchFindAction.addImplementation(100, (accessor, codeEditor, args) => {
 registerAction2(class extends Action2 {
     constructor() {
         super({
-            id: 'notebook.findNext.fromWidget',
-            title: ( localize2(9271, 'Find Next')),
+            id: "notebook.findNext.fromWidget",
+            title: ( localize2(9591, "Find Next")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, CONTEXT_FIND_WIDGET_VISIBLE)),
                 primary: KeyCode.F3,
-                mac: { primary: KeyMod.CtrlCmd | KeyCode.KeyG, secondary: [KeyCode.F3] },
+                mac: {
+                    primary: KeyMod.CtrlCmd | KeyCode.KeyG,
+                    secondary: [KeyCode.F3]
+                },
                 weight: KeybindingWeight.WorkbenchContrib + 1
             }
         });
@@ -236,12 +248,15 @@ registerAction2(class extends Action2 {
 registerAction2(class extends Action2 {
     constructor() {
         super({
-            id: 'notebook.findPrevious.fromWidget',
-            title: ( localize2(9272, 'Find Previous')),
+            id: "notebook.findPrevious.fromWidget",
+            title: ( localize2(9592, "Find Previous")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, CONTEXT_FIND_WIDGET_VISIBLE)),
                 primary: KeyMod.Shift | KeyCode.F3,
-                mac: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG, secondary: [KeyMod.Shift | KeyCode.F3] },
+                mac: {
+                    primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG,
+                    secondary: [KeyMod.Shift | KeyCode.F3]
+                },
                 weight: KeybindingWeight.WorkbenchContrib + 1
             }
         });

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.js

@@ -33,14 +33,16 @@ import { CodeActionParticipantUtils } from '../saveParticipants/saveParticipants
 registerAction2(class extends Action2 {
     constructor() {
         super({
-            id: 'notebook.format',
-            title: ( localize2(9293, 'Format Notebook')),
+            id: "notebook.format",
+            title: ( localize2(9613, "Format Notebook")),
             category: NOTEBOOK_ACTIONS_CATEGORY,
             precondition: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE)),
             keybinding: {
                 when: ( EditorContextKeys.editorTextFocus.toNegated()),
                 primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KeyF,
-                linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI },
+                linux: {
+                    primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI
+                },
                 weight: KeybindingWeight.WorkbenchContrib
             },
             f1: true,
@@ -50,7 +52,7 @@ registerAction2(class extends Action2 {
                     EditorContextKeys.inCompositeEditor,
                     EditorContextKeys.hasDocumentFormattingProvider
                 )),
-                group: '1_modification',
+                group: "1_modification",
                 order: 1.3
             }
         });
@@ -67,15 +69,26 @@ registerAction2(class extends Action2 {
             return;
         }
         const notebook = editor.textModel;
-        const formatApplied = await instantiationService.invokeFunction(CodeActionParticipantUtils.checkAndRunFormatCodeAction, notebook, Progress.None, CancellationToken.None);
+        const formatApplied = await instantiationService.invokeFunction(
+            CodeActionParticipantUtils.checkAndRunFormatCodeAction,
+            notebook,
+            Progress.None,
+            CancellationToken.None
+        );
         const disposable = ( new DisposableStore());
         try {
             if (!formatApplied) {
-                const allCellEdits = await Promise.all(( notebook.cells.map(async (cell) => {
+                const allCellEdits = await Promise.all(( notebook.cells.map(async cell => {
                     const ref = await textModelService.createModelReference(cell.uri);
                     disposable.add(ref);
                     const model = ref.object.textEditorModel;
-                    const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(editorWorkerService, languageFeaturesService, model, FormattingMode.Explicit, CancellationToken.None);
+                    const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(
+                        editorWorkerService,
+                        languageFeaturesService,
+                        model,
+                        FormattingMode.Explicit,
+                        CancellationToken.None
+                    );
                     const edits = [];
                     if (formatEdits) {
                         for (const edit of formatEdits) {
@@ -85,10 +98,12 @@ registerAction2(class extends Action2 {
                     }
                     return [];
                 })));
-                await bulkEditService.apply( allCellEdits.flat(), { label: ( localize(9294, "Format Notebook")), code: 'undoredo.formatNotebook', });
+                await bulkEditService.apply( allCellEdits.flat(), {
+                    label: ( localize(9614, "Format Notebook")),
+                    code: "undoredo.formatNotebook"
+                });
             }
-        }
-        finally {
+        } finally {
             disposable.dispose();
         }
     }
@@ -96,8 +111,8 @@ registerAction2(class extends Action2 {
 registerEditorAction(class FormatCellAction extends EditorAction {
     constructor() {
         super({
-            id: 'notebook.formatCell',
-            label: ( localize2(9295, "Format Cell")),
+            id: "notebook.formatCell",
+            label: ( localize2(9615, "Format Cell")),
             precondition: ( ContextKeyExpr.and(
                 NOTEBOOK_IS_ACTIVE_EDITOR,
                 NOTEBOOK_EDITOR_EDITABLE,
@@ -108,11 +123,13 @@ registerEditorAction(class FormatCellAction extends EditorAction {
             kbOpts: {
                 kbExpr: ( ContextKeyExpr.and(EditorContextKeys.editorTextFocus)),
                 primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KeyF,
-                linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI },
+                linux: {
+                    primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI
+                },
                 weight: KeybindingWeight.EditorContrib
             },
             contextMenuOpts: {
-                group: '1_modification',
+                group: "1_modification",
                 order: 1.301
             }
         });
@@ -120,12 +137,26 @@ registerEditorAction(class FormatCellAction extends EditorAction {
     async run(accessor, editor) {
         if (editor.hasModel()) {
             const instaService = accessor.get(IInstantiationService);
-            await instaService.invokeFunction(formatDocumentWithSelectedProvider, editor, FormattingMode.Explicit, Progress.None, CancellationToken.None, true);
+            await instaService.invokeFunction(
+                formatDocumentWithSelectedProvider,
+                editor,
+                FormattingMode.Explicit,
+                Progress.None,
+                CancellationToken.None,
+                true
+            );
         }
     }
 });
 let FormatOnCellExecutionParticipant = class FormatOnCellExecutionParticipant {
-    constructor(bulkEditService, languageFeaturesService, textModelService, editorWorkerService, configurationService, _notebookService) {
+    constructor(
+        bulkEditService,
+        languageFeaturesService,
+        textModelService,
+        editorWorkerService,
+        configurationService,
+        _notebookService
+    ) {
         this.bulkEditService = bulkEditService;
         this.languageFeaturesService = languageFeaturesService;
         this.textModelService = textModelService;
@@ -140,7 +171,7 @@ let FormatOnCellExecutionParticipant = class FormatOnCellExecutionParticipant {
         }
         const disposable = ( new DisposableStore());
         try {
-            const allCellEdits = await Promise.all(( executions.map(async (cellExecution) => {
+            const allCellEdits = await Promise.all(( executions.map(async cellExecution => {
                 const nbModel = this._notebookService.getNotebookTextModel(cellExecution.notebook);
                 if (!nbModel) {
                     return [];
@@ -158,7 +189,13 @@ let FormatOnCellExecutionParticipant = class FormatOnCellExecutionParticipant {
                 const ref = await this.textModelService.createModelReference(activeCell.uri);
                 disposable.add(ref);
                 const model = ref.object.textEditorModel;
-                const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(this.editorWorkerService, this.languageFeaturesService, model, FormattingMode.Silent, CancellationToken.None);
+                const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(
+                    this.editorWorkerService,
+                    this.languageFeaturesService,
+                    model,
+                    FormattingMode.Silent,
+                    CancellationToken.None
+                );
                 const edits = [];
                 if (formatEdits) {
                     edits.push(...( formatEdits.map(edit => ( new ResourceTextEdit(model.uri, edit, model.getVersionId())))));
@@ -166,21 +203,16 @@ let FormatOnCellExecutionParticipant = class FormatOnCellExecutionParticipant {
                 }
                 return [];
             })));
-            await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(9296, "Format Cells")), code: 'undoredo.notebooks.onWillExecuteFormat', });
-        }
-        finally {
+            await this.bulkEditService.apply( allCellEdits.flat(), {
+                label: ( localize(9616, "Format Cells")),
+                code: "undoredo.notebooks.onWillExecuteFormat"
+            });
+        } finally {
             disposable.dispose();
         }
     }
 };
-FormatOnCellExecutionParticipant = ( __decorate([
-    ( __param(0, IBulkEditService)),
-    ( __param(1, ILanguageFeaturesService)),
-    ( __param(2, ITextModelService)),
-    ( __param(3, IEditorWorkerService)),
-    ( __param(4, IConfigurationService)),
-    ( __param(5, INotebookService))
-], FormatOnCellExecutionParticipant));
+FormatOnCellExecutionParticipant = ( __decorate([( __param(0, IBulkEditService)), ( __param(1, ILanguageFeaturesService)), ( __param(2, ITextModelService)), ( __param(3, IEditorWorkerService)), ( __param(4, IConfigurationService)), ( __param(5, INotebookService))], FormatOnCellExecutionParticipant));
 let CellExecutionParticipantsContribution = class CellExecutionParticipantsContribution extends Disposable {
     constructor(instantiationService, notebookExecutionService) {
         super();
@@ -189,13 +221,12 @@ let CellExecutionParticipantsContribution = class CellExecutionParticipantsContr
         this.registerKernelExecutionParticipants();
     }
     registerKernelExecutionParticipants() {
-        this._register(this.notebookExecutionService.registerExecutionParticipant(this.instantiationService.createInstance(FormatOnCellExecutionParticipant)));
+        this._register(
+            this.notebookExecutionService.registerExecutionParticipant(this.instantiationService.createInstance(FormatOnCellExecutionParticipant))
+        );
     }
 };
-CellExecutionParticipantsContribution = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, INotebookExecutionService))
-], CellExecutionParticipantsContribution));
+CellExecutionParticipantsContribution = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, INotebookExecutionService))], CellExecutionParticipantsContribution));
 const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
 workbenchContributionsRegistry.registerWorkbenchContribution(CellExecutionParticipantsContribution, LifecyclePhase.Restored);
 

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted.js

@@ -19,13 +19,19 @@ import { NotebookEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
-const hasOpenedNotebookKey = 'hasOpenedNotebook';
-const hasShownGettingStartedKey = 'hasShownNotebookGettingStarted';
+const hasOpenedNotebookKey = "hasOpenedNotebook";
+const hasShownGettingStartedKey = "hasShownNotebookGettingStarted";
 let NotebookGettingStarted = class NotebookGettingStarted extends Disposable {
-    constructor(_editorService, _storageService, _contextKeyService, _commandService, _configurationService) {
+    constructor(
+        _editorService,
+        _storageService,
+        _contextKeyService,
+        _commandService,
+        _configurationService
+    ) {
         super();
         const hasOpenedNotebook = HAS_OPENED_NOTEBOOK.bindTo(_contextKeyService);
-        const memento = ( new Memento('notebookGettingStarted2', _storageService));
+        const memento = ( new Memento("notebookGettingStarted2", _storageService));
         const storedValue = memento.getMemento(StorageScope.PROFILE, StorageTarget.USER);
         if (storedValue[hasOpenedNotebookKey]) {
             hasOpenedNotebook.set(true);
@@ -36,7 +42,10 @@ let NotebookGettingStarted = class NotebookGettingStarted extends Disposable {
                 hasOpenedNotebook.set(true);
                 storedValue[hasOpenedNotebookKey] = true;
                 if (needToShowGettingStarted) {
-                    _commandService.executeCommand('workbench.action.openWalkthrough', { category: 'notebooks', step: 'notebookProfile' }, true);
+                    _commandService.executeCommand("workbench.action.openWalkthrough", {
+                        category: "notebooks",
+                        step: "notebookProfile"
+                    }, true);
                     storedValue[hasShownGettingStartedKey] = true;
                 }
                 memento.saveMemento();
@@ -54,27 +63,21 @@ let NotebookGettingStarted = class NotebookGettingStarted extends Disposable {
         }
     }
 };
-NotebookGettingStarted = ( __decorate([
-    ( __param(0, IEditorService)),
-    ( __param(1, IStorageService)),
-    ( __param(2, IContextKeyService)),
-    ( __param(3, ICommandService)),
-    ( __param(4, IConfigurationService))
-], NotebookGettingStarted));
+NotebookGettingStarted = ( __decorate([( __param(0, IEditorService)), ( __param(1, IStorageService)), ( __param(2, IContextKeyService)), ( __param(3, ICommandService)), ( __param(4, IConfigurationService))], NotebookGettingStarted));
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookGettingStarted, LifecyclePhase.Restored);
 registerAction2(class NotebookClearNotebookLayoutAction extends Action2 {
     constructor() {
         super({
-            id: 'workbench.notebook.layout.gettingStarted',
-            title: ( localize2(9297, "Reset notebook getting started")),
+            id: "workbench.notebook.layout.gettingStarted",
+            title: ( localize2(9617, "Reset notebook getting started")),
             f1: true,
             precondition: ( ContextKeyExpr.equals(`config.${NotebookSetting.openGettingStarted}`, true)),
-            category: Categories.Developer,
+            category: Categories.Developer
         });
     }
     run(accessor) {
         const storageService = accessor.get(IStorageService);
-        const memento = ( new Memento('notebookGettingStarted', storageService));
+        const memento = ( new Memento("notebookGettingStarted", storageService));
         const storedValue = memento.getMemento(StorageScope.PROFILE, StorageTarget.USER);
         storedValue[hasOpenedNotebookKey] = undefined;
         memento.saveMemento();

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/kernelDetection/notebookKernelDetection.js

@@ -21,12 +21,12 @@ let NotebookKernelDetection = class NotebookKernelDetection extends Disposable {
     _registerListeners() {
         this._localDisposableStore.clear();
         this._localDisposableStore.add(this._extensionService.onWillActivateByEvent(e => {
-            if (e.event.startsWith('onNotebook:')) {
+            if (e.event.startsWith("onNotebook:")) {
                 if (this._extensionService.activationEventIsDone(e.event)) {
                     return;
                 }
-                const notebookType = e.event.substring('onNotebook:'.length);
-                if (notebookType === '*') {
+                const notebookType = e.event.substring("onNotebook:".length);
+                if (notebookType === "*") {
                     return;
                 }
                 let shouldStartDetection = false;
@@ -40,7 +40,7 @@ let NotebookKernelDetection = class NotebookKernelDetection extends Disposable {
                     }
                 });
                 if (shouldStartDetection && !( this._detectionMap.has(notebookType))) {
-                    this._notebookLoggingService.debug('KernelDetection', `start extension activation for ${notebookType}`);
+                    this._notebookLoggingService.debug("KernelDetection", `start extension activation for ${notebookType}`);
                     const task = this._notebookKernelService.registerNotebookKernelDetectionTask({
                         notebookType: notebookType
                     });
@@ -57,7 +57,7 @@ let NotebookKernelDetection = class NotebookKernelDetection extends Disposable {
                 const taskToDelete = [];
                 for (const [notebookType, task] of this._detectionMap) {
                     if (this._extensionService.activationEventIsDone(`onNotebook:${notebookType}`)) {
-                        this._notebookLoggingService.debug('KernelDetection', `finish extension activation for ${notebookType}`);
+                        this._notebookLoggingService.debug("KernelDetection", `finish extension activation for ${notebookType}`);
                         taskToDelete.push(notebookType);
                         task.dispose();
                     }
@@ -76,9 +76,5 @@ let NotebookKernelDetection = class NotebookKernelDetection extends Disposable {
         });
     }
 };
-NotebookKernelDetection = ( __decorate([
-    ( __param(0, INotebookKernelService)),
-    ( __param(1, IExtensionService)),
-    ( __param(2, INotebookLoggingService))
-], NotebookKernelDetection));
+NotebookKernelDetection = ( __decorate([( __param(0, INotebookKernelService)), ( __param(1, IExtensionService)), ( __param(2, INotebookLoggingService))], NotebookKernelDetection));
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookKernelDetection, LifecyclePhase.Restored);

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

@@ -5,17 +5,17 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { NOTEBOOK_ACTIONS_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
-const TOGGLE_CELL_TOOLBAR_POSITION = 'notebook.toggleCellToolbarPosition';
+const TOGGLE_CELL_TOOLBAR_POSITION = "notebook.toggleCellToolbarPosition";
 class ToggleCellToolbarPositionAction extends Action2 {
     constructor() {
         super({
             id: TOGGLE_CELL_TOOLBAR_POSITION,
-            title: ( localize2(9298, 'Toggle Cell Toolbar Position')),
+            title: ( localize2(9618, "Toggle Cell Toolbar Position")),
             menu: [{
-                    id: MenuId.NotebookCellTitle,
-                    group: 'View',
-                    order: 1
-                }],
+                id: MenuId.NotebookCellTitle,
+                group: "View",
+                order: 1
+            }],
             category: NOTEBOOK_ACTIONS_CATEGORY,
             f1: false
         });
@@ -31,26 +31,24 @@ class ToggleCellToolbarPositionAction extends Action2 {
         }
     }
     togglePosition(viewType, toolbarPosition) {
-        if (typeof toolbarPosition === 'string') {
-            if (['left', 'right', 'hidden'].indexOf(toolbarPosition) >= 0) {
-                const newViewValue = toolbarPosition === 'right' ? 'left' : 'right';
+        if (typeof toolbarPosition === "string") {
+            if (["left", "right", "hidden"].indexOf(toolbarPosition) >= 0) {
+                const newViewValue = toolbarPosition === "right" ? "left" : "right";
                 const config = {
                     default: toolbarPosition
                 };
                 config[viewType] = newViewValue;
                 return config;
-            }
-            else {
+            } else {
                 const config = {
-                    default: 'right',
+                    default: "right"
                 };
-                config[viewType] = 'left';
+                config[viewType] = "left";
                 return config;
             }
-        }
-        else {
-            const oldValue = toolbarPosition[viewType] ?? toolbarPosition['default'] ?? 'right';
-            const newViewValue = oldValue === 'right' ? 'left' : 'right';
+        } else {
+            const oldValue = toolbarPosition[viewType] ?? toolbarPosition["default"] ?? "right";
+            const newViewValue = oldValue === "right" ? "left" : "right";
             const newConfig = {
                 ...toolbarPosition
             };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider.js

@@ -25,7 +25,9 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 
 let MarkerListProvider = class MarkerListProvider {
-    static { this.ID = 'workbench.contrib.markerListProvider'; }
+    static {
+        this.ID = "workbench.contrib.markerListProvider";
+    }
     constructor(_markerService, markerNavigation, _configService) {
         this._markerService = _markerService;
         this._configService = _configService;
@@ -48,13 +50,11 @@ let MarkerListProvider = class MarkerListProvider {
         }, this._markerService, this._configService));
     }
 };
-MarkerListProvider = ( __decorate([
-    ( __param(0, IMarkerService)),
-    ( __param(1, IMarkerNavigationService)),
-    ( __param(2, IConfigurationService))
-], MarkerListProvider));
+MarkerListProvider = ( __decorate([( __param(0, IMarkerService)), ( __param(1, IMarkerNavigationService)), ( __param(2, IConfigurationService))], MarkerListProvider));
 let NotebookMarkerDecorationContribution = class NotebookMarkerDecorationContribution extends Disposable {
-    static { this.id = 'workbench.notebook.markerDecoration'; }
+    static {
+        this.id = "workbench.notebook.markerDecoration";
+    }
     constructor(_notebookEditor, _markerService) {
         super();
         this._notebookEditor = _notebookEditor;
@@ -74,10 +74,18 @@ let NotebookMarkerDecorationContribution = class NotebookMarkerDecorationContrib
         }
         const cellDecorations = [];
         this._notebookEditor.getCellsInRange().forEach(cell => {
-            const marker = this._markerService.read({ resource: cell.uri, severities: MarkerSeverity.Error | MarkerSeverity.Warning });
+            const marker = this._markerService.read({
+                resource: cell.uri,
+                severities: MarkerSeverity.Error | MarkerSeverity.Warning
+            });
             marker.forEach(m => {
                 const color = m.severity === MarkerSeverity.Error ? editorErrorForeground : editorWarningForeground;
-                const range = { startLineNumber: m.startLineNumber, startColumn: m.startColumn, endLineNumber: m.endLineNumber, endColumn: m.endColumn };
+                const range = {
+                    startLineNumber: m.startLineNumber,
+                    startColumn: m.startColumn,
+                    endLineNumber: m.endLineNumber,
+                    endColumn: m.endColumn
+                };
                 cellDecorations.push({
                     handle: cell.handle,
                     options: {
@@ -94,11 +102,15 @@ let NotebookMarkerDecorationContribution = class NotebookMarkerDecorationContrib
         this._markersOverviewRulerDecorations = this._notebookEditor.deltaCellDecorations(this._markersOverviewRulerDecorations, cellDecorations);
     }
 };
-NotebookMarkerDecorationContribution.__decorator = ( __decorate([
-    throttle(100)
-], NotebookMarkerDecorationContribution.prototype, "_update", null));
-NotebookMarkerDecorationContribution = ( __decorate([
-    ( __param(1, IMarkerService))
-], NotebookMarkerDecorationContribution));
+NotebookMarkerDecorationContribution.__decorator = ( __decorate(
+    [throttle(100)],
+    NotebookMarkerDecorationContribution.prototype,
+    "_update",
+    null
+));
+NotebookMarkerDecorationContribution = ( __decorate([( __param(1, IMarkerService))], NotebookMarkerDecorationContribution));
 registerWorkbenchContribution2(MarkerListProvider.ID, MarkerListProvider, WorkbenchPhase.BlockRestore);
-registerNotebookContribution(NotebookMarkerDecorationContribution.id, NotebookMarkerDecorationContribution);
+registerNotebookContribution(
+    NotebookMarkerDecorationContribution.id,
+    NotebookMarkerDecorationContribution
+);