@codingame/monaco-vscode-notebook-service-override 5.2.0 → 6.0.0

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

@@ -2,7 +2,8 @@ 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, CellKind, diff } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+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 { 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';
@@ -32,7 +33,7 @@ class StackOperation {
         this._operations = [];
         this._beginSelectionState = undefined;
         this._resultSelectionState = undefined;
-        this.type = 1 ;
+        this.type = UndoRedoElementType.Workspace;
         this._beginSelectionState = selectionState;
         this._beginAlternativeVersionId = beginAlternativeVersionId;
         this._resultAlternativeVersionId = beginAlternativeVersionId;
@@ -57,31 +58,39 @@ class StackOperation {
     }
     async undo() {
         this._pauseableEmitter.pause();
-        for (let i = this._operations.length - 1; i >= 0; i--) {
-            await this._operations[i].undo();
+        try {
+            for (let i = this._operations.length - 1; i >= 0; i--) {
+                await this._operations[i].undo();
+            }
+            this._postUndoRedo(this._beginAlternativeVersionId);
+            this._pauseableEmitter.fire({
+                rawEvents: [],
+                synchronous: undefined,
+                versionId: this.textModel.versionId,
+                endSelectionState: this._beginSelectionState
+            });
+        }
+        finally {
+            this._pauseableEmitter.resume();
         }
-        this._postUndoRedo(this._beginAlternativeVersionId);
-        this._pauseableEmitter.fire({
-            rawEvents: [],
-            synchronous: undefined,
-            versionId: this.textModel.versionId,
-            endSelectionState: this._beginSelectionState
-        });
-        this._pauseableEmitter.resume();
     }
     async redo() {
         this._pauseableEmitter.pause();
-        for (let i = 0; i < this._operations.length; i++) {
-            await this._operations[i].redo();
+        try {
+            for (let i = 0; i < this._operations.length; i++) {
+                await this._operations[i].redo();
+            }
+            this._postUndoRedo(this._resultAlternativeVersionId);
+            this._pauseableEmitter.fire({
+                rawEvents: [],
+                synchronous: undefined,
+                versionId: this.textModel.versionId,
+                endSelectionState: this._resultSelectionState
+            });
+        }
+        finally {
+            this._pauseableEmitter.resume();
         }
-        this._postUndoRedo(this._resultAlternativeVersionId);
-        this._pauseableEmitter.fire({
-            rawEvents: [],
-            synchronous: undefined,
-            versionId: this.textModel.versionId,
-            endSelectionState: this._resultSelectionState
-        });
-        this._pauseableEmitter.resume();
     }
 }
 class NotebookOperationManager {
@@ -118,6 +127,9 @@ class NotebookOperationManager {
     }
 }
 class NotebookEventEmitter extends PauseableEmitter {
+    get isEmpty() {
+        return this._eventQueue.isEmpty();
+    }
     isDirtyEvent() {
         for (const e of this._eventQueue) {
             for (let i = 0; i < e.rawEvents.length; i++) {
@@ -331,7 +343,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         const edits = NotebookTextModel_1.computeEdits(this, cells);
         this.applyEdits([
             ...edits,
-            { editType: 5 , metadata }
+            { editType: CellEditType.DocumentMetadata, metadata }
         ], true, undefined, () => undefined, undefined, false);
     }
     static computeEdits(model, cells) {
@@ -340,7 +352,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         if (commonPrefix > 0) {
             for (let i = 0; i < commonPrefix; i++) {
                 edits.push({
-                    editType: 3 ,
+                    editType: CellEditType.Metadata,
                     index: i,
                     metadata: cells[i].metadata ?? {}
                 }, ...this._computeOutputEdit(i, model.cells[i].outputs, cells[i].outputs));
@@ -351,18 +363,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: 1 , index: commonPrefix, count: model.cells.length - commonPrefix - commonSuffix, cells: cells.slice(commonPrefix, cells.length - commonSuffix) });
+            edits.push({ editType: CellEditType.Replace, index: commonPrefix, count: model.cells.length - commonPrefix - commonSuffix, cells: cells.slice(commonPrefix, cells.length - commonSuffix) });
         }
         else if (commonPrefix > 0) {
-            edits.push({ editType: 1 , index: commonPrefix, count: model.cells.length - commonPrefix, cells: cells.slice(commonPrefix) });
+            edits.push({ editType: CellEditType.Replace, index: commonPrefix, count: model.cells.length - commonPrefix, cells: cells.slice(commonPrefix) });
         }
         else {
-            edits.push({ editType: 1 , index: 0, count: model.cells.length, cells });
+            edits.push({ editType: CellEditType.Replace, index: 0, count: model.cells.length, cells });
         }
         if (commonSuffix > 0) {
             for (let i = commonSuffix; i > 0; i--) {
                 edits.push({
-                    editType: 3 ,
+                    editType: CellEditType.Metadata,
                     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));
@@ -374,7 +386,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         if (a.length !== b.length) {
             return [
                 {
-                    editType: 2 ,
+                    editType: CellEditType.Output,
                     index: index,
                     outputs: b,
                     append: false
@@ -386,7 +398,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         }
         return ( b.map((output, i) => {
             return {
-                editType: 7 ,
+                editType: CellEditType.OutputItems,
                 outputId: a[i].outputId,
                 items: output.outputs,
                 append: false
@@ -417,10 +429,12 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             return true;
         }
         finally {
-            const endSelections = endSelectionsComputer();
-            this._increaseVersionId(this._operationManager.isUndoStackEmpty() && !this._pauseableEmitter.isDirtyEvent());
-            this._operationManager.pushStackElement(this._alternativeVersionId, endSelections);
-            this._pauseableEmitter.fire({ rawEvents: [], versionId: this.versionId, synchronous: synchronous, endSelectionState: endSelections });
+            if (!this._pauseableEmitter.isEmpty) {
+                const endSelections = endSelectionsComputer();
+                this._increaseVersionId(this._operationManager.isUndoStackEmpty() && !this._pauseableEmitter.isDirtyEvent());
+                this._operationManager.pushStackElement(this._alternativeVersionId, endSelections);
+                this._pauseableEmitter.fire({ rawEvents: [], versionId: this.versionId, synchronous: synchronous, endSelectionState: endSelections });
+            }
             this._pauseableEmitter.resume();
         }
     }
@@ -443,15 +457,15 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                     return null;
                 }
             }
-            else if (edit.editType !== 5 ) {
+            else if (edit.editType !== CellEditType.DocumentMetadata) {
                 throw ( new Error('Invalid cell edit'));
             }
             return {
                 edit,
                 cellIndex,
-                end: ((edit.editType === 5) )
+                end: (edit.editType === CellEditType.DocumentMetadata)
                     ? undefined
-                    : (edit.editType === 1  ? edit.index + edit.count : cellIndex),
+                    : (edit.editType === CellEditType.Replace ? edit.index + edit.count : cellIndex),
                 originalIndex: index
             };
         })).filter(isDefined);
@@ -483,7 +497,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             const replaceEdits = [];
             const otherEdits = [];
             editsOnSameIndex.forEach(edit => {
-                if (edit.edit.editType === 1 ) {
+                if (edit.edit.editType === CellEditType.Replace) {
                     replaceEdits.push(edit);
                 }
                 else {
@@ -495,10 +509,10 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         const flattenEdits = edits.flat();
         for (const { edit, cellIndex } of flattenEdits) {
             switch (edit.editType) {
-                case 1 :
+                case CellEditType.Replace:
                     this._replaceCells(edit.index, edit.count, edit.cells, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case 2 : {
+                case CellEditType.Output: {
                     this._assertIndex(cellIndex);
                     const cell = this._cells[cellIndex];
                     if (edit.append) {
@@ -509,7 +523,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                     }
                     break;
                 }
-                case 7 :
+                case CellEditType.OutputItems:
                     {
                         this._assertIndex(cellIndex);
                         const cell = this._cells[cellIndex];
@@ -521,26 +535,26 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                         }
                     }
                     break;
-                case 3 :
+                case CellEditType.Metadata:
                     this._assertIndex(edit.index);
                     this._changeCellMetadata(this._cells[edit.index], edit.metadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case 8 :
+                case CellEditType.PartialMetadata:
                     this._assertIndex(cellIndex);
                     this._changeCellMetadataPartial(this._cells[cellIndex], edit.metadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case 9 :
+                case CellEditType.PartialInternalMetadata:
                     this._assertIndex(cellIndex);
                     this._changeCellInternalMetadataPartial(this._cells[cellIndex], edit.internalMetadata);
                     break;
-                case 4 :
+                case CellEditType.CellLanguage:
                     this._assertIndex(edit.index);
                     this._changeCellLanguage(this._cells[edit.index], edit.language, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case 5 :
+                case CellEditType.DocumentMetadata:
                     this._updateNotebookCellMetadata(edit.metadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case 6 :
+                case CellEditType.Move:
                     this._moveCellToIdx(edit.index, edit.length, edit.newIdx, synchronous, computeUndoRedo, beginSelectionState, undefined, undoRedoGroup);
                     break;
             }
@@ -551,17 +565,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 === 2
+                if (last.edit.editType === CellEditType.Output
                     && last.edit.append
-                    && edit.edit.editType === 2
+                    && edit.edit.editType === CellEditType.Output
                     && edit.edit.append
                     && last.cellIndex === edit.cellIndex) {
                     last.edit.outputs = [...last.edit.outputs, ...edit.edit.outputs];
                 }
-                else if (last.edit.editType === 2
+                else if (last.edit.editType === CellEditType.Output
                     && !last.edit.append
                     && last.edit.outputs.length === 0
-                    && edit.edit.editType === 2
+                    && edit.edit.editType === CellEditType.Output
                     && edit.edit.append
                     && last.cellIndex === edit.cellIndex) {
                     last.edit.append = false;
@@ -674,7 +688,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 const that = this;
                 this._operationManager.pushEditOperation(new (class {
                     constructor() {
-                        this.type = 0 ;
+                        this.type = UndoRedoElementType.Resource;
                         this.label = 'Update Cell Metadata';
                         this.code = 'undoredo.textBufferEdit';
                     }
@@ -865,7 +879,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             const that = this;
             this._operationManager.pushEditOperation(new (class {
                 constructor() {
-                    this.type = 0 ;
+                    this.type = UndoRedoElementType.Resource;
                     this.label = 'Update Cell Language';
                     this.code = 'undoredo.textBufferEdit';
                 }

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

@@ -16,14 +16,16 @@ import { NotebookProviderInfo } from './notebookProvider.js';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 
 let NotebookModelReferenceCollection = class NotebookModelReferenceCollection extends ReferenceCollection {
-    constructor(_instantiationService, _notebookService, _logService, _configurationService) {
+    constructor(_instantiationService, _notebookService, _logService, _configurationService, _telemetryService) {
         super();
         this._instantiationService = _instantiationService;
         this._notebookService = _notebookService;
         this._logService = _logService;
         this._configurationService = _configurationService;
+        this._telemetryService = _telemetryService;
         this._disposables = ( new DisposableStore());
         this._workingCopyManagers = ( new Map());
         this._modelListener = ( new Map());
@@ -50,7 +52,12 @@ let NotebookModelReferenceCollection = class NotebookModelReferenceCollection ex
         const workingCopyTypeId = NotebookWorkingCopyTypeIdentifier.create(viewType);
         let workingCopyManager = this._workingCopyManagers.get(workingCopyTypeId);
         if (!workingCopyManager) {
-            const factory = ( new NotebookFileWorkingCopyModelFactory(viewType, this._notebookService, this._configurationService));
+            const factory = ( new NotebookFileWorkingCopyModelFactory(
+                viewType,
+                this._notebookService,
+                this._configurationService,
+                this._telemetryService
+            ));
             workingCopyManager = this._instantiationService.createInstance(FileWorkingCopyManager, workingCopyTypeId, factory, factory);
             this._workingCopyManagers.set(workingCopyTypeId, workingCopyManager);
         }
@@ -103,7 +110,8 @@ NotebookModelReferenceCollection = ( __decorate([
     ( __param(0, IInstantiationService)),
     ( __param(1, INotebookService)),
     ( __param(2, ILogService)),
-    ( __param(3, IConfigurationService))
+    ( __param(3, IConfigurationService)),
+    ( __param(4, ITelemetryService))
 ], NotebookModelReferenceCollection));
 let NotebookModelResolverServiceImpl = class NotebookModelResolverServiceImpl {
     constructor(instantiationService, _notebookService, _extensionService, _uriIdentService) {

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

@@ -1,6 +1,7 @@
 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) {
@@ -34,32 +35,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 ?? "never" ;
+        this.messaging = descriptor.requiresMessaging ?? RendererMessagingSpec.Never;
     }
     matchesWithoutKernel(mimeType) {
         if (!this.matchesMimeTypeOnly(mimeType)) {
-            return 3 ;
+            return NotebookRendererMatch.Never;
         }
         if (this.hardDependencies.defined) {
-            return 0 ;
+            return NotebookRendererMatch.WithHardKernelDependency;
         }
         if (this.optionalDependencies.defined) {
-            return 1 ;
+            return NotebookRendererMatch.WithOptionalKernelDependency;
         }
-        return 2 ;
+        return NotebookRendererMatch.Pure;
     }
     matches(mimeType, kernelProvides) {
         if (!this.matchesMimeTypeOnly(mimeType)) {
-            return 3 ;
+            return NotebookRendererMatch.Never;
         }
         if (this.hardDependencies.defined) {
             return this.hardDependencies.matches(kernelProvides)
-                ? 0
-                : 3 ;
+                ? NotebookRendererMatch.WithHardKernelDependency
+                : NotebookRendererMatch.Never;
         }
         return this.optionalDependencies.matches(kernelProvides)
-            ? 1
-            : 2 ;
+            ? NotebookRendererMatch.WithOptionalKernelDependency
+            : NotebookRendererMatch.Pure;
     }
     matchesMimeTypeOnly(mimeType) {
         if (this.entrypoint.extends) {

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

@@ -1,6 +1,7 @@
 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';
@@ -21,7 +22,7 @@ class MirrorCell {
         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(1 ).textBuffer;
+        this._textBuffer = bufferFactory.create(DefaultEndOfLine.LF).textBuffer;
         return this._textBuffer;
     }
     primaryKey() {
@@ -47,7 +48,7 @@ class MirrorCell {
     }
     getValue() {
         const fullRange = this.getFullModelRange();
-        return this.textBuffer.getValueInRange(fullRange, 1 );
+        return this.textBuffer.getValueInRange(fullRange, EndOfLinePreference.LF);
     }
     getComparisonValue() {
         if (this._primaryKey !== null) {

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

@@ -12,10 +12,12 @@ 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';
@@ -107,7 +109,7 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
             }
             registerListeners() {
                 this._register(this.stored.onDidResolve(workingCopy => {
-                    if (workingCopy.isReadonly() || workingCopy.hasState(4 )) {
+                    if (workingCopy.isReadonly() || workingCopy.hasState(StoredFileWorkingCopyState.ORPHAN)) {
                         this._onDidChange.fire([workingCopy.resource]);
                     }
                 }));
@@ -121,7 +123,7 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
                     return undefined;
                 }
                 const isReadonly = workingCopy.isReadonly();
-                const isOrphaned = workingCopy.hasState(4 );
+                const isOrphaned = workingCopy.hasState(StoredFileWorkingCopyState.ORPHAN);
                 if (isReadonly && isOrphaned) {
                     return {
                         color: listErrorForeground,
@@ -210,7 +212,7 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         let sourceContents;
         const sourceWorkingCopy = this.get(source);
         if (sourceWorkingCopy?.isResolved()) {
-            sourceContents = await sourceWorkingCopy.model.snapshot(1 , CancellationToken.None);
+            sourceContents = await sourceWorkingCopy.model.snapshot(SnapshotContext.Save, CancellationToken.None);
         }
         else {
             sourceContents = (await this.fileService.readFileStream(source)).value;

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

@@ -2,9 +2,10 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } 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 { StoredFileWorkingCopy } from 'vscode/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
+import { StoredFileWorkingCopyState, 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';
@@ -24,6 +25,7 @@ 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';
 
 const _moduleId = "vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager";
 let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends BaseFileWorkingCopyManager {
@@ -79,7 +81,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
     }
     onBeforeShutdownWeb() {
         if (( (this.workingCopies.some(
-            workingCopy => workingCopy.hasState(2 )
+            workingCopy => workingCopy.hasState(StoredFileWorkingCopyState.PENDING_SAVE)
         )))) {
             return true;
         }
@@ -87,9 +89,9 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
     }
     async onWillShutdownDesktop() {
         let pendingSavedWorkingCopies;
-        while ((pendingSavedWorkingCopies = this.workingCopies.filter(workingCopy => workingCopy.hasState(2 ))).length > 0) {
+        while ((pendingSavedWorkingCopies = this.workingCopies.filter(workingCopy => workingCopy.hasState(StoredFileWorkingCopyState.PENDING_SAVE))).length > 0) {
             await Promises.settled(( (pendingSavedWorkingCopies.map(
-                workingCopy => workingCopy.joinState(2 )
+                workingCopy => workingCopy.joinState(StoredFileWorkingCopyState.PENDING_SAVE)
             ))));
         }
     }
@@ -115,7 +117,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
                 resolveWorkingCopy = schemeOrEvent === workingCopy.resource.scheme;
             }
             else {
-                resolveWorkingCopy = schemeOrEvent.contains(workingCopy.resource, 0 , 1 );
+                resolveWorkingCopy = schemeOrEvent.contains(workingCopy.resource, FileChangeType.UPDATED, FileChangeType.ADDED);
             }
             if (resolveWorkingCopy) {
                 this.queueWorkingCopyReload(workingCopy);
@@ -136,7 +138,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
         }
     }
     onWillRunWorkingCopyFileOperation(e) {
-        if (e.operation === 2  || e.operation === 3 ) {
+        if (e.operation === FileOperation.MOVE || e.operation === FileOperation.COPY) {
             e.waitUntil((async () => {
                 const workingCopiesToRestore = [];
                 for (const { source, target } of e.files) {
@@ -162,7 +164,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
                             workingCopiesToRestore.push({
                                 source: sourceResource,
                                 target: targetResource,
-                                snapshot: sourceWorkingCopy.isDirty() ? await sourceWorkingCopy.model?.snapshot(1 , CancellationToken.None) : undefined
+                                snapshot: sourceWorkingCopy.isDirty() ? await sourceWorkingCopy.model?.snapshot(SnapshotContext.Save, CancellationToken.None) : undefined
                             });
                         }
                     }
@@ -172,7 +174,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
         }
     }
     onDidFailWorkingCopyFileOperation(e) {
-        if (((e.operation === 2  || e.operation === 3) )) {
+        if ((e.operation === FileOperation.MOVE || e.operation === FileOperation.COPY)) {
             const workingCopiesToRestore = this.mapCorrelationIdToWorkingCopiesToRestore.get(e.correlationId);
             if (workingCopiesToRestore) {
                 this.mapCorrelationIdToWorkingCopiesToRestore.delete(e.correlationId);
@@ -186,7 +188,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
     }
     onDidRunWorkingCopyFileOperation(e) {
         switch (e.operation) {
-            case 0 :
+            case FileOperation.CREATE:
                 e.waitUntil((async () => {
                     for (const { target } of e.files) {
                         const workingCopy = this.get(target);
@@ -196,14 +198,15 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
                     }
                 })());
                 break;
-            case 2 :
-            case 3 :
+            case FileOperation.MOVE:
+            case FileOperation.COPY:
                 e.waitUntil((async () => {
                     const workingCopiesToRestore = this.mapCorrelationIdToWorkingCopiesToRestore.get(e.correlationId);
                     if (workingCopiesToRestore) {
                         this.mapCorrelationIdToWorkingCopiesToRestore.delete(e.correlationId);
                         await Promises.settled(( (workingCopiesToRestore.map(async (workingCopyToRestore) => {
-                            await this.resolve(workingCopyToRestore.target, {
+                            const target = this.uriIdentityService.asCanonicalUri(workingCopyToRestore.target);
+                            await this.resolve(target, {
                                 reload: { async: false },
                                 contents: workingCopyToRestore.snapshot
                             });

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

@@ -1,5 +1,7 @@
 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';
@@ -22,7 +24,7 @@ let UntitledFileWorkingCopy = class UntitledFileWorkingCopy extends Disposable {
         this.saveDelegate = saveDelegate;
         this.workingCopyBackupService = workingCopyBackupService;
         this.logService = logService;
-        this.capabilities = this.isScratchpad ? 2  | 4  : 2 ;
+        this.capabilities = this.isScratchpad ? WorkingCopyCapabilities.Untitled | WorkingCopyCapabilities.Scratchpad : WorkingCopyCapabilities.Untitled;
         this._model = undefined;
         this._onDidChangeContent = this._register(( new Emitter()));
         this.onDidChangeContent = this._onDidChangeContent.event;
@@ -105,7 +107,7 @@ let UntitledFileWorkingCopy = class UntitledFileWorkingCopy extends Disposable {
     async backup(token) {
         let content = undefined;
         if (this.isResolved()) {
-            content = await raceCancellation(this.model.snapshot(2 , token), token);
+            content = await raceCancellation(this.model.snapshot(SnapshotContext.Backup, token), token);
         }
         else if (this.initialContents) {
             content = this.initialContents.value;