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

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

@@ -1,7 +1,6 @@
 import { parse } from 'vscode/vscode/vs/base/common/glob';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
-import { RendererMessagingSpec, NotebookRendererMatch } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
 class DependencyList {
     constructor(value) {
@@ -35,32 +34,32 @@ class NotebookOutputRendererInfo {
         this.mimeTypeGlobs = ( this.mimeTypes.map(pattern => parse(pattern)));
         this.hardDependencies = ( new DependencyList(descriptor.dependencies ?? Iterable.empty()));
         this.optionalDependencies = ( new DependencyList(descriptor.optionalDependencies ?? Iterable.empty()));
-        this.messaging = descriptor.requiresMessaging ?? RendererMessagingSpec.Never;
+        this.messaging = descriptor.requiresMessaging ?? "never" ;
     }
     matchesWithoutKernel(mimeType) {
         if (!this.matchesMimeTypeOnly(mimeType)) {
-            return NotebookRendererMatch.Never;
+            return 3 ;
         }
         if (this.hardDependencies.defined) {
-            return NotebookRendererMatch.WithHardKernelDependency;
+            return 0 ;
         }
         if (this.optionalDependencies.defined) {
-            return NotebookRendererMatch.WithOptionalKernelDependency;
+            return 1 ;
         }
-        return NotebookRendererMatch.Pure;
+        return 2 ;
     }
     matches(mimeType, kernelProvides) {
         if (!this.matchesMimeTypeOnly(mimeType)) {
-            return NotebookRendererMatch.Never;
+            return 3 ;
         }
         if (this.hardDependencies.defined) {
             return this.hardDependencies.matches(kernelProvides)
-                ? NotebookRendererMatch.WithHardKernelDependency
-                : NotebookRendererMatch.Never;
+                ? 0
+                : 3 ;
         }
         return this.optionalDependencies.matches(kernelProvides)
-            ? NotebookRendererMatch.WithOptionalKernelDependency
-            : NotebookRendererMatch.Pure;
+            ? 1
+            : 2 ;
     }
     matchesMimeTypeOnly(mimeType) {
         if (this.entrypoint.extends) {

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

@@ -1,11 +1,11 @@
 import { LcsDiff } from 'vscode/vscode/vs/base/common/diff/diff';
 import { numberHash, doHash, hash } from 'vscode/vscode/vs/base/common/hash';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { DefaultEndOfLine, EndOfLinePreference } from 'vscode/vscode/vs/editor/common/model';
 import { PieceTreeTextBufferBuilder } from 'vscode/vscode/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
 import { NotebookCellsChangeType, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { SearchParams } from 'vscode/vscode/vs/editor/common/model/textModelSearch';
+import { MirrorModel } from 'vscode/vscode/vs/editor/common/services/textModelSync/textModelSync.impl';
 
 function bufferHash(buffer) {
     let initialHashVal = numberHash(104579, 0);
@@ -15,45 +15,28 @@ function bufferHash(buffer) {
     return initialHashVal;
 }
 class MirrorCell {
-    get textBuffer() {
-        if (this._textBuffer) {
-            return this._textBuffer;
-        }
-        const builder = ( new PieceTreeTextBufferBuilder());
-        builder.acceptChunk(Array.isArray(this._source) ? this._source.join('\n') : this._source);
-        const bufferFactory = builder.finish(true);
-        this._textBuffer = bufferFactory.create(DefaultEndOfLine.LF).textBuffer;
-        return this._textBuffer;
-    }
-    primaryKey() {
-        if (this._primaryKey === undefined) {
-            this._primaryKey = hash(this.getValue());
-        }
-        return this._primaryKey;
+    get eol() {
+        return this._eol === '\r\n' ? 2  : 1 ;
     }
-    constructor(handle, _source, language, cellKind, outputs, metadata, internalMetadata) {
+    constructor(handle, uri, source, _eol, versionId, language, cellKind, outputs, metadata, internalMetadata) {
         this.handle = handle;
-        this._source = _source;
+        this._eol = _eol;
         this.language = language;
         this.cellKind = cellKind;
         this.outputs = outputs;
         this.metadata = metadata;
         this.internalMetadata = internalMetadata;
-        this._primaryKey = null;
         this._hash = null;
+        this.textModel = ( new MirrorModel(uri, source, _eol, versionId));
     }
-    getFullModelRange() {
-        const lineCount = this.textBuffer.getLineCount();
-        return ( new Range(1, 1, lineCount, this.textBuffer.getLineLength(lineCount) + 1));
+    onEvents(e) {
+        this.textModel.onEvents(e);
+        this._hash = null;
     }
     getValue() {
-        const fullRange = this.getFullModelRange();
-        return this.textBuffer.getValueInRange(fullRange, EndOfLinePreference.LF);
+        return this.textModel.getValue();
     }
     getComparisonValue() {
-        if (this._primaryKey !== null) {
-            return this._primaryKey;
-        }
         this._hash = hash([hash(this.language), hash(this.getValue()), this.metadata, this.internalMetadata, ( this.outputs.map(op => ({
                 outputs: ( op.outputs.map(output => ({
                     mime: output.mime,
@@ -63,13 +46,6 @@ class MirrorCell {
             })))]);
         return this._hash;
     }
-    getHashValue() {
-        if (this._hash !== null) {
-            return this._hash;
-        }
-        this._hash = hash([hash(this.getValue()), this.language, this.metadata, this.internalMetadata]);
-        return this._hash;
-    }
 }
 class MirrorNotebookDocument {
     constructor(uri, cells, metadata) {
@@ -105,6 +81,9 @@ class MirrorNotebookDocument {
                 const cell = this.cells[e.index];
                 cell.internalMetadata = e.internalMetadata;
             }
+            else if (e.kind === NotebookCellsChangeType.ChangeDocumentMetadata) {
+                this.metadata = e.metadata;
+            }
         });
     }
     _assertIndex(index) {
@@ -116,14 +95,7 @@ class MirrorNotebookDocument {
         splices.reverse().forEach(splice => {
             const cellDtos = splice[2];
             const newCells = ( cellDtos.map(cell => {
-                return ( new MirrorCell(
-                    cell.handle,
-                    cell.source,
-                    cell.language,
-                    cell.cellKind,
-                    cell.outputs,
-                    cell.metadata
-                ));
+                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);
         });
@@ -152,20 +124,17 @@ class NotebookEditorSimpleWorker {
     }
     dispose() {
     }
-    $acceptNewModel(uri, data) {
-        this._models[uri] = ( new MirrorNotebookDocument(( URI.parse(uri)), ( data.cells.map(dto => ( new MirrorCell(
-            dto.handle,
-            dto.source,
-            dto.language,
-            dto.cellKind,
-            dto.outputs,
-            dto.metadata
-        )))), data.metadata));
+    $acceptNewModel(uri, metadata, 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)))), metadata));
     }
     $acceptModelChanged(strURL, event) {
         const model = this._models[strURL];
         model?.acceptModelChanged(event);
     }
+    $acceptCellModelChanged(strURL, handle, event) {
+        const model = this._models[strURL];
+        model.cells.find(cell => cell.handle === handle)?.onEvents(event);
+    }
     $acceptRemovedModel(strURL) {
         if (!this._models[strURL]) {
             return;
@@ -178,6 +147,7 @@ class NotebookEditorSimpleWorker {
         const diff = ( new LcsDiff(( new CellSequence(original)), ( new CellSequence(modified))));
         const diffResult = diff.ComputeDiff(false);
         return {
+            metadataChanged: JSON.stringify(original.metadata) !== JSON.stringify(modified.metadata),
             cellsDiff: diffResult,
         };
     }
@@ -192,15 +162,19 @@ class NotebookEditorSimpleWorker {
             if (cell.language !== 'python') {
                 continue;
             }
-            const lineCount = cell.textBuffer.getLineCount();
-            const maxLineCount = Math.min(lineCount, 20);
-            const range = ( new Range(1, 1, maxLineCount, cell.textBuffer.getLineLength(maxLineCount) + 1));
             const searchParams = ( new SearchParams('import\\s*pandas|from\\s*pandas', true, false, null));
             const searchData = searchParams.parseSearchRequest();
             if (!searchData) {
                 continue;
             }
-            const cellMatches = cell.textBuffer.findMatchesLineByLine(range, searchData, true, 1);
+            const builder = ( new PieceTreeTextBufferBuilder());
+            builder.acceptChunk(cell.getValue());
+            const bufferFactory = builder.finish(true);
+            const textBuffer = bufferFactory.create(cell.eol).textBuffer;
+            const lineCount = textBuffer.getLineCount();
+            const maxLineCount = Math.min(lineCount, 20);
+            const range = ( new Range(1, 1, maxLineCount, textBuffer.getLineLength(maxLineCount) + 1));
+            const cellMatches = textBuffer.findMatchesLineByLine(range, searchData, true, 1);
             if (cellMatches.length > 0) {
                 return true;
             }

package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.js

@@ -12,12 +12,10 @@ import { SaveSourceRegistry } from 'vscode/vscode/vs/workbench/common/editor';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { StoredFileWorkingCopyState } from 'vscode/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
 import { StoredFileWorkingCopyManager } from './storedFileWorkingCopyManager.js';
 import { UntitledFileWorkingCopy } from './untitledFileWorkingCopy.js';
 import { UntitledFileWorkingCopyManager } from './untitledFileWorkingCopyManager.js';
 import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
-import { SnapshotContext } from 'vscode/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
@@ -47,8 +45,8 @@ import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/prog
 var FileWorkingCopyManager_1;
 let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
     static { FileWorkingCopyManager_1 = this; }
-    static { this.FILE_WORKING_COPY_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyCreate.source', ( localize(7841, "File Created"))); }
-    static { this.FILE_WORKING_COPY_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyReplace.source', ( localize(7842, "File Replaced"))); }
+    static { this.FILE_WORKING_COPY_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyCreate.source', ( localize(7876, "File Created"))); }
+    static { this.FILE_WORKING_COPY_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyReplace.source', ( localize(7877, "File Replaced"))); }
     constructor(workingCopyTypeId, storedWorkingCopyModelFactory, untitledWorkingCopyModelFactory, fileService, lifecycleService, labelService, logService, workingCopyFileService, workingCopyBackupService, uriIdentityService, fileDialogService, filesConfigurationService, workingCopyService, notificationService, workingCopyEditorService, editorService, elevatedFileService, pathService, environmentService, dialogService, decorationsService, progressService) {
         super();
         this.workingCopyTypeId = workingCopyTypeId;
@@ -103,14 +101,14 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
             constructor(stored) {
                 super();
                 this.stored = stored;
-                this.label = ( localize(7843, "File Working Copy Decorations"));
+                this.label = ( localize(7878, "File Working Copy Decorations"));
                 this._onDidChange = this._register(( (new Emitter())));
                 this.onDidChange = this._onDidChange.event;
                 this.registerListeners();
             }
             registerListeners() {
                 this._register(this.stored.onDidResolve(workingCopy => {
-                    if (workingCopy.isReadonly() || workingCopy.hasState(StoredFileWorkingCopyState.ORPHAN)) {
+                    if (workingCopy.isReadonly() || workingCopy.hasState(4 )) {
                         this._onDidChange.fire([workingCopy.resource]);
                     }
                 }));
@@ -124,26 +122,26 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
                     return undefined;
                 }
                 const isReadonly = workingCopy.isReadonly();
-                const isOrphaned = workingCopy.hasState(StoredFileWorkingCopyState.ORPHAN);
+                const isOrphaned = workingCopy.hasState(4 );
                 if (isReadonly && isOrphaned) {
                     return {
                         color: listErrorForeground,
                         letter: Codicon.lockSmall,
                         strikethrough: true,
-                        tooltip: ( localize(7844, "Deleted, Read-only")),
+                        tooltip: ( localize(7879, "Deleted, Read-only")),
                     };
                 }
                 else if (isReadonly) {
                     return {
                         letter: Codicon.lockSmall,
-                        tooltip: ( localize(7845, "Read-only")),
+                        tooltip: ( localize(7880, "Read-only")),
                     };
                 }
                 else if (isOrphaned) {
                     return {
                         color: listErrorForeground,
                         strikethrough: true,
-                        tooltip: ( localize(7846, "Deleted")),
+                        tooltip: ( localize(7881, "Deleted")),
                     };
                 }
                 return undefined;
@@ -213,7 +211,7 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         let sourceContents;
         const sourceWorkingCopy = this.get(source);
         if (sourceWorkingCopy?.isResolved()) {
-            sourceContents = await sourceWorkingCopy.model.snapshot(SnapshotContext.Save, CancellationToken.None);
+            sourceContents = await sourceWorkingCopy.model.snapshot(1 , CancellationToken.None);
         }
         else {
             sourceContents = (await this.fileService.readFileStream(source)).value;
@@ -275,17 +273,17 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                7847,
+                7882,
                 "'{0}' already exists. Do you want to replace it?",
                 basename(resource)
             )),
             detail: ( localize(
-                7848,
+                7883,
                 "A file or folder with the name '{0}' already exists in the folder '{1}'. Replacing it will overwrite its current contents.",
                 basename(resource),
                 basename(dirname(resource))
             )),
-            primaryButton: ( localize(7849, "&&Replace"))
+            primaryButton: ( localize(7884, "&&Replace"))
         });
         return confirmed;
     }
@@ -293,12 +291,12 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                7850,
+                7885,
                 "'{0}' is marked as read-only. Do you want to save anyway?",
                 basename(resource)
             )),
-            detail: ( localize(7851, "Paths can be configured as read-only via settings.")),
-            primaryButton: ( localize(7852, "&&Save Anyway"))
+            detail: ( localize(7886, "Paths can be configured as read-only via settings.")),
+            primaryButton: ( localize(7887, "&&Save Anyway"))
         });
         return confirmed;
     }

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.js

@@ -2,10 +2,9 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize } from 'vscode/vscode/vs/nls';
 import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
-import { StoredFileWorkingCopyState, StoredFileWorkingCopy } from 'vscode/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
+import { StoredFileWorkingCopy } from 'vscode/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { ResourceQueue, Promises } from 'vscode/vscode/vs/base/common/async';
-import { FileChangeType, FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -25,7 +24,6 @@ import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/w
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
-import { SnapshotContext } from 'vscode/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 
 let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends BaseFileWorkingCopyManager {
@@ -77,12 +75,12 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
             this._register(this.lifecycleService.onBeforeShutdown(event => event.veto(this.onBeforeShutdownWeb(), 'veto.fileWorkingCopyManager')));
         }
         else {
-            this._register(this.lifecycleService.onWillShutdown(event => event.join(this.onWillShutdownDesktop(), { id: 'join.fileWorkingCopyManager', label: ( localize(10724, "Saving working copies")) })));
+            this._register(this.lifecycleService.onWillShutdown(event => event.join(this.onWillShutdownDesktop(), { id: 'join.fileWorkingCopyManager', label: ( localize(10799, "Saving working copies")) })));
         }
     }
     onBeforeShutdownWeb() {
         if (( (this.workingCopies.some(
-            workingCopy => workingCopy.hasState(StoredFileWorkingCopyState.PENDING_SAVE)
+            workingCopy => workingCopy.hasState(2 )
         )))) {
             return true;
         }
@@ -90,9 +88,9 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
     }
     async onWillShutdownDesktop() {
         let pendingSavedWorkingCopies;
-        while ((pendingSavedWorkingCopies = this.workingCopies.filter(workingCopy => workingCopy.hasState(StoredFileWorkingCopyState.PENDING_SAVE))).length > 0) {
+        while ((pendingSavedWorkingCopies = this.workingCopies.filter(workingCopy => workingCopy.hasState(2 ))).length > 0) {
             await Promises.settled(( (pendingSavedWorkingCopies.map(
-                workingCopy => workingCopy.joinState(StoredFileWorkingCopyState.PENDING_SAVE)
+                workingCopy => workingCopy.joinState(2 )
             ))));
         }
     }
@@ -118,7 +116,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
                 resolveWorkingCopy = schemeOrEvent === workingCopy.resource.scheme;
             }
             else {
-                resolveWorkingCopy = schemeOrEvent.contains(workingCopy.resource, FileChangeType.UPDATED, FileChangeType.ADDED);
+                resolveWorkingCopy = schemeOrEvent.contains(workingCopy.resource, 0 , 1 );
             }
             if (resolveWorkingCopy) {
                 this.queueWorkingCopyReload(workingCopy);
@@ -139,7 +137,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
         }
     }
     onWillRunWorkingCopyFileOperation(e) {
-        if (e.operation === FileOperation.MOVE || e.operation === FileOperation.COPY) {
+        if (e.operation === 2  || e.operation === 3 ) {
             e.waitUntil((async () => {
                 const workingCopiesToRestore = [];
                 for (const { source, target } of e.files) {
@@ -165,7 +163,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
                             workingCopiesToRestore.push({
                                 source: sourceResource,
                                 target: targetResource,
-                                snapshot: sourceWorkingCopy.isDirty() ? await sourceWorkingCopy.model?.snapshot(SnapshotContext.Save, CancellationToken.None) : undefined
+                                snapshot: sourceWorkingCopy.isDirty() ? await sourceWorkingCopy.model?.snapshot(1 , CancellationToken.None) : undefined
                             });
                         }
                     }
@@ -175,7 +173,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
         }
     }
     onDidFailWorkingCopyFileOperation(e) {
-        if ((e.operation === FileOperation.MOVE || e.operation === FileOperation.COPY)) {
+        if (((e.operation === 2  || e.operation === 3) )) {
             const workingCopiesToRestore = this.mapCorrelationIdToWorkingCopiesToRestore.get(e.correlationId);
             if (workingCopiesToRestore) {
                 this.mapCorrelationIdToWorkingCopiesToRestore.delete(e.correlationId);
@@ -189,7 +187,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
     }
     onDidRunWorkingCopyFileOperation(e) {
         switch (e.operation) {
-            case FileOperation.CREATE:
+            case 0 :
                 e.waitUntil((async () => {
                     for (const { target } of e.files) {
                         const workingCopy = this.get(target);
@@ -199,8 +197,8 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
                     }
                 })());
                 break;
-            case FileOperation.MOVE:
-            case FileOperation.COPY:
+            case 2 :
+            case 3 :
                 e.waitUntil((async () => {
                     const workingCopiesToRestore = this.mapCorrelationIdToWorkingCopiesToRestore.get(e.correlationId);
                     if (workingCopiesToRestore) {

package/vscode/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.js

@@ -1,7 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { WorkingCopyCapabilities } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopy';
-import { SnapshotContext } from 'vscode/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
@@ -24,7 +22,7 @@ let UntitledFileWorkingCopy = class UntitledFileWorkingCopy extends Disposable {
         this.saveDelegate = saveDelegate;
         this.workingCopyBackupService = workingCopyBackupService;
         this.logService = logService;
-        this.capabilities = this.isScratchpad ? WorkingCopyCapabilities.Untitled | WorkingCopyCapabilities.Scratchpad : WorkingCopyCapabilities.Untitled;
+        this.capabilities = this.isScratchpad ? 2  | 4  : 2 ;
         this._model = undefined;
         this._onDidChangeContent = this._register(( new Emitter()));
         this.onDidChangeContent = this._onDidChangeContent.event;
@@ -107,7 +105,7 @@ let UntitledFileWorkingCopy = class UntitledFileWorkingCopy extends Disposable {
     async backup(token) {
         let content = undefined;
         if (this.isResolved()) {
-            content = await raceCancellation(this.model.snapshot(SnapshotContext.Backup, token), token);
+            content = await raceCancellation(this.model.snapshot(2 , token), token);
         }
         else if (this.initialContents) {
             content = this.initialContents.value;

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

@@ -1,33 +0,0 @@
-import 'vscode/vscode/vs/base/browser/dom';
-import 'vscode/vscode/vs/base/browser/dompurify/dompurify';
-import 'vscode/vscode/vs/base/common/event';
-import 'vscode/vscode/vs/base/browser/formattedTextRenderer';
-import 'vscode/vscode/vs/base/browser/browser';
-import 'vscode/vscode/vs/base/common/keyCodes';
-import 'vscode/vscode/vs/base/common/keybindings';
-import 'vscode/vscode/vs/base/common/platform';
-import 'vscode/vscode/vs/base/common/themables';
-import 'vscode/vscode/vs/base/common/htmlContent';
-import 'vscode/vscode/vs/base/common/filters';
-import 'vscode/vscode/vs/base/common/strings';
-import 'vscode/vscode/vs/base/common/lifecycle';
-import 'vscode/vscode/vs/base/common/charCode';
-import 'vscode/vscode/vs/base/common/marshallingIds';
-import 'vscode/vscode/vs/base/common/path';
-import 'vscode/vscode/vs/base/common/network';
-import 'vscode/vscode/vs/base/common/resources';
-import 'vscode/vscode/vs/nls';
-import 'vscode/vscode/vs/editor/common/model';
-import 'vscode/vscode/vs/editor/contrib/folding/browser/foldingRanges';
-import 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import 'vscode/vscode/vs/base/common/codicons';
-import 'vscode/vscode/vs/platform/markers/common/markers';
-import 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
-import 'vscode/vscode/vs/editor/common/languages';
-
-var NotebookOutlineConstants;
-( (function(NotebookOutlineConstants) {
-    NotebookOutlineConstants[NotebookOutlineConstants["NonHeaderOutlineLevel"] = 7] = "NonHeaderOutlineLevel";
-})(NotebookOutlineConstants || (NotebookOutlineConstants = {})));
-
-export { NotebookOutlineConstants };