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

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

@@ -11,7 +11,9 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { n, createElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 
 class TroubleshootController extends Disposable {
-    static { this.id = 'workbench.notebook.troubleshoot'; }
+    static {
+        this.id = "workbench.notebook.troubleshoot";
+    }
     constructor(_notebookEditor) {
         super();
         this._notebookEditor = _notebookEditor;
@@ -57,7 +59,7 @@ class TroubleshootController extends Disposable {
             this._createCellOverlay(cell, i);
         }
         this._localStore.add(this._notebookEditor.onDidChangeViewCells(e => {
-            const addedCells = e.splices.reduce((acc, [, , newCells]) => [...acc, ...newCells], []);
+            const addedCells = e.splices.reduce((acc, [,, newCells]) => [...acc, ...newCells], []);
             for (let i = 0; i < addedCells.length; i++) {
                 const cellIndex = this._notebookEditor.getCellIndex(addedCells[i]);
                 if (cellIndex !== undefined) {
@@ -74,42 +76,41 @@ class TroubleshootController extends Disposable {
         const scrollTop = this._notebookEditor.scrollTop;
         const overlay = n.div({
             style: {
-                position: 'absolute',
-                top: '0',
-                left: '0',
-                width: '100%',
-                height: '100%',
-                pointerEvents: 'none',
-                zIndex: '1000'
+                position: "absolute",
+                top: "0",
+                left: "0",
+                width: "100%",
+                height: "100%",
+                pointerEvents: "none",
+                zIndex: "1000"
             }
         }, [
-            n.div({
-                style: {
-                    position: 'absolute',
-                    top: `${listViewTop}px`,
-                    left: '0',
-                    width: '100%',
-                    height: '2px',
-                    backgroundColor: 'rgba(0, 0, 255, 0.7)'
-                }
-            }),
-            n.div({
-                style: {
-                    position: 'absolute',
-                    top: `${listViewTop}px`,
-                    left: '10px',
-                    backgroundColor: 'rgba(0, 0, 255, 0.7)',
-                    color: 'white',
-                    fontSize: '11px',
-                    fontWeight: 'bold',
-                    padding: '2px 6px',
-                    borderRadius: '3px',
-                    whiteSpace: 'nowrap',
-                    pointerEvents: 'none',
-                    zIndex: '1001'
-                }
-            }, [`ScrollTop: ${scrollTop}px`])
-        ]).keepUpdated(this._store);
+        n.div({
+            style: {
+                position: "absolute",
+                top: `${listViewTop}px`,
+                left: "0",
+                width: "100%",
+                height: "2px",
+                backgroundColor: "rgba(0, 0, 255, 0.7)"
+            }
+        }),
+        n.div({
+            style: {
+                position: "absolute",
+                top: `${listViewTop}px`,
+                left: "10px",
+                backgroundColor: "rgba(0, 0, 255, 0.7)",
+                color: "white",
+                fontSize: "11px",
+                fontWeight: "bold",
+                padding: "2px 6px",
+                borderRadius: "3px",
+                whiteSpace: "nowrap",
+                pointerEvents: "none",
+                zIndex: "1001"
+            }
+        }, [`ScrollTop: ${scrollTop}px`])]).keepUpdated(this._store);
         this._notebookOverlayDomNode = overlay.element;
         if (this._notebookOverlayDomNode) {
             this._notebookEditor.getDomNode().appendChild(this._notebookOverlayDomNode);
@@ -118,12 +119,12 @@ class TroubleshootController extends Disposable {
             const scrollTop = this._notebookEditor.scrollTop;
             const listViewTop = this._notebookEditor.getLayoutInfo().listViewOffsetTop;
             if (this._notebookOverlayDomNode) {
-                const labelElement = this._notebookOverlayDomNode.querySelector('div:nth-child(2)');
+                const labelElement = this._notebookOverlayDomNode.querySelector("div:nth-child(2)");
                 if (labelElement) {
                     labelElement.textContent = `ScrollTop: ${scrollTop}px`;
                     labelElement.style.top = `${listViewTop}px`;
                 }
-                const topLineElement = this._notebookOverlayDomNode.querySelector('div:first-child');
+                const topLineElement = this._notebookOverlayDomNode.querySelector("div:first-child");
                 if (topLineElement) {
                     topLineElement.style.top = `${listViewTop}px`;
                 }
@@ -131,47 +132,47 @@ class TroubleshootController extends Disposable {
         }));
     }
     _createCellOverlay(cell, index) {
-        const overlayContainer = createElement('div');
-        overlayContainer.style.position = 'absolute';
-        overlayContainer.style.top = '0';
-        overlayContainer.style.left = '0';
-        overlayContainer.style.width = '100%';
-        overlayContainer.style.height = '100%';
-        overlayContainer.style.pointerEvents = 'none';
-        overlayContainer.style.zIndex = '1000';
-        const topLine = createElement('div');
-        topLine.style.position = 'absolute';
-        topLine.style.top = '0';
-        topLine.style.left = '0';
-        topLine.style.width = '100%';
-        topLine.style.height = '2px';
-        topLine.style.backgroundColor = 'rgba(255, 0, 0, 0.7)';
+        const overlayContainer = createElement("div");
+        overlayContainer.style.position = "absolute";
+        overlayContainer.style.top = "0";
+        overlayContainer.style.left = "0";
+        overlayContainer.style.width = "100%";
+        overlayContainer.style.height = "100%";
+        overlayContainer.style.pointerEvents = "none";
+        overlayContainer.style.zIndex = "1000";
+        const topLine = createElement("div");
+        topLine.style.position = "absolute";
+        topLine.style.top = "0";
+        topLine.style.left = "0";
+        topLine.style.width = "100%";
+        topLine.style.height = "2px";
+        topLine.style.backgroundColor = "rgba(255, 0, 0, 0.7)";
         overlayContainer.appendChild(topLine);
         const getLayoutInfo = () => {
-            const eol = cell.textBuffer.getEOL() === '\n' ? 'LF' : 'CRLF';
-            let scrollTop = '';
+            const eol = cell.textBuffer.getEOL() === "\n" ? "LF" : "CRLF";
+            let scrollTop = "";
             if (cell.layoutInfo.layoutState > 0) {
                 scrollTop = `| AbsoluteTopOfElement: ${this._notebookEditor.getAbsoluteTopOfElement(cell)}px`;
             }
             return `cell #${index} (handle: ${cell.handle}) ${scrollTop} | EOL: ${eol}`;
         };
-        const label = createElement('div');
+        const label = createElement("div");
         label.textContent = getLayoutInfo();
-        label.style.position = 'absolute';
-        label.style.top = '0px';
-        label.style.right = '10px';
-        label.style.backgroundColor = 'rgba(255, 0, 0, 0.5)';
-        label.style.color = 'white';
-        label.style.fontSize = '11px';
-        label.style.fontWeight = 'bold';
-        label.style.padding = '2px 6px';
-        label.style.borderRadius = '3px';
-        label.style.whiteSpace = 'nowrap';
-        label.style.pointerEvents = 'none';
-        label.style.zIndex = '1001';
+        label.style.position = "absolute";
+        label.style.top = "0px";
+        label.style.right = "10px";
+        label.style.backgroundColor = "rgba(255, 0, 0, 0.5)";
+        label.style.color = "white";
+        label.style.fontSize = "11px";
+        label.style.fontWeight = "bold";
+        label.style.padding = "2px 6px";
+        label.style.borderRadius = "3px";
+        label.style.whiteSpace = "nowrap";
+        label.style.pointerEvents = "none";
+        label.style.zIndex = "1001";
         overlayContainer.appendChild(label);
         let overlayId = undefined;
-        this._notebookEditor.changeCellOverlays((accessor) => {
+        this._notebookEditor.changeCellOverlays(accessor => {
             overlayId = accessor.addOverlay({
                 cell,
                 domNode: overlayContainer
@@ -181,13 +182,13 @@ class TroubleshootController extends Disposable {
             const updateLayout = () => {
                 label.textContent = getLayoutInfo();
                 if (overlayId) {
-                    this._notebookEditor.changeCellOverlays((accessor) => {
+                    this._notebookEditor.changeCellOverlays(accessor => {
                         accessor.layoutOverlay(overlayId);
                     });
                 }
             };
             const disposables = this._cellDisposables[index];
-            disposables.add(cell.onDidChangeLayout((e) => {
+            disposables.add(cell.onDidChangeLayout(e => {
                 updateLayout();
             }));
             disposables.add(cell.textBuffer.onDidChangeContent(() => {
@@ -202,7 +203,7 @@ class TroubleshootController extends Disposable {
                 updateLayout();
             }));
             disposables.add(toDisposable(() => {
-                this._notebookEditor.changeCellOverlays((accessor) => {
+                this._notebookEditor.changeCellOverlays(accessor => {
                     if (overlayId) {
                         accessor.removeOverlay(overlayId);
                     }
@@ -240,7 +241,7 @@ class TroubleshootController extends Disposable {
                 })));
                 dispose(deletedCells);
             });
-            const addedCells = e.splices.reduce((acc, [, , newCells]) => [...acc, ...newCells], []);
+            const addedCells = e.splices.reduce((acc, [,, newCells]) => [...acc, ...newCells], []);
             for (let i = 0; i < addedCells.length; i++) {
                 const cellIndex = this._notebookEditor.getCellIndex(addedCells[i]);
                 if (cellIndex !== undefined) {
@@ -260,13 +261,11 @@ class TroubleshootController extends Disposable {
         for (let i = 0; i < this._notebookEditor.getLength(); i++) {
             items.push({
                 handle: i,
-                items: [
-                    {
-                        text: `index: ${i}`,
-                        alignment: CellStatusbarAlignment.Left,
-                        priority: Number.MAX_SAFE_INTEGER
-                    }
-                ]
+                items: [{
+                    text: `index: ${i}`,
+                    alignment: CellStatusbarAlignment.Left,
+                    priority: Number.MAX_SAFE_INTEGER
+                }]
             });
         }
         return items;
@@ -282,8 +281,8 @@ registerNotebookContribution(TroubleshootController.id, TroubleshootController);
 registerAction2(class extends Action2 {
     constructor() {
         super({
-            id: 'notebook.toggleLayoutTroubleshoot',
-            title: ( localize2(9345, "Toggle Notebook Layout Troubleshoot")),
+            id: "notebook.toggleLayoutTroubleshoot",
+            title: ( localize2(9665, "Toggle Notebook Layout Troubleshoot")),
             category: Categories.Developer,
             f1: true
         });
@@ -301,8 +300,8 @@ registerAction2(class extends Action2 {
 registerAction2(class extends Action2 {
     constructor() {
         super({
-            id: 'notebook.inspectLayout',
-            title: ( localize2(9346, "Inspect Notebook Layout")),
+            id: "notebook.inspectLayout",
+            title: ( localize2(9666, "Inspect Notebook Layout")),
             category: Categories.Developer,
             f1: true
         });
@@ -322,8 +321,8 @@ registerAction2(class extends Action2 {
 registerAction2(class extends Action2 {
     constructor() {
         super({
-            id: 'notebook.clearNotebookEdtitorTypeCache',
-            title: ( localize2(9347, "Clear Notebook Editor Type Cache")),
+            id: "notebook.clearNotebookEdtitorTypeCache",
+            title: ( localize2(9667, "Clear Notebook Editor Type Cache")),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo.js

@@ -8,12 +8,14 @@ import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monac
 import { UndoCommand, RedoCommand } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 
 let NotebookUndoRedoContribution = class NotebookUndoRedoContribution extends Disposable {
-    static { this.ID = 'workbench.contrib.notebookUndoRedo'; }
+    static {
+        this.ID = "workbench.contrib.notebookUndoRedo";
+    }
     constructor(_editorService) {
         super();
         this._editorService = _editorService;
         const PRIORITY = 105;
-        this._register(UndoCommand.addImplementation(PRIORITY, 'notebook-undo-redo', () => {
+        this._register(UndoCommand.addImplementation(PRIORITY, "notebook-undo-redo", () => {
             const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
             const viewModel = editor?.getViewModel();
             if (editor && editor.hasEditorFocus() && editor.hasModel() && viewModel) {
@@ -22,16 +24,21 @@ let NotebookUndoRedoContribution = class NotebookUndoRedoContribution extends Di
                         for (let i = 0; i < editor.getLength(); i++) {
                             const cell = editor.cellAt(i);
                             if (cell.cellKind === CellKind.Markup && cellResources.find(resource => resource.fragment === cell.model.uri.fragment)) {
-                                cell.updateEditState(CellEditState.Editing, 'undo');
+                                cell.updateEditState(CellEditState.Editing, "undo");
                             }
                         }
-                        editor?.setOptions({ cellOptions: { resource: cellResources[0] }, preserveFocus: true });
+                        editor?.setOptions({
+                            cellOptions: {
+                                resource: cellResources[0]
+                            },
+                            preserveFocus: true
+                        });
                     }
                 });
             }
             return false;
         }));
-        this._register(RedoCommand.addImplementation(PRIORITY, 'notebook-undo-redo', () => {
+        this._register(RedoCommand.addImplementation(PRIORITY, "notebook-undo-redo", () => {
             const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
             const viewModel = editor?.getViewModel();
             if (editor && editor.hasEditorFocus() && editor.hasModel() && viewModel) {
@@ -40,10 +47,15 @@ let NotebookUndoRedoContribution = class NotebookUndoRedoContribution extends Di
                         for (let i = 0; i < editor.getLength(); i++) {
                             const cell = editor.cellAt(i);
                             if (cell.cellKind === CellKind.Markup && cellResources.find(resource => resource.fragment === cell.model.uri.fragment)) {
-                                cell.updateEditState(CellEditState.Editing, 'redo');
+                                cell.updateEditState(CellEditState.Editing, "redo");
                             }
                         }
-                        editor?.setOptions({ cellOptions: { resource: cellResources[0] }, preserveFocus: true });
+                        editor?.setOptions({
+                            cellOptions: {
+                                resource: cellResources[0]
+                            },
+                            preserveFocus: true
+                        });
                     }
                 });
             }
@@ -51,7 +63,9 @@ let NotebookUndoRedoContribution = class NotebookUndoRedoContribution extends Di
         }));
     }
 };
-NotebookUndoRedoContribution = ( __decorate([
-    ( __param(0, IEditorService))
-], NotebookUndoRedoContribution));
-registerWorkbenchContribution2(NotebookUndoRedoContribution.ID, NotebookUndoRedoContribution, WorkbenchPhase.BlockRestore);
+NotebookUndoRedoContribution = ( __decorate([( __param(0, IEditorService))], NotebookUndoRedoContribution));
+registerWorkbenchContribution2(
+    NotebookUndoRedoContribution.ID,
+    NotebookUndoRedoContribution,
+    WorkbenchPhase.BlockRestore
+);

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/viewportWarmup/viewportWarmup.js

@@ -11,7 +11,9 @@ import { cellRangesToIndexes } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 
 let NotebookViewportContribution = class NotebookViewportContribution extends Disposable {
-    static { this.id = 'workbench.notebook.viewportWarmup'; }
+    static {
+        this.id = "workbench.notebook.viewportWarmup";
+    }
     constructor(_notebookEditor, _notebookService, accessibilityService) {
         super();
         this._notebookEditor = _notebookEditor;
@@ -37,8 +39,8 @@ let NotebookViewportContribution = class NotebookViewportContribution extends Di
         if (this._notebookEditor.hasModel()) {
             for (let i = 0; i < this._notebookEditor.getLength(); i++) {
                 const cell = this._notebookEditor.cellAt(i);
-                if (cell?.cellKind === CellKind.Markup && cell?.getEditState() === CellEditState.Preview && !cell.isInputCollapsed) ;
-                else if (cell?.cellKind === CellKind.Code) {
+                if (cell?.cellKind === CellKind.Markup && cell?.getEditState() === CellEditState.Preview && !cell.isInputCollapsed)
+                    ; else if (cell?.cellKind === CellKind.Code) {
                     this._warmupCodeCell(cell);
                 }
             }
@@ -56,8 +58,7 @@ let NotebookViewportContribution = class NotebookViewportContribution extends Di
             const cell = this._notebookEditor.cellAt(index);
             if (cell?.cellKind === CellKind.Markup && cell?.getEditState() === CellEditState.Preview && !cell.isInputCollapsed) {
                 this._notebookEditor.createMarkupPreview(cell);
-            }
-            else if (cell?.cellKind === CellKind.Code) {
+            } else if (cell?.cellKind === CellKind.Code) {
                 this._warmupCodeCell(cell);
             }
         });
@@ -83,13 +84,15 @@ let NotebookViewportContribution = class NotebookViewportContribution extends Di
             if (!renderer) {
                 return;
             }
-            const result = { type: RenderOutputType.Extension, renderer, source: output, mimeType: pickedMimeTypeRenderer.mimeType };
+            const result = {
+                type: RenderOutputType.Extension,
+                renderer,
+                source: output,
+                mimeType: pickedMimeTypeRenderer.mimeType
+            };
             this._notebookEditor.createOutput(viewCell, result, 0, true);
         }
     }
 };
-NotebookViewportContribution = ( __decorate([
-    ( __param(1, INotebookService)),
-    ( __param(2, IAccessibilityService))
-], NotebookViewportContribution));
+NotebookViewportContribution = ( __decorate([( __param(1, INotebookService)), ( __param(2, IAccessibilityService))], NotebookViewportContribution));
 registerNotebookContribution(NotebookViewportContribution.id, NotebookViewportContribution);

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

@@ -6,12 +6,12 @@ import { isDocumentExcludePattern } from '@codingame/monaco-vscode-api/vscode/vs
 import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 
-CommandsRegistry.registerCommand('_resolveNotebookContentProvider', (accessor) => {
+CommandsRegistry.registerCommand("_resolveNotebookContentProvider", accessor => {
     const notebookService = accessor.get(INotebookService);
     const contentProviders = notebookService.getContributedNotebookTypes();
     return ( contentProviders.map(provider => {
         const filenamePatterns = ( provider.selectors.map(selector => {
-            if (typeof selector === 'string') {
+            if (typeof selector === "string") {
                 return selector;
             }
             if (isRelativePattern(selector)) {
@@ -37,16 +37,19 @@ CommandsRegistry.registerCommand('_resolveNotebookContentProvider', (accessor) =
         };
     }));
 });
-CommandsRegistry.registerCommand('_resolveNotebookKernels', async (accessor, args) => {
+CommandsRegistry.registerCommand("_resolveNotebookKernels", async (accessor, args) => {
     const notebookKernelService = accessor.get(INotebookKernelService);
     const uri = URI.revive(args.uri);
-    const kernels = notebookKernelService.getMatchingKernel({ uri, notebookType: args.viewType });
+    const kernels = notebookKernelService.getMatchingKernel({
+        uri,
+        notebookType: args.viewType
+    });
     return ( kernels.all.map(provider => ({
         id: provider.id,
         label: provider.label,
         description: provider.description,
         detail: provider.detail,
         isPreferred: false,
-        preloads: provider.preloadUris,
+        preloads: provider.preloadUris
     })));
 });