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

package/vscode/src/vs/workbench/contrib/notebook/common/services/notebookWebWorker.js

@@ -12,14 +12,25 @@ import { filter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objec
 import { matchCellBasedOnSimilarties } from './notebookCellMatching.js';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { DiffChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/diff/diffChange';
-import { computeDiff } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/common/notebookDiff';
+import { computeDiff } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookDiff';
 
 const PREFIX_FOR_UNMATCHED_ORIGINAL_CELLS = `unmatchedOriginalCell`;
 class MirrorCell {
     get eol() {
-        return this._eol === '\r\n' ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF;
-    }
-    constructor(handle, uri, source, _eol, versionId, language, cellKind, outputs, metadata, internalMetadata) {
+        return this._eol === "\r\n" ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF;
+    }
+    constructor(
+        handle,
+        uri,
+        source,
+        _eol,
+        versionId,
+        language,
+        cellKind,
+        outputs,
+        metadata,
+        internalMetadata
+    ) {
         this.handle = handle;
         this._eol = _eol;
         this.language = language;
@@ -47,7 +58,7 @@ class MirrorCell {
         hashValue = doHash(this.language, hashValue);
         hashValue = doHash(this.getValue(), hashValue);
         hashValue = doHash(this.metadata, hashValue);
-        hashValue = doHash(this.internalMetadata?.internalId || '', hashValue);
+        hashValue = doHash(this.internalMetadata?.internalId || "", hashValue);
         for (const op of this.outputs) {
             hashValue = doHash(op.metadata, hashValue);
             for (const output of op.outputs) {
@@ -72,31 +83,25 @@ class MirrorNotebookDocument {
         event.rawEvents.forEach(e => {
             if (e.kind === NotebookCellsChangeType.ModelChange) {
                 this._spliceNotebookCells(e.changes);
-            }
-            else if (e.kind === NotebookCellsChangeType.Move) {
+            } else if (e.kind === NotebookCellsChangeType.Move) {
                 const cells = this.cells.splice(e.index, 1);
                 this.cells.splice(e.newIdx, 0, ...cells);
-            }
-            else if (e.kind === NotebookCellsChangeType.Output) {
+            } else if (e.kind === NotebookCellsChangeType.Output) {
                 const cell = this.cells[e.index];
                 cell.outputs = e.outputs;
-            }
-            else if (e.kind === NotebookCellsChangeType.ChangeCellLanguage) {
+            } else if (e.kind === NotebookCellsChangeType.ChangeCellLanguage) {
                 this._assertIndex(e.index);
                 const cell = this.cells[e.index];
                 cell.language = e.language;
-            }
-            else if (e.kind === NotebookCellsChangeType.ChangeCellMetadata) {
+            } else if (e.kind === NotebookCellsChangeType.ChangeCellMetadata) {
                 this._assertIndex(e.index);
                 const cell = this.cells[e.index];
                 cell.metadata = e.metadata;
-            }
-            else if (e.kind === NotebookCellsChangeType.ChangeCellInternalMetadata) {
+            } else if (e.kind === NotebookCellsChangeType.ChangeCellInternalMetadata) {
                 this._assertIndex(e.index);
                 const cell = this.cells[e.index];
                 cell.internalMetadata = e.internalMetadata;
-            }
-            else if (e.kind === NotebookCellsChangeType.ChangeDocumentMetadata) {
+            } else if (e.kind === NotebookCellsChangeType.ChangeDocumentMetadata) {
                 this.metadata = e.metadata;
             }
         });
@@ -122,11 +127,10 @@ class CellSequence {
         return ( new CellSequence(hashValue));
     }
     static createWithCellId(cells, includeCellContents) {
-        const hashValue = ( cells.map((c) => {
+        const hashValue = ( cells.map(c => {
             if (includeCellContents) {
                 return `${doHash(c.internalMetadata?.internalId, numberHash(104579, 0))}#${c.getComparisonValue()}`;
-            }
-            else {
+            } else {
                 return `${doHash(c.internalMetadata?.internalId, numberHash(104579, 0))}}`;
             }
         }));
@@ -144,8 +148,7 @@ class NotebookWorker {
         this._requestHandlerBrand = undefined;
         this._models = Object.create(null);
     }
-    dispose() {
-    }
+    dispose() {}
     $acceptNewModel(uri, metadata, transientDocumentMetadata, cells) {
         this._models[uri] = ( new MirrorNotebookDocument(( URI.parse(uri)), ( cells.map(dto => ( new MirrorCell(dto.handle, ( URI.parse(dto.url)), dto.source, dto.eol, dto.versionId, dto.language, dto.cellKind, dto.outputs, dto.metadata, dto.internalMetadata)))), metadata, transientDocumentMetadata));
     }
@@ -178,8 +181,12 @@ class NotebookWorker {
                 cellsDiff: originalDiff
             };
         }
-        const cellMapping = computeDiff(originalModel, modifiedModel, { cellsDiff: { changes: originalDiff.changes, quitEarly: false }}).cellDiffInfo;
-        if (cellMapping.every(c => c.type === 'modified' || c.type === 'unchanged')) {
+        const cellMapping = computeDiff(originalModel, modifiedModel, {
+            cellsDiff: {
+                changes: originalDiff.changes,
+                quitEarly: false
+            }}).cellDiffInfo;
+        if (cellMapping.every(c => c.type === "modified" || c.type === "unchanged")) {
             return {
                 metadataChanged,
                 cellsDiff: originalDiff
@@ -203,17 +210,21 @@ class NotebookWorker {
             CellSequence.createWithCellId(original.cells),
             CellSequence.createWithCellId(modified.cells)
         )).ComputeDiff(false);
-        const cellDiffInfo = computeDiff(originalModel, modifiedModel, { cellsDiff: { changes: cellsInsertedOrDeletedDiff.changes, quitEarly: false }}).cellDiffInfo;
+        const cellDiffInfo = computeDiff(originalModel, modifiedModel, {
+            cellsDiff: {
+                changes: cellsInsertedOrDeletedDiff.changes,
+                quitEarly: false
+            }}).cellDiffInfo;
         let processedIndex = 0;
         const changes = [];
         cellsInsertedOrDeletedDiff.changes.forEach(change => {
             if (!change.originalLength && change.modifiedLength) {
-                const changeIndex = cellDiffInfo.findIndex(c => c.type === 'insert' && c.modifiedCellIndex === change.modifiedStart);
+                const changeIndex = cellDiffInfo.findIndex(c => c.type === "insert" && c.modifiedCellIndex === change.modifiedStart);
                 cellDiffInfo.slice(processedIndex, changeIndex).forEach(c => {
-                    if (c.type === 'unchanged' || c.type === 'modified') {
+                    if (c.type === "unchanged" || c.type === "modified") {
                         const originalCell = original.cells[c.originalCellIndex];
                         const modifiedCell = modified.cells[c.modifiedCellIndex];
-                        const changed = c.type === 'modified' || originalCell.getComparisonValue() !== modifiedCell.getComparisonValue();
+                        const changed = c.type === "modified" || originalCell.getComparisonValue() !== modifiedCell.getComparisonValue();
                         if (changed) {
                             changes.push(( new DiffChange(c.originalCellIndex, 1, c.modifiedCellIndex, 1)));
                         }
@@ -221,14 +232,13 @@ class NotebookWorker {
                 });
                 changes.push(change);
                 processedIndex = changeIndex + 1;
-            }
-            else if (change.originalLength && !change.modifiedLength) {
-                const changeIndex = cellDiffInfo.findIndex(c => c.type === 'delete' && c.originalCellIndex === change.originalStart);
+            } else if (change.originalLength && !change.modifiedLength) {
+                const changeIndex = cellDiffInfo.findIndex(c => c.type === "delete" && c.originalCellIndex === change.originalStart);
                 cellDiffInfo.slice(processedIndex, changeIndex).forEach(c => {
-                    if (c.type === 'unchanged' || c.type === 'modified') {
+                    if (c.type === "unchanged" || c.type === "modified") {
                         const originalCell = original.cells[c.originalCellIndex];
                         const modifiedCell = modified.cells[c.modifiedCellIndex];
-                        const changed = c.type === 'modified' || originalCell.getComparisonValue() !== modifiedCell.getComparisonValue();
+                        const changed = c.type === "modified" || originalCell.getComparisonValue() !== modifiedCell.getComparisonValue();
                         if (changed) {
                             changes.push(( new DiffChange(c.originalCellIndex, 1, c.modifiedCellIndex, 1)));
                         }
@@ -236,14 +246,15 @@ class NotebookWorker {
                 });
                 changes.push(change);
                 processedIndex = changeIndex + 1;
-            }
-            else {
-                const changeIndex = cellDiffInfo.findIndex(c => (c.type === 'delete' && c.originalCellIndex === change.originalStart) || (c.type === 'insert' && c.modifiedCellIndex === change.modifiedStart));
+            } else {
+                const changeIndex = cellDiffInfo.findIndex(
+                    c => (c.type === "delete" && c.originalCellIndex === change.originalStart) || (c.type === "insert" && c.modifiedCellIndex === change.modifiedStart)
+                );
                 cellDiffInfo.slice(processedIndex, changeIndex).forEach(c => {
-                    if (c.type === 'unchanged' || c.type === 'modified') {
+                    if (c.type === "unchanged" || c.type === "modified") {
                         const originalCell = original.cells[c.originalCellIndex];
                         const modifiedCell = modified.cells[c.modifiedCellIndex];
-                        const changed = c.type === 'modified' || originalCell.getComparisonValue() !== modifiedCell.getComparisonValue();
+                        const changed = c.type === "modified" || originalCell.getComparisonValue() !== modifiedCell.getComparisonValue();
                         if (changed) {
                             changes.push(( new DiffChange(c.originalCellIndex, 1, c.modifiedCellIndex, 1)));
                         }
@@ -254,10 +265,10 @@ class NotebookWorker {
             }
         });
         cellDiffInfo.slice(processedIndex).forEach(c => {
-            if (c.type === 'unchanged' || c.type === 'modified') {
+            if (c.type === "unchanged" || c.type === "modified") {
                 const originalCell = original.cells[c.originalCellIndex];
                 const modifiedCell = modified.cells[c.modifiedCellIndex];
-                const changed = c.type === 'modified' || originalCell.getComparisonValue() !== modifiedCell.getComparisonValue();
+                const changed = c.type === "modified" || originalCell.getComparisonValue() !== modifiedCell.getComparisonValue();
                 if (changed) {
                     changes.push(( new DiffChange(c.originalCellIndex, 1, c.modifiedCellIndex, 1)));
                 }
@@ -275,20 +286,28 @@ class NotebookWorker {
         return this.canComputeDiffWithCellInternalIds(original, modified) || this.canComputeDiffWithCellMetadataIds(original, modified);
     }
     canComputeDiffWithCellInternalIds(original, modified) {
-        const originalCellIndexIds = ( original.cells.map(
-            (cell, index) => ({ index, id: (cell.internalMetadata?.internalId || '') })
-        ));
-        const modifiedCellIndexIds = ( modified.cells.map(
-            (cell, index) => ({ index, id: (cell.internalMetadata?.internalId || '') })
-        ));
+        const originalCellIndexIds = ( original.cells.map((cell, index) => ({
+            index,
+            id: (cell.internalMetadata?.internalId || "")
+        })));
+        const modifiedCellIndexIds = ( modified.cells.map((cell, index) => ({
+            index,
+            id: (cell.internalMetadata?.internalId || "")
+        })));
         if (( originalCellIndexIds.some(c => !c.id)) || ( modifiedCellIndexIds.some(c => !c.id))) {
             return false;
         }
         return ( originalCellIndexIds.some(c => modifiedCellIndexIds.find(m => m.id === c.id)));
     }
     canComputeDiffWithCellMetadataIds(original, modified) {
-        const originalCellIndexIds = ( original.cells.map((cell, index) => ({ index, id: (cell.metadata?.id || '') })));
-        const modifiedCellIndexIds = ( modified.cells.map((cell, index) => ({ index, id: (cell.metadata?.id || '') })));
+        const originalCellIndexIds = ( original.cells.map((cell, index) => ({
+            index,
+            id: (cell.metadata?.id || "")
+        })));
+        const modifiedCellIndexIds = ( modified.cells.map((cell, index) => ({
+            index,
+            id: (cell.metadata?.id || "")
+        })));
         if (( originalCellIndexIds.some(c => !c.id)) || ( modifiedCellIndexIds.some(c => !c.id))) {
             return false;
         }
@@ -298,7 +317,7 @@ class NotebookWorker {
         return true;
     }
     isOriginalCellMatchedWithModifiedCell(originalCell) {
-        return (originalCell.internalMetadata?.internalId || '').startsWith(PREFIX_FOR_UNMATCHED_ORIGINAL_CELLS);
+        return (originalCell.internalMetadata?.internalId || "").startsWith(PREFIX_FOR_UNMATCHED_ORIGINAL_CELLS);
     }
     updateCellIdsBasedOnMappings(mappings, originalCells, modifiedCells) {
         return true;
@@ -311,10 +330,10 @@ class NotebookWorker {
             if (cell.cellKind === CellKind.Markup) {
                 continue;
             }
-            if (cell.language !== 'python') {
+            if (cell.language !== "python") {
                 continue;
             }
-            const searchParams = ( new SearchParams('import\\s*pandas|from\\s*pandas', true, false, null));
+            const searchParams = ( new SearchParams("import\\s*pandas|from\\s*pandas", true, false, null));
             const searchData = searchParams.parseSearchRequest();
             if (!searchData) {
                 continue;