@codingame/monaco-vscode-notebook-service-override 9.0.2 → 10.0.0

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

@@ -15,13 +15,12 @@ import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/c
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { notebooksExtensionPoint, notebookRendererExtensionPoint, notebookPreloadExtensionPoint } from '../notebookExtensionPoint.js';
 import { NotebookDiffEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
 import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
-import { NotebookEditorPriority, NotebookSetting, CellUri, NotebookRendererMatch, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, MimeTypeDisplayOrder, ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, NOTEBOOK_DISPLAY_ORDER } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { NotebookEditorPriority, NotebookSetting, CellUri, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, MimeTypeDisplayOrder, ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, NOTEBOOK_DISPLAY_ORDER } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookEditorModelResolverService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
 import { NotebookOutputRendererInfo, NotebookStaticPreloadInfo } from '../../common/notebookOutputRenderer.js';
@@ -56,7 +55,7 @@ let NotebookProviderInfoStore = class NotebookProviderInfoStore extends Disposab
         this._contributedEditors = ( (new Map()));
         this._contributedEditorDisposables = this._register(( (new DisposableStore())));
         this._memento = ( (new Memento(NotebookProviderInfoStore_1.CUSTOM_EDITORS_STORAGE_ID, storageService)));
-        const mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
+        const mementoObject = this._memento.getMemento(0 , 1 );
         this._editorResolverService.bufferChangeEvents(() => {
             for (const info of (mementoObject[NotebookProviderInfoStore_1.CUSTOM_EDITORS_ENTRY_ID] || [])) {
                 this.add(( (new NotebookProviderInfo(info))), false);
@@ -109,12 +108,12 @@ let NotebookProviderInfoStore = class NotebookProviderInfoStore extends Disposab
                 }))));
             }
         }
-        const mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
+        const mementoObject = this._memento.getMemento(0 , 1 );
         mementoObject[NotebookProviderInfoStore_1.CUSTOM_EDITORS_ENTRY_ID] = Array.from(( (this._contributedEditors.values())));
         this._memento.saveMemento();
     }
     clearEditorCache() {
-        const mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
+        const mementoObject = this._memento.getMemento(0 , 1 );
         mementoObject[NotebookProviderInfoStore_1.CUSTOM_EDITORS_ENTRY_ID] = [];
         this._memento.saveMemento();
     }
@@ -247,12 +246,12 @@ let NotebookProviderInfoStore = class NotebookProviderInfoStore extends Disposab
             this._contributedEditorDisposables.add(editorRegistration);
         }
         if (saveMemento) {
-            const mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
+            const mementoObject = this._memento.getMemento(0 , 1 );
             mementoObject[NotebookProviderInfoStore_1.CUSTOM_EDITORS_ENTRY_ID] = Array.from(( (this._contributedEditors.values())));
             this._memento.saveMemento();
         }
         return this._register(toDisposable(() => {
-            const mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
+            const mementoObject = this._memento.getMemento(0 , 1 );
             mementoObject[NotebookProviderInfoStore_1.CUSTOM_EDITORS_ENTRY_ID] = Array.from(( (this._contributedEditors.values())));
             this._memento.saveMemento();
             editorRegistration?.dispose();
@@ -292,7 +291,7 @@ let NotebookOutputRendererInfoStore = class NotebookOutputRendererInfoStore {
     constructor(storageService) {
         this.contributedRenderers = ( (new Map()));
         this.preferredMimetype = ( (new Lazy(
-            () => this.preferredMimetypeMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE)
+            () => this.preferredMimetypeMemento.getMemento(1 , 1 )
         )));
         this.preferredMimetypeMemento = ( (new Memento('workbench.editor.notebook.preferredRenderer2', storageService)));
     }
@@ -323,13 +322,6 @@ let NotebookOutputRendererInfoStore = class NotebookOutputRendererInfoStore {
         this.preferredMimetypeMemento.saveMemento();
     }
     findBestRenderers(notebookProviderInfo, mimeType, kernelProvides) {
-        let ReuseOrder;
-        ( ((function(ReuseOrder) {
-            ReuseOrder[ReuseOrder["PreviouslySelected"] = 256] = "PreviouslySelected";
-            ReuseOrder[ReuseOrder["SameExtensionAsNotebook"] = 512] = "SameExtensionAsNotebook";
-            ReuseOrder[ReuseOrder["OtherRenderer"] = 768] = "OtherRenderer";
-            ReuseOrder[ReuseOrder["BuiltIn"] = 1024] = "BuiltIn";
-        })(ReuseOrder || (ReuseOrder = {}))));
         const preferred = notebookProviderInfo && this.preferredMimetype.value[notebookProviderInfo.id]?.[mimeType];
         const notebookExtId = notebookProviderInfo?.extension?.value;
         const notebookId = notebookProviderInfo?.id;
@@ -338,15 +330,15 @@ let NotebookOutputRendererInfoStore = class NotebookOutputRendererInfoStore {
             const ownScore = kernelProvides === undefined
                 ? renderer.matchesWithoutKernel(mimeType)
                 : renderer.matches(mimeType, kernelProvides);
-            if (ownScore === NotebookRendererMatch.Never) {
+            if (ownScore === 3 ) {
                 return undefined;
             }
             const rendererExtId = renderer.extensionId.value;
             const reuseScore = preferred === renderer.id
-                ? ReuseOrder.PreviouslySelected
+                ? 256
                 : rendererExtId === notebookExtId || RENDERER_EQUIVALENT_EXTENSIONS.get(rendererExtId)?.has(notebookId)
-                    ? ReuseOrder.SameExtensionAsNotebook
-                    : renderer.isBuiltin ? ReuseOrder.BuiltIn : ReuseOrder.OtherRenderer;
+                    ? 512
+                    : renderer.isBuiltin ? 1024  : 768 ;
             return {
                 ordered: { mimeType, rendererId: renderer.id, isTrusted: true },
                 score: reuseScore | ownScore,
@@ -486,7 +478,7 @@ let NotebookService = class NotebookService extends Disposable {
             updateOrder();
         }));
         this._memento = ( (new Memento(NotebookService_1._storageNotebookViewTypeProvider, this._storageService)));
-        this._viewTypeCache = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        this._viewTypeCache = this._memento.getMemento(1 , 1 );
     }
     getEditorTypes() {
         return (
@@ -554,7 +546,7 @@ let NotebookService = class NotebookService extends Disposable {
             const knownProvider = this.getViewTypeProvider(viewType);
             const actions = knownProvider ? [
                 toAction({
-                    id: 'workbench.notebook.action.installMissingViewType', label: ( localize(3258, "Install extension for '{0}'", viewType)), run: async () => {
+                    id: 'workbench.notebook.action.installMissingViewType', label: ( localize(3293, "Install extension for '{0}'", viewType)), run: async () => {
                         await this._instantiationService.createInstance(InstallRecommendedExtensionAction, knownProvider).run();
                     }
                 })

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

@@ -1,13 +1,17 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, DisposableStore, toDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { createWebWorker } from 'vscode/vscode/vs/base/browser/defaultWorkerFactory';
-import { NotebookCellsChangeType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellUri, NotebookCellsChangeType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
+import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { TextModel } from 'vscode/vscode/vs/editor/common/model/textModel';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 
 let NotebookEditorWorkerServiceImpl = class NotebookEditorWorkerServiceImpl extends Disposable {
-    constructor(notebookService) {
+    constructor(notebookService, modelService) {
         super();
-        this._workerManager = this._register(( new WorkerManager(notebookService)));
+        this._workerManager = this._register(( new WorkerManager(notebookService, modelService)));
     }
     canComputeDiff(original, modified) {
         throw ( new Error('Method not implemented.'));
@@ -24,26 +28,29 @@ let NotebookEditorWorkerServiceImpl = class NotebookEditorWorkerServiceImpl exte
     }
 };
 NotebookEditorWorkerServiceImpl = ( __decorate([
-    ( __param(0, INotebookService))
+    ( __param(0, INotebookService)),
+    ( __param(1, IModelService))
 ], NotebookEditorWorkerServiceImpl));
 class WorkerManager extends Disposable {
-    constructor(_notebookService) {
+    constructor(_notebookService, _modelService) {
         super();
         this._notebookService = _notebookService;
+        this._modelService = _modelService;
         this._editorWorkerClient = null;
     }
     withWorker() {
         if (!this._editorWorkerClient) {
-            this._editorWorkerClient = ( new NotebookWorkerClient(this._notebookService));
+            this._editorWorkerClient = ( new NotebookWorkerClient(this._notebookService, this._modelService));
         }
         return Promise.resolve(this._editorWorkerClient);
     }
 }
 class NotebookEditorModelManager extends Disposable {
-    constructor(_proxy, _notebookService) {
+    constructor(_proxy, _notebookService, _modelService) {
         super();
         this._proxy = _proxy;
         this._notebookService = _notebookService;
+        this._modelService = _modelService;
         this._syncedModels = Object.create(null);
         this._syncedModelsLastUsedTime = Object.create(null);
     }
@@ -64,28 +71,27 @@ class NotebookEditorModelManager extends Disposable {
             return;
         }
         const modelUrl = ( resource.toString());
-        this._proxy.$acceptNewModel(( model.uri.toString()), {
-            cells: ( model.cells.map(cell => ({
-                handle: cell.handle,
-                uri: cell.uri,
-                source: cell.getValue(),
-                eol: cell.textBuffer.getEOL(),
-                language: cell.language,
-                mime: cell.mime,
-                cellKind: cell.cellKind,
-                outputs: ( cell.outputs.map(op => ({ outputId: op.outputId, outputs: op.outputs }))),
-                metadata: cell.metadata,
-                internalMetadata: cell.internalMetadata,
-            }))),
-            metadata: model.metadata
-        });
+        this._proxy.$acceptNewModel(( model.uri.toString()), model.metadata, ( model.cells.map(cell => ({
+            handle: cell.handle,
+            url: ( cell.uri.toString()),
+            source: cell.textBuffer.getLinesContent(),
+            eol: cell.textBuffer.getEOL(),
+            versionId: cell.textModel?.getVersionId() ?? 0,
+            language: cell.language,
+            mime: cell.mime,
+            cellKind: cell.cellKind,
+            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 {
                 handle: cell.handle,
-                uri: cell.uri,
+                url: ( cell.uri.toString()),
                 source: cell.textBuffer.getLinesContent(),
                 eol: cell.textBuffer.getEOL(),
+                versionId: 0,
                 language: cell.language,
                 cellKind: cell.cellKind,
                 outputs: ( cell.outputs.map(op => ({ outputId: op.outputId, outputs: op.outputs }))),
@@ -93,26 +99,70 @@ class NotebookEditorModelManager extends Disposable {
                 internalMetadata: cell.internalMetadata,
             };
         };
+        const cellHandlers = ( new Set());
+        const addCellContentChangeHandler = (cell) => {
+            cellHandlers.add(cell);
+            toDispose.add(cell.onDidChangeContent((e) => {
+                if (typeof e === 'object' && e.type === 'model') {
+                    this._proxy.$acceptCellModelChanged(modelUrl, cell.handle, e.event);
+                }
+            }));
+        };
+        model.cells.forEach(cell => addCellContentChangeHandler(cell));
+        if (model.cells.length !== cellHandlers.size) {
+            toDispose.add(this._modelService.onModelAdded((textModel) => {
+                if (textModel.uri.scheme !== Schemas.vscodeNotebookCell || !(textModel instanceof TextModel)) {
+                    return;
+                }
+                const cellUri = CellUri.parse(textModel.uri);
+                if (!cellUri || !isEqual(cellUri.notebook, model.uri)) {
+                    return;
+                }
+                const cell = model.cells.find(cell => cell.handle === cellUri.handle);
+                if (cell) {
+                    addCellContentChangeHandler(cell);
+                }
+            }));
+        }
         toDispose.add(model.onDidChangeContent((event) => {
-            const dto = ( event.rawEvents.map(e => {
-                const data = e.kind === NotebookCellsChangeType.ModelChange || e.kind === NotebookCellsChangeType.Initialize
-                    ? {
-                        kind: e.kind,
-                        versionId: event.versionId,
-                        changes: ( e.changes.map(diff => [diff[0], diff[1], ( diff[2].map(cell => cellToDto(cell)))]))
-                    }
-                    : (e.kind === NotebookCellsChangeType.Move
-                        ? {
+            const dto = [];
+            event.rawEvents
+                .forEach(e => {
+                switch (e.kind) {
+                    case NotebookCellsChangeType.ModelChange:
+                    case NotebookCellsChangeType.Initialize: {
+                        dto.push({
                             kind: e.kind,
+                            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]) {
+                                addCellContentChangeHandler(cell);
+                            }
+                        }
+                        break;
+                    }
+                    case NotebookCellsChangeType.Move: {
+                        dto.push({
+                            kind: NotebookCellsChangeType.Move,
                             index: e.index,
                             length: e.length,
                             newIdx: e.newIdx,
-                            versionId: event.versionId,
                             cells: ( e.cells.map(cell => cellToDto(cell)))
-                        }
-                        : e);
-                return data;
-            }));
+                        });
+                        break;
+                    }
+                    case NotebookCellsChangeType.ChangeCellContent:
+                        break;
+                    case NotebookCellsChangeType.ChangeDocumentMetadata:
+                        dto.push({
+                            kind: e.kind,
+                            metadata: e.metadata
+                        });
+                    default:
+                        dto.push(e);
+                }
+            });
             this._proxy.$acceptModelChanged(( modelUrl.toString()), {
                 rawEvents: dto,
                 versionId: event.versionId
@@ -134,9 +184,10 @@ class NotebookEditorModelManager extends Disposable {
     }
 }
 class NotebookWorkerClient extends Disposable {
-    constructor(_notebookService) {
+    constructor(_notebookService, _modelService) {
         super();
         this._notebookService = _notebookService;
+        this._modelService = _modelService;
         this._worker = null;
         this._modelManager = null;
     }
@@ -150,7 +201,7 @@ class NotebookWorkerClient extends Disposable {
     }
     _getOrCreateModelManager(proxy) {
         if (!this._modelManager) {
-            this._modelManager = this._register(( new NotebookEditorModelManager(proxy, this._notebookService)));
+            this._modelManager = this._register(( new NotebookEditorModelManager(proxy, this._notebookService, this._modelService)));
         }
         return this._modelManager;
     }

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

@@ -1,5 +1,3 @@
-import { UndoRedoElementType } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
-
 class MoveCellEdit {
     get label() {
         return this.length === 1 ? 'Move Cell' : 'Move Cells';
@@ -12,7 +10,7 @@ class MoveCellEdit {
         this.editingDelegate = editingDelegate;
         this.beforedSelections = beforedSelections;
         this.endSelections = endSelections;
-        this.type = UndoRedoElementType.Resource;
+        this.type = 0 ;
         this.code = 'undoredo.textBufferEdit';
     }
     undo() {
@@ -44,7 +42,7 @@ class SpliceCellsEdit {
         this.editingDelegate = editingDelegate;
         this.beforeHandles = beforeHandles;
         this.endHandles = endHandles;
-        this.type = UndoRedoElementType.Resource;
+        this.type = 0 ;
         this.code = 'undoredo.textBufferEdit';
     }
     undo() {
@@ -71,7 +69,7 @@ class CellMetadataEdit {
         this.oldMetadata = oldMetadata;
         this.newMetadata = newMetadata;
         this.editingDelegate = editingDelegate;
-        this.type = UndoRedoElementType.Resource;
+        this.type = 0 ;
         this.label = 'Update Cell Metadata';
         this.code = 'undoredo.textBufferEdit';
     }

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

@@ -2,8 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { PauseableEmitter, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { NotebookCellTextModel } from 'vscode/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { CellUri, NotebookCellsChangeType, CellEditType, CellKind, diff } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { UndoRedoElementType } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
+import { CellUri, NotebookCellsChangeType, CellKind, diff } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { SpliceCellsEdit, CellMetadataEdit, MoveCellEdit } from './cellEdit.js';
 import { LcsDiff } from 'vscode/vscode/vs/base/common/diff/diff';
@@ -35,7 +34,7 @@ class StackOperation {
         this._operations = [];
         this._beginSelectionState = undefined;
         this._resultSelectionState = undefined;
-        this.type = UndoRedoElementType.Workspace;
+        this.type = 1 ;
         this._beginSelectionState = selectionState;
         this._beginAlternativeVersionId = beginAlternativeVersionId;
         this._resultAlternativeVersionId = beginAlternativeVersionId;
@@ -277,7 +276,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         }
     }
     _bindCellContentHandler(cell, e) {
-        this._increaseVersionId(e === 'content');
+        this._increaseVersionId(e === 'content' || (typeof e === 'object' && e.type === 'model'));
         switch (e) {
             case 'content':
                 this._pauseableEmitter.fire({
@@ -303,6 +302,16 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                     endSelectionState: undefined
                 });
                 break;
+            default:
+                if (typeof e === 'object' && e.type === 'model') {
+                    this._pauseableEmitter.fire({
+                        rawEvents: [{ kind: NotebookCellsChangeType.ChangeCellContent, index: this._getCellIndexByHandle(cell.handle), transient: false }],
+                        versionId: this.versionId,
+                        synchronous: true,
+                        endSelectionState: undefined
+                    });
+                }
+                break;
         }
     }
     _generateAlternativeId() {
@@ -348,7 +357,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         const edits = NotebookTextModel_1.computeEdits(this, cells);
         this.applyEdits([
             ...edits,
-            { editType: CellEditType.DocumentMetadata, metadata }
+            { editType: 5 , metadata }
         ], true, undefined, () => undefined, undefined, false);
     }
     static computeEdits(model, cells) {
@@ -357,7 +366,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         if (commonPrefix > 0) {
             for (let i = 0; i < commonPrefix; i++) {
                 edits.push({
-                    editType: CellEditType.Metadata,
+                    editType: 3 ,
                     index: i,
                     metadata: cells[i].metadata ?? {}
                 }, ...this._computeOutputEdit(i, model.cells[i].outputs, cells[i].outputs));
@@ -368,18 +377,18 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         }
         const commonSuffix = this._commonSuffix(model.cells, model.cells.length - commonPrefix, commonPrefix, cells, cells.length - commonPrefix, commonPrefix);
         if (commonSuffix > 0) {
-            edits.push({ editType: CellEditType.Replace, index: commonPrefix, count: model.cells.length - commonPrefix - commonSuffix, cells: cells.slice(commonPrefix, cells.length - commonSuffix) });
+            edits.push({ editType: 1 , index: commonPrefix, count: model.cells.length - commonPrefix - commonSuffix, cells: cells.slice(commonPrefix, cells.length - commonSuffix) });
         }
         else if (commonPrefix > 0) {
-            edits.push({ editType: CellEditType.Replace, index: commonPrefix, count: model.cells.length - commonPrefix, cells: cells.slice(commonPrefix) });
+            edits.push({ editType: 1 , index: commonPrefix, count: model.cells.length - commonPrefix, cells: cells.slice(commonPrefix) });
         }
         else {
-            edits.push({ editType: CellEditType.Replace, index: 0, count: model.cells.length, cells });
+            edits.push({ editType: 1 , index: 0, count: model.cells.length, cells });
         }
         if (commonSuffix > 0) {
             for (let i = commonSuffix; i > 0; i--) {
                 edits.push({
-                    editType: CellEditType.Metadata,
+                    editType: 3 ,
                     index: model.cells.length - i,
                     metadata: cells[cells.length - i].metadata ?? {}
                 }, ...this._computeOutputEdit(model.cells.length - i, model.cells[model.cells.length - i].outputs, cells[cells.length - i].outputs));
@@ -391,7 +400,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         if (a.length !== b.length) {
             return [
                 {
-                    editType: CellEditType.Output,
+                    editType: 2 ,
                     index: index,
                     outputs: b,
                     append: false
@@ -403,7 +412,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         }
         return ( b.map((output, i) => {
             return {
-                editType: CellEditType.OutputItems,
+                editType: 7 ,
                 outputId: a[i].outputId,
                 items: output.outputs,
                 append: false
@@ -462,15 +471,15 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                     return null;
                 }
             }
-            else if (edit.editType !== CellEditType.DocumentMetadata) {
+            else if (edit.editType !== 5 ) {
                 throw ( new Error('Invalid cell edit'));
             }
             return {
                 edit,
                 cellIndex,
-                end: (edit.editType === CellEditType.DocumentMetadata)
+                end: ((edit.editType === 5) )
                     ? undefined
-                    : (edit.editType === CellEditType.Replace ? edit.index + edit.count : cellIndex),
+                    : (edit.editType === 1  ? edit.index + edit.count : cellIndex),
                 originalIndex: index
             };
         })).filter(isDefined);
@@ -502,7 +511,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             const replaceEdits = [];
             const otherEdits = [];
             editsOnSameIndex.forEach(edit => {
-                if (edit.edit.editType === CellEditType.Replace) {
+                if (edit.edit.editType === 1 ) {
                     replaceEdits.push(edit);
                 }
                 else {
@@ -514,10 +523,10 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         const flattenEdits = edits.flat();
         for (const { edit, cellIndex } of flattenEdits) {
             switch (edit.editType) {
-                case CellEditType.Replace:
+                case 1 :
                     this._replaceCells(edit.index, edit.count, edit.cells, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case CellEditType.Output: {
+                case 2 : {
                     this._assertIndex(cellIndex);
                     const cell = this._cells[cellIndex];
                     if (edit.append) {
@@ -528,7 +537,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                     }
                     break;
                 }
-                case CellEditType.OutputItems:
+                case 7 :
                     {
                         this._assertIndex(cellIndex);
                         const cell = this._cells[cellIndex];
@@ -540,26 +549,26 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                         }
                     }
                     break;
-                case CellEditType.Metadata:
+                case 3 :
                     this._assertIndex(edit.index);
                     this._changeCellMetadata(this._cells[edit.index], edit.metadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case CellEditType.PartialMetadata:
+                case 8 :
                     this._assertIndex(cellIndex);
                     this._changeCellMetadataPartial(this._cells[cellIndex], edit.metadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case CellEditType.PartialInternalMetadata:
+                case 9 :
                     this._assertIndex(cellIndex);
                     this._changeCellInternalMetadataPartial(this._cells[cellIndex], edit.internalMetadata);
                     break;
-                case CellEditType.CellLanguage:
+                case 4 :
                     this._assertIndex(edit.index);
                     this._changeCellLanguage(this._cells[edit.index], edit.language, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case CellEditType.DocumentMetadata:
+                case 5 :
                     this._updateNotebookCellMetadata(edit.metadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case CellEditType.Move:
+                case 6 :
                     this._moveCellToIdx(edit.index, edit.length, edit.newIdx, synchronous, computeUndoRedo, beginSelectionState, undefined, undoRedoGroup);
                     break;
             }
@@ -570,17 +579,17 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         rawEdits.forEach(edit => {
             if (mergedEdits.length) {
                 const last = mergedEdits[mergedEdits.length - 1];
-                if (last.edit.editType === CellEditType.Output
+                if (last.edit.editType === 2
                     && last.edit.append
-                    && edit.edit.editType === CellEditType.Output
+                    && edit.edit.editType === 2
                     && edit.edit.append
                     && last.cellIndex === edit.cellIndex) {
                     last.edit.outputs = [...last.edit.outputs, ...edit.edit.outputs];
                 }
-                else if (last.edit.editType === CellEditType.Output
+                else if (last.edit.editType === 2
                     && !last.edit.append
                     && last.edit.outputs.length === 0
-                    && edit.edit.editType === CellEditType.Output
+                    && edit.edit.editType === 2
                     && edit.edit.append
                     && last.cellIndex === edit.cellIndex) {
                     last.edit.append = false;
@@ -693,7 +702,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 const that = this;
                 this._operationManager.pushEditOperation(new (class {
                     constructor() {
-                        this.type = UndoRedoElementType.Resource;
+                        this.type = 0 ;
                         this.label = 'Update Cell Metadata';
                         this.code = 'undoredo.textBufferEdit';
                     }
@@ -884,7 +893,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             const that = this;
             this._operationManager.pushEditOperation(new (class {
                 constructor() {
-                    this.type = UndoRedoElementType.Resource;
+                    this.type = 0 ;
                     this.label = 'Update Cell Language';
                     this.code = 'undoredo.textBufferEdit';
                 }

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

@@ -46,14 +46,14 @@ let NotebookModelReferenceCollection = class NotebookModelReferenceCollection ex
     isDirty(resource) {
         return this._dirtyStates.get(resource) ?? false;
     }
-    async createReferencedObject(key, viewType, hasAssociatedFilePath, limits, isScratchpad) {
+    async createReferencedObject(key, notebookType, hasAssociatedFilePath, limits, isScratchpad, viewType) {
         this.modelsToDispose.delete(key);
         const uri = ( URI.parse(key));
-        const workingCopyTypeId = NotebookWorkingCopyTypeIdentifier.create(viewType);
+        const workingCopyTypeId = NotebookWorkingCopyTypeIdentifier.create(notebookType, viewType);
         let workingCopyManager = this._workingCopyManagers.get(workingCopyTypeId);
         if (!workingCopyManager) {
             const factory = ( new NotebookFileWorkingCopyModelFactory(
-                viewType,
+                notebookType,
                 this._notebookService,
                 this._configurationService,
                 this._telemetryService,
@@ -62,15 +62,15 @@ let NotebookModelReferenceCollection = class NotebookModelReferenceCollection ex
             workingCopyManager = this._instantiationService.createInstance(FileWorkingCopyManager, workingCopyTypeId, factory, factory);
             this._workingCopyManagers.set(workingCopyTypeId, workingCopyManager);
         }
-        const isScratchpadView = isScratchpad || (viewType === 'interactive' && this._configurationService.getValue(NotebookSetting.InteractiveWindowPromptToSave) !== true);
-        const model = this._instantiationService.createInstance(SimpleNotebookEditorModel, uri, hasAssociatedFilePath, viewType, workingCopyManager, isScratchpadView);
+        const isScratchpadView = isScratchpad || (notebookType === 'interactive' && this._configurationService.getValue(NotebookSetting.InteractiveWindowPromptToSave) !== true);
+        const model = this._instantiationService.createInstance(SimpleNotebookEditorModel, uri, hasAssociatedFilePath, notebookType, workingCopyManager, isScratchpadView);
         const result = await model.load({ limits });
         let onDirtyAutoReference;
         this._modelListener.set(result, combinedDisposable(result.onDidSave(() => this._onDidSaveNotebook.fire(result.resource)), result.onDidChangeDirty(() => {
             const isDirty = result.isDirty();
             this._dirtyStates.set(result.resource, isDirty);
             if (isDirty && !onDirtyAutoReference) {
-                onDirtyAutoReference = this.acquire(key, viewType);
+                onDirtyAutoReference = this.acquire(key, notebookType);
             }
             else if (onDirtyAutoReference) {
                 onDirtyAutoReference.dispose();
@@ -201,7 +201,7 @@ let NotebookModelResolverServiceImpl = class NotebookModelResolverServiceImpl {
             }
         }
         const validated = await this.validateResourceViewType(resource, viewType);
-        const reference = this._data.acquire(( validated.resource.toString()), validated.viewType, hasAssociatedFilePath, options?.limits, options?.scratchpad);
+        const reference = this._data.acquire(( validated.resource.toString()), validated.viewType, hasAssociatedFilePath, options?.limits, options?.scratchpad, options?.viewType);
         try {
             const model = await reference.object;
             return {