@codingame/monaco-vscode-notebook-service-override 37.2.0 → 37.3.0

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.js

@@ -13,7 +13,7 @@ let NotebookLoggingService = class NotebookLoggingService extends Disposable {
     constructor(loggerService) {
         super();
         this._logger = this._register(loggerService.createLogger(logChannelId, {
-            name: ( localize(14814, "Notebook")),
+            name: ( localize(16953, "Notebook")),
             group: windowLogGroup
         }));
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookRendererMessagingServiceImpl.js

@@ -15,7 +15,7 @@ let NotebookRendererMessagingService = class NotebookRendererMessagingService ex
     }
     receiveMessage(editorId, rendererId, message) {
         if (editorId === undefined) {
-            const sends = ( [...( this.scopedMessaging.values())].map(e => e.receiveMessageHandler?.(rendererId, message)));
+            const sends = [...( this.scopedMessaging.values())].map(e => e.receiveMessageHandler?.(rendererId, message));
             return Promise.all(sends).then(s => ( s.some(s => !!s)));
         }
         return this.scopedMessaging.get(editorId)?.receiveMessageHandler?.(rendererId, message) ?? Promise.resolve(false);

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.d.ts

@@ -7,7 +7,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { NotebookTextModel } from "../../common/model/notebookTextModel.js";
 import { INotebookContributionData, INotebookRendererInfo, IOrderedMimeType, IOutputDto, NotebookExtensionDescription, INotebookStaticPreloadInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.js

@@ -446,7 +446,7 @@ let NotebookOutputRendererInfoStore = class NotebookOutputRendererInfoStore {
         const preferred = notebookProviderInfo && this.preferredMimetype.value[notebookProviderInfo.id]?.[mimeType];
         const notebookExtId = notebookProviderInfo?.extension?.value;
         const notebookId = notebookProviderInfo?.id;
-        const renderers = ( Array.from(( this.contributedRenderers.values())).map(renderer => {
+        const renderers = Array.from(( this.contributedRenderers.values())).map(renderer => {
             const ownScore = kernelProvides === undefined ? renderer.matchesWithoutKernel(mimeType) : renderer.matches(mimeType, kernelProvides);
             if (ownScore === NotebookRendererMatch.Never) {
                 return undefined;
@@ -461,7 +461,7 @@ let NotebookOutputRendererInfoStore = class NotebookOutputRendererInfoStore {
                 },
                 score: reuseScore | ownScore
             };
-        })).filter(isDefined);
+        }).filter(isDefined);
         if (renderers.length === 0) {
             return [{
                 mimeType,
@@ -469,7 +469,7 @@ let NotebookOutputRendererInfoStore = class NotebookOutputRendererInfoStore {
                 isTrusted: true
             }];
         }
-        return ( renderers.sort((a, b) => a.score - b.score).map(r => r.ordered));
+        return renderers.sort((a, b) => a.score - b.score).map(r => r.ordered);
     }
 };
 NotebookOutputRendererInfoStore = ( __decorate([( __param(0, IStorageService))], NotebookOutputRendererInfoStore));
@@ -610,11 +610,11 @@ let NotebookService = class NotebookService extends Disposable {
         this._viewTypeCache = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
     }
     getEditorTypes() {
-        return ( [...this.notebookProviderInfoStore].map(info => ({
+        return [...this.notebookProviderInfoStore].map(info => ({
             id: info.id,
             displayName: info.displayName,
             providerDisplayName: info.providerDisplayName
-        })));
+        }));
     }
     clearEditorCache() {
         this.notebookProviderInfoStore.clearEditorCache();
@@ -675,7 +675,7 @@ let NotebookService = class NotebookService extends Disposable {
             const knownProvider = this.getViewTypeProvider(viewType);
             const actions = knownProvider ? [toAction({
                 id: "workbench.notebook.action.installMissingViewType",
-                label: ( localize(14815, "Install extension for '{0}'", viewType)),
+                label: ( localize(16954, "Install extension for '{0}'", viewType)),
                 run: async () => {
                     await this._instantiationService.createInstance(InstallRecommendedExtensionAction, knownProvider).run();
                 }
@@ -796,10 +796,10 @@ let NotebookService = class NotebookService extends Disposable {
         return this._models.get(uri)?.model;
     }
     getNotebookTextModels() {
-        return ( Iterable.map(( this._models.values()), data => data.model));
+        return Iterable.map(( this._models.values()), data => data.model);
     }
     listNotebookDocuments() {
-        return ( [...this._models].map(e => e[1].model));
+        return [...this._models].map(e => e[1].model);
     }
     _onWillDisposeDocument(model) {
         const modelData = this._models.get(model.uri);
@@ -812,7 +812,7 @@ let NotebookService = class NotebookService extends Disposable {
         }
     }
     getOutputMimeTypeInfo(textModel, kernelProvides, output) {
-        const sorted = this._displayOrder.sort(( new Set(( output.outputs.map(op => op.mime)))));
+        const sorted = this._displayOrder.sort(( new Set(output.outputs.map(op => op.mime))));
         const notebookProviderInfo = this.notebookProviderInfoStore.get(textModel.viewType);
         return sorted.flatMap(
             mimeType => this._notebookRenderersInfoStore.findBestRenderers(notebookProviderInfo, mimeType, kernelProvides)

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.js

@@ -72,7 +72,7 @@ class NotebookEditorModelManager extends Disposable {
             return;
         }
         const modelUrl = ( resource.toString());
-        this._proxy.$acceptNewModel(( model.uri.toString()), model.metadata, model.transientOptions.transientDocumentMetadata, ( model.cells.map(cell => ({
+        this._proxy.$acceptNewModel(( model.uri.toString()), model.metadata, model.transientOptions.transientDocumentMetadata, model.cells.map(cell => ({
             handle: cell.handle,
             url: ( cell.uri.toString()),
             source: cell.textBuffer.getLinesContent(),
@@ -81,13 +81,13 @@ class NotebookEditorModelManager extends Disposable {
             language: cell.language,
             mime: cell.mime,
             cellKind: cell.cellKind,
-            outputs: ( cell.outputs.map(op => ({
+            outputs: cell.outputs.map(op => ({
                 outputId: op.outputId,
                 outputs: op.outputs
-            }))),
+            })),
             metadata: cell.metadata,
             internalMetadata: cell.internalMetadata
-        }))));
+        })));
         const toDispose = ( new DisposableStore());
         const cellToDto = cell => {
             return {
@@ -98,10 +98,10 @@ class NotebookEditorModelManager extends Disposable {
                 versionId: 0,
                 language: cell.language,
                 cellKind: cell.cellKind,
-                outputs: ( cell.outputs.map(op => ({
+                outputs: cell.outputs.map(op => ({
                     outputId: op.outputId,
                     outputs: op.outputs
-                }))),
+                })),
                 metadata: cell.metadata,
                 internalMetadata: cell.internalMetadata
             };
@@ -140,7 +140,7 @@ class NotebookEditorModelManager extends Disposable {
                     {
                         dto.push({
                             kind: e.kind,
-                            changes: ( e.changes.map(diff => [diff[0], diff[1], ( diff[2].map(cell => cellToDto(cell)))]))
+                            changes: e.changes.map(diff => [diff[0], diff[1], diff[2].map(cell => cellToDto(cell))])
                         });
                         for (const change of e.changes) {
                             for (const cell of change[2]) {
@@ -156,7 +156,7 @@ class NotebookEditorModelManager extends Disposable {
                             index: e.index,
                             length: e.length,
                             newIdx: e.newIdx,
-                            cells: ( e.cells.map(cell => cellToDto(cell)))
+                            cells: e.cells.map(cell => cellToDto(cell))
                         });
                         break;
                     }

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry.js

@@ -2,7 +2,7 @@
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
-import { executingStateIcon } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { executingStateIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { SymbolKinds } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { IOutlineModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { getMarkdownHeadersInCell } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/foldingModel';
+import { getMarkdownHeadersInCell } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/foldingModel';
 import { OutlineEntry } from './OutlineEntry.js';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
@@ -93,7 +93,7 @@ let NotebookOutlineEntryFactory = class NotebookOutlineEntryFactory {
             }
             if (entries.length === 0) {
                 if (preview.length === 0) {
-                    preview = ( localize(14848, "empty cell"));
+                    preview = ( localize(16987, "empty cell"));
                 }
                 entries.push(( new OutlineEntry(
                     index++,

package/vscode/src/vs/workbench/contrib/notebook/common/model/cellEdit.d.ts

@@ -1,6 +1,6 @@
 import { IResourceUndoRedoElement, UndoRedoElementType } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { ISelectionState, NotebookCellMetadata } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 /**
  * It should not modify Undo/Redo stack

package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.d.ts

@@ -11,7 +11,7 @@ import { ILanguageDetectionService } from "@codingame/monaco-vscode-api/vscode/v
 import { ICellDto2, ICellEditOperation, INotebookSnapshotOptions, INotebookTextModel, ISelectionState, NotebookCellDefaultCollapseConfig, NotebookData, NotebookDocumentMetadata, NotebookTextModelChangedEvent, NotebookTextModelWillAddRemoveEvent, TransientOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
 import { INotebookLoggingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 export declare class NotebookTextModel extends Disposable implements INotebookTextModel {
     readonly viewType: string;
     readonly uri: URI;

package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.js

@@ -22,8 +22,8 @@ import { CellUri, NotebookCellsChangeType, NotebookCellExecutionState, CellEditT
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookLoggingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service';
 import { SpliceCellsEdit, CellMetadataEdit, MoveCellEdit } from './cellEdit.js';
-import { NotebookCellOutputTextModel } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel';
-import { NotebookCellTextModel } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
+import { NotebookCellOutputTextModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel';
+import { NotebookCellTextModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 
 var NotebookTextModel_1;
 class StackOperation {
@@ -290,7 +290,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         this._cells = [];
         this._versionId = 0;
         this._notebookSpecificAlternativeId = 0;
-        const mainCells = ( cells.map(cell => {
+        const mainCells = cells.map(cell => {
             const cellHandle = this._cellhandlePool++;
             const cellUri = CellUri.generate(this.uri, cellHandle);
             return ( new NotebookCellTextModel(
@@ -304,7 +304,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 this._languageDetectionService,
                 this._notebookLoggingService
             ));
-        }));
+        });
         for (let i = 0; i < mainCells.length; i++) {
             const dirtyStateListener = mainCells[i].onDidChangeContent(e => {
                 this._bindCellContentHandler(mainCells[i], e);
@@ -384,7 +384,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         }
     }
     _generateAlternativeId() {
-        return `${this._notebookSpecificAlternativeId}_` + ( this.cells.map(cell => cell.handle + "," + cell.alternativeId)).join(";");
+        return `${this._notebookSpecificAlternativeId}_` + this.cells.map(cell => cell.handle + "," + cell.alternativeId).join(";");
     }
     dispose() {
         if (this._isDisposed) {
@@ -428,7 +428,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
     reset(cells, metadata, transientOptions) {
         this.transientOptions = transientOptions;
         const executions = this._notebookExecutionStateService.getCellExecutionsForNotebook(this.uri);
-        const executingCellHandles = ( executions.filter(exe => exe.state === NotebookCellExecutionState.Executing).map(exe => exe.cellHandle));
+        const executingCellHandles = executions.filter(exe => exe.state === NotebookCellExecutionState.Executing).map(exe => exe.cellHandle);
         const edits = NotebookTextModel_1.computeEdits(this, cells, executingCellHandles);
         this.applyEdits([...edits, {
             editType: CellEditType.DocumentMetadata,
@@ -548,14 +548,14 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         if (a.length === 0) {
             return [];
         }
-        return ( b.map((output, i) => {
+        return b.map((output, i) => {
             return {
                 editType: CellEditType.OutputItems,
                 outputId: a[i].outputId,
                 items: output.outputs,
                 append: false
             };
-        }));
+        });
     }
     static _commonPrefix(a, aLen, aDelta, b, bLen, bDelta, isExecuting) {
         const maxResult = Math.min(aLen, bLen);
@@ -640,7 +640,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         }
     }
     _doApplyEdits(rawEdits, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup) {
-        const editsWithDetails = ( rawEdits.map((edit, index) => {
+        const editsWithDetails = rawEdits.map((edit, index) => {
             let cellIndex = -1;
             if (hasKey(edit, {
                 index: true
@@ -670,8 +670,8 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 end: (edit.editType === CellEditType.DocumentMetadata) ? undefined : (edit.editType === CellEditType.Replace ? edit.index + edit.count : cellIndex),
                 originalIndex: index
             };
-        })).filter(isDefined);
-        const edits = ( this._mergeCellEdits(editsWithDetails).sort((a, b) => {
+        }).filter(isDefined);
+        const edits = this._mergeCellEdits(editsWithDetails).sort((a, b) => {
             if (a.end === undefined) {
                 return -1;
             }
@@ -703,7 +703,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 }
             });
             return [...otherEdits.reverse(), ...replaceEdits];
-        }));
+        });
         const flattenEdits = edits.flat();
         for (const {
             edit,
@@ -729,7 +729,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                         this._spliceNotebookCellOutputs(cell, {
                             start: cell.outputs.length,
                             deleteCount: 0,
-                            newOutputs: ( edit.outputs.map(op => ( new NotebookCellOutputTextModel(op))))
+                            newOutputs: edit.outputs.map(op => ( new NotebookCellOutputTextModel(op)))
                         }, true, computeUndoRedo);
                     } else {
                         this._spliceNotebookCellOutputs2(cell, edit.outputs, computeUndoRedo);
@@ -841,7 +841,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             this._cellListeners.get(cell.handle)?.dispose();
             this._cellListeners.delete(cell.handle);
         }
-        const cells = ( cellDtos.map(cellDto => {
+        const cells = cellDtos.map(cellDto => {
             const cellHandle = this._cellhandlePool++;
             const cellUri = CellUri.generate(this.uri, cellHandle);
             if (!cellDto.outputs) {
@@ -872,14 +872,14 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             this._cellListeners.set(cell.handle, dirtyStateListener);
             this._register(cell);
             return cell;
-        }));
+        });
         const cellsCopy = this._cells.slice(0);
         cellsCopy.splice(index, count, ...cells);
-        const diffs = ( diff(this._cells, cellsCopy, cell => {
+        const diffs = diff(this._cells, cellsCopy, cell => {
             return ( oldSet.has(cell.handle));
         }).map(diff => {
             return [diff.start, diff.deleteCount, diff.toInsert];
-        }));
+        });
         this._onWillAddRemoveCells.fire({
             rawEvent: {
                 kind: NotebookCellsChangeType.ModelChange,
@@ -887,10 +887,10 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             }
         });
         this._cells = cellsCopy;
-        const undoDiff = ( diffs.map(diff => {
+        const undoDiff = diffs.map(diff => {
             const deletedCells = oldViewCells.slice(diff[0], diff[0] + diff[1]);
             return [diff[0], deletedCells, diff[2]];
-        }));
+        });
         if (computeUndoRedo) {
             this._operationManager.pushEditOperation(( new SpliceCellsEdit(this.uri, undoDiff, {
                 insertCell: (index, cell, endSelections) => {
@@ -1194,17 +1194,17 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             this._spliceNotebookCellOutputs(cell, {
                 start: 0,
                 deleteCount: cell.outputs.length,
-                newOutputs: ( outputs.map(op => ( new NotebookCellOutputTextModel(op))))
+                newOutputs: outputs.map(op => ( new NotebookCellOutputTextModel(op)))
             }, false, computeUndoRedo);
             return;
         }
         const diff = ( new LcsDiff(( new OutputSequence(cell.outputs)), ( new OutputSequence(outputs))));
         const diffResult = diff.ComputeDiff(false);
-        const splices = ( diffResult.changes.map(change => ({
+        const splices = diffResult.changes.map(change => ({
             start: change.originalStart,
             deleteCount: change.originalLength,
-            newOutputs: ( outputs.slice(change.modifiedStart, change.modifiedStart + change.modifiedLength).map(op => ( new NotebookCellOutputTextModel(op))))
-        })));
+            newOutputs: outputs.slice(change.modifiedStart, change.modifiedStart + change.modifiedLength).map(op => ( new NotebookCellOutputTextModel(op)))
+        }));
         splices.reverse().forEach(splice => {
             this._spliceNotebookCellOutputs(cell, splice, false, computeUndoRedo);
         });
@@ -1215,7 +1215,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             rawEvents: [{
                 kind: NotebookCellsChangeType.Output,
                 index: this._cells.indexOf(cell),
-                outputs: ( cell.outputs.map(output => output.asDto())) ?? [],
+                outputs: cell.outputs.map(output => output.asDto()) ?? [],
                 append,
                 transient: this.transientOptions.transientOutputs
             }],
@@ -1381,12 +1381,12 @@ class OutputSequence {
         this.outputs = outputs;
     }
     getElements() {
-        return ( this.outputs.map(output => {
-            return hash(( output.outputs.map(output => ({
+        return this.outputs.map(output => {
+            return hash(output.outputs.map(output => ({
                 mime: output.mime,
                 data: output.data
-            }))));
-        }));
+            })));
+        });
     }
 }
 

package/vscode/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.js

@@ -32,9 +32,9 @@ class NotebookOutputRendererInfo {
         }
         this.displayName = descriptor.displayName;
         this.mimeTypes = descriptor.mimeTypes;
-        this.mimeTypeGlobs = ( this.mimeTypes.map(pattern => parse(pattern, {
+        this.mimeTypeGlobs = this.mimeTypes.map(pattern => parse(pattern, {
             ignoreCase: true
-        })));
+        }));
         this.hardDependencies = ( new DependencyList(descriptor.dependencies ?? Iterable.empty()));
         this.optionalDependencies = ( new DependencyList(descriptor.optionalDependencies ?? Iterable.empty()));
         this.messaging = descriptor.requiresMessaging ?? RendererMessagingSpec.Never;
@@ -72,7 +72,7 @@ class NotebookStaticPreloadInfo {
         this.type = descriptor.type;
         this.entrypoint = joinPath(descriptor.extension.extensionLocation, descriptor.entrypoint);
         this.extensionLocation = descriptor.extension.extensionLocation;
-        this.localResourceRoots = ( descriptor.localResourceRoots.map(root => joinPath(descriptor.extension.extensionLocation, root)));
+        this.localResourceRoots = descriptor.localResourceRoots.map(root => joinPath(descriptor.extension.extensionLocation, root));
     }
 }
 

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

@@ -10,9 +10,9 @@ import { MirrorModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/commo
 import { DefaultEndOfLine } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { filter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { matchCellBasedOnSimilarties } from './notebookCellMatching.js';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { generateUuid } from '@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 {
@@ -65,7 +65,7 @@ class MirrorCell {
                 hashValue = doHash(output.mime, hashValue);
             }
         }
-        const digests = this.outputs.flatMap(op => ( op.outputs.map(o => hash(Array.from(o.data.buffer)))));
+        const digests = this.outputs.flatMap(op => op.outputs.map(o => hash(Array.from(o.data.buffer))));
         for (const digest of digests) {
             hashValue = numberHash(digest, hashValue);
         }
@@ -114,26 +114,26 @@ class MirrorNotebookDocument {
     _spliceNotebookCells(splices) {
         splices.reverse().forEach(splice => {
             const cellDtos = splice[2];
-            const newCells = ( cellDtos.map(cell => {
+            const newCells = cellDtos.map(cell => {
                 return ( new MirrorCell(cell.handle, ( URI.parse(cell.url)), cell.source, cell.eol, cell.versionId, cell.language, cell.cellKind, cell.outputs, cell.metadata));
-            }));
+            });
             this.cells.splice(splice[0], splice[1], ...newCells);
         });
     }
 }
 class CellSequence {
     static create(textModel) {
-        const hashValue = ( textModel.cells.map(c => c.getComparisonValue()));
+        const hashValue = textModel.cells.map(c => c.getComparisonValue());
         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 {
                 return `${doHash(c.internalMetadata?.internalId, numberHash(104579, 0))}}`;
             }
-        }));
+        });
         return ( new CellSequence(hashValue));
     }
     constructor(hashValue) {
@@ -150,7 +150,7 @@ class NotebookWorker {
     }
     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));
+        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));
     }
     $acceptModelChanged(strURL, event) {
         const model = this._models[strURL];
@@ -286,40 +286,66 @@ class NotebookWorker {
         return this.canComputeDiffWithCellInternalIds(original, modified) || this.canComputeDiffWithCellMetadataIds(original, modified);
     }
     canComputeDiffWithCellInternalIds(original, modified) {
-        const originalCellIndexIds = ( original.cells.map((cell, index) => ({
+        const originalCellIndexIds = original.cells.map((cell, index) => ({
             index,
             id: (cell.internalMetadata?.internalId || "")
-        })));
-        const modifiedCellIndexIds = ( modified.cells.map((cell, index) => ({
+        }));
+        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) => ({
+        const originalCellIndexIds = original.cells.map((cell, index) => ({
             index,
             id: (cell.metadata?.id || "")
-        })));
-        const modifiedCellIndexIds = ( modified.cells.map((cell, index) => ({
+        }));
+        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;
         }
         if (originalCellIndexIds.every(c => !modifiedCellIndexIds.find(m => m.id === c.id))) {
             return false;
         }
+        original.cells.map((cell, index) => {
+            cell.internalMetadata = cell.internalMetadata || {};
+            cell.internalMetadata.internalId = cell.metadata?.id || "";
+        });
+        modified.cells.map((cell, index) => {
+            cell.internalMetadata = cell.internalMetadata || {};
+            cell.internalMetadata.internalId = cell.metadata?.id || "";
+        });
         return true;
     }
     isOriginalCellMatchedWithModifiedCell(originalCell) {
         return (originalCell.internalMetadata?.internalId || "").startsWith(PREFIX_FOR_UNMATCHED_ORIGINAL_CELLS);
     }
     updateCellIdsBasedOnMappings(mappings, originalCells, modifiedCells) {
+        const uuids = ( new Map());
+        originalCells.map((cell, index) => {
+            cell.internalMetadata = cell.internalMetadata || {
+                internalId: ""
+            };
+            cell.internalMetadata.internalId = `${PREFIX_FOR_UNMATCHED_ORIGINAL_CELLS}${generateUuid()}`;
+            const found = mappings.find(r => r.original === index);
+            if (found) {
+                cell.internalMetadata.internalId = generateUuid();
+                uuids.set(found.modified, cell.internalMetadata.internalId);
+            }
+        });
+        modifiedCells.map((cell, index) => {
+            cell.internalMetadata = cell.internalMetadata || {
+                internalId: ""
+            };
+            cell.internalMetadata.internalId = uuids.get(index) ?? generateUuid();
+        });
         return true;
     }
     $canPromptRecommendation(modelUrl) {
@@ -362,7 +388,7 @@ function create() {
 class NotebookTextModelFacade {
     constructor(notebook) {
         this.notebook = notebook;
-        this.cells = ( notebook.cells.map(cell => ( new NotebookCellTextModelFacade(cell))));
+        this.cells = notebook.cells.map(cell => ( new NotebookCellTextModelFacade(cell)));
     }
 }
 class NotebookCellTextModelFacade {

package/vscode/src/vs/workbench/contrib/replNotebook/browser/repl.contribution.js

@@ -35,17 +35,17 @@ import { getReplView } from '@codingame/monaco-vscode-api/vscode/vs/workbench/co
 import { REPL_VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
 import { InlineChatController } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { IInteractiveHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/interactive/browser/interactiveHistoryService.service';
-import { NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { executeIcon } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { executeIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { ReplEditorAccessibleView } from '../../notebook/browser/replEditorAccessibleView.js';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { REPL_EDITOR_ID, NotebookSetting, NotebookWorkingCopyTypeIdentifier, CellKind, CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { MOST_RECENT_REPL_EDITOR, IS_COMPOSITE_NOTEBOOK, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_FOCUSED } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
-import { ReplEditor, isReplEditorControl } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/replNotebook/browser/replEditor';
+import { ReplEditor, isReplEditorControl } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/replNotebook/browser/replEditor';
 import { ReplEditorInputAccessibilityHelp, ReplEditorHistoryAccessibilityHelp } from './replEditorAccessibilityHelp.js';
-import { ReplEditorInput } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/replNotebook/browser/replEditorInput';
+import { ReplEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/replNotebook/browser/replEditorInput';
 
 class ReplEditorSerializer {
     canSerialize(input) {
@@ -232,7 +232,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "repl.focusLastItemExecuted",
-            title: ( localize2(15602, "Focus Most Recent REPL Execution")),
+            title: ( localize2(17741, "Focus Most Recent REPL Execution")),
             category: "REPL",
             menu: {
                 id: MenuId.CommandPalette,
@@ -282,7 +282,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "repl.input.focus",
-            title: ( localize2(15603, "Focus Input Editor")),
+            title: ( localize2(17742, "Focus Input Editor")),
             category: "REPL",
             menu: {
                 id: MenuId.CommandPalette,
@@ -327,7 +327,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "repl.execute",
-            title: ( localize2(15604, "Execute REPL input")),
+            title: ( localize2(17743, "Execute REPL input")),
             category: "REPL",
             keybinding: [{
                 when: ( ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, ( ContextKeyExpr.equals("activeEditor", "workbench.editor.repl")), ( NOTEBOOK_CELL_LIST_FOCUSED.negate()))),