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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-files-service-override",
-  "version": "5.2.0",
+  "version": "6.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.2.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0"
   }
 }

package/vscode/src/vs/platform/files/browser/indexedDBFileSystemProvider.js

@@ -6,7 +6,7 @@ import { ExtUri } from 'vscode/vscode/vs/base/common/resources';
 import { isString } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { createFileSystemProviderError, FileSystemProviderErrorCode, FileType, FileSystemProviderError } from 'vscode/vscode/vs/platform/files/common/files';
+import { createFileSystemProviderError, FileSystemProviderErrorCode, FileType, FileSystemProviderCapabilities, FileChangeType, FileSystemProviderError } from 'vscode/vscode/vs/platform/files/common/files';
 import { DBClosedError } from 'vscode/vscode/vs/base/browser/indexedDB';
 import { BroadcastDataChannel } from 'vscode/vscode/vs/base/browser/broadcast';
 
@@ -137,8 +137,8 @@ class IndexedDBFileSystemProvider extends Disposable {
         this.scheme = scheme;
         this.indexedDB = indexedDB;
         this.store = store;
-        this.capabilities = 2
-            | 1024 ;
+        this.capabilities = FileSystemProviderCapabilities.FileReadWrite
+            | FileSystemProviderCapabilities.PathCaseSensitive;
         this.onDidChangeCapabilities = Event.None;
         this.extUri = ( (new ExtUri(() => false))) ;
         this._onDidChangeFile = this._register(( (new Emitter())));
@@ -306,7 +306,7 @@ class IndexedDBFileSystemProvider extends Disposable {
         (await this.getFiletree()).delete(resource.path);
         toDelete.forEach(key => this.mtimes.delete(key));
         this.triggerChanges(( (toDelete.map(
-            path => ({ resource: resource.with({ path }), type: 2  })
+            path => ({ resource: resource.with({ path }), type: FileChangeType.DELETED })
         ))));
     }
     async tree(resource) {
@@ -355,7 +355,7 @@ class IndexedDBFileSystemProvider extends Disposable {
             fileTree.add(resource.path, { type: 'file', size: content.byteLength });
             this.mtimes.set(( (resource.toString())), Date.now());
         }
-        this.triggerChanges(( (files.map(([resource]) => ({ resource, type: 0  })))));
+        this.triggerChanges(( (files.map(([resource]) => ({ resource, type: FileChangeType.UPDATED })))));
     }
     async writeMany() {
         if (this.fileWriteBatch.length) {

package/vscode/src/vs/platform/files/common/fileService.js

@@ -13,7 +13,7 @@ import { mark } from 'vscode/vscode/vs/base/common/performance';
 import { isAbsolutePath, extUri, extUriIgnorePathCase } from 'vscode/vscode/vs/base/common/resources';
 import { isReadableStream, peekStream, peekReadable, consumeStream, transform, newWriteableStream, isReadableBufferedStream, listenStream } from 'vscode/vscode/vs/base/common/stream';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { FileType, toFileSystemProviderErrorCode, FileSystemProviderErrorCode, FileChangesEvent, FileOperationError, hasOpenReadWriteCloseCapability, hasReadWriteCapability, hasFileReadStreamCapability, ensureFileSystemProviderError, FilePermission, etag, FileOperationEvent, hasFileAtomicWriteCapability, toFileOperationResult, ETAG_DISABLED, hasFileAtomicReadCapability, NotModifiedSinceFileOperationError, TooLargeFileOperationError, hasFileFolderCopyCapability, hasFileAtomicDeleteCapability, hasFileCloneCapability } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileType, toFileSystemProviderErrorCode, FileSystemProviderErrorCode, FileChangesEvent, FileOperationError, FileOperationResult, hasOpenReadWriteCloseCapability, hasReadWriteCapability, hasFileReadStreamCapability, ensureFileSystemProviderError, FilePermission, FileSystemProviderCapabilities, etag, FileOperationEvent, FileOperation, hasFileAtomicWriteCapability, toFileOperationResult, ETAG_DISABLED, hasFileAtomicReadCapability, NotModifiedSinceFileOperationError, TooLargeFileOperationError, hasFileFolderCopyCapability, hasFileAtomicDeleteCapability, hasFileCloneCapability } from 'vscode/vscode/vs/platform/files/common/files';
 import { readFileIntoStream } from './io.js';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { ErrorNoTelemetry } from 'vscode/vscode/vs/base/common/errors';
@@ -155,7 +155,7 @@ let FileService = class FileService extends Disposable {
                 1,
                 "Unable to resolve filesystem provider with relative file path '{0}'",
                 this.resourceForError(resource)
-            ), 8 )));
+            ), FileOperationResult.FILE_INVALID_PATH)));
         }
         await this.activateProvider(resource.scheme);
         const provider = this.provider.get(resource.scheme);
@@ -200,7 +200,7 @@ let FileService = class FileService extends Disposable {
                     3,
                     "Unable to resolve nonexistent file '{0}'",
                     this.resourceForError(resource)
-                ), 1 )));
+                ), FileOperationResult.FILE_NOT_FOUND)));
             }
             throw ensureFileSystemProviderError(error);
         }
@@ -241,7 +241,7 @@ let FileService = class FileService extends Disposable {
             mtime: stat.mtime,
             ctime: stat.ctime,
             size: stat.size,
-            readonly: Boolean((stat.permissions ?? 0) & FilePermission.Readonly) || Boolean(provider.capabilities & 2048 ),
+            readonly: Boolean((stat.permissions ?? 0) & FilePermission.Readonly) || Boolean(provider.capabilities & FileSystemProviderCapabilities.Readonly),
             locked: Boolean((stat.permissions ?? 0) & FilePermission.Locked),
             etag: etag({ mtime: stat.mtime, size: stat.size }),
             children: undefined
@@ -312,13 +312,13 @@ let FileService = class FileService extends Disposable {
                 4,
                 "Unable to create file '{0}' that already exists when overwrite flag is not set",
                 this.resourceForError(resource)
-            ), 3 , options)));
+            ), FileOperationResult.FILE_MODIFIED_SINCE, options)));
         }
     }
     async createFile(resource, bufferOrReadableOrStream = VSBuffer.fromString(''), options) {
         await this.doValidateCreateFile(resource, options);
         const fileStat = await this.writeFile(resource, bufferOrReadableOrStream);
-        this._onDidRunOperation.fire(( (new FileOperationEvent(resource, 0 , fileStat))));
+        this._onDidRunOperation.fire(( (new FileOperationEvent(resource, FileOperation.CREATE, fileStat))));
         return fileStat;
     }
     async writeFile(resource, bufferOrReadableOrStream, options) {
@@ -363,7 +363,7 @@ let FileService = class FileService extends Disposable {
             else {
                 await this.doWriteBuffered(provider, resource, writeFileOptions, bufferOrReadableOrStreamOrBufferedStream instanceof VSBuffer ? bufferToReadable(bufferOrReadableOrStreamOrBufferedStream) : bufferOrReadableOrStreamOrBufferedStream);
             }
-            this._onDidRunOperation.fire(( (new FileOperationEvent(resource, 4 ))));
+            this._onDidRunOperation.fire(( (new FileOperationEvent(resource, FileOperation.WRITE))));
         }
         catch (error) {
             throw ( (new FileOperationError(localizeWithPath(
@@ -378,7 +378,7 @@ let FileService = class FileService extends Disposable {
     }
     async validateWriteFile(provider, resource, options) {
         const unlock = !!options?.unlock;
-        if (unlock && !((provider.capabilities & 8192) )) {
+        if (unlock && !(provider.capabilities & FileSystemProviderCapabilities.FileWriteUnlock)) {
             throw ( (new Error(localizeWithPath(
                 _moduleId,
                 6,
@@ -388,7 +388,7 @@ let FileService = class FileService extends Disposable {
         }
         const atomic = !!options?.atomic;
         if (atomic) {
-            if (!((provider.capabilities & 32768) )) {
+            if (!(provider.capabilities & FileSystemProviderCapabilities.FileAtomicWrite)) {
                 throw ( (new Error(localizeWithPath(
                     _moduleId,
                     7,
@@ -396,7 +396,7 @@ let FileService = class FileService extends Disposable {
                     this.resourceForError(resource)
                 ))));
             }
-            if (!((provider.capabilities & 2) )) {
+            if (!(provider.capabilities & FileSystemProviderCapabilities.FileReadWrite)) {
                 throw ( (new Error(localizeWithPath(
                     _moduleId,
                     8,
@@ -426,7 +426,7 @@ let FileService = class FileService extends Disposable {
                 10,
                 "Unable to write file '{0}' that is actually a directory",
                 this.resourceForError(resource)
-            ), 0 , options)));
+            ), FileOperationResult.FILE_IS_DIRECTORY, options)));
         }
         this.throwIfFileIsReadonly(resource, stat);
         if (typeof options?.mtime === 'number' && typeof options.etag === 'string' && options.etag !== ETAG_DISABLED &&
@@ -434,7 +434,7 @@ let FileService = class FileService extends Disposable {
             options.mtime < stat.mtime && options.etag !== etag({ mtime: options.mtime , size: stat.size })) {
             throw ( (new FileOperationError(
                 localizeWithPath(_moduleId, 11, "File Modified Since"),
-                3 ,
+                FileOperationResult.FILE_MODIFIED_SINCE,
                 options
             )));
         }
@@ -591,7 +591,7 @@ let FileService = class FileService extends Disposable {
                 13,
                 "Unable to read file '{0}' that is actually a directory",
                 this.resourceForError(resource)
-            ), 0 , options)));
+            ), FileOperationResult.FILE_IS_DIRECTORY, options)));
         }
         if (typeof options?.etag === 'string' && options.etag !== ETAG_DISABLED && options.etag === stat.etag) {
             throw ( (new NotModifiedSinceFileOperationError(localizeWithPath(_moduleId, 14, "File not modified since"), stat, options)));
@@ -606,7 +606,7 @@ let FileService = class FileService extends Disposable {
                 15,
                 "Unable to read file '{0}' that is too large to open",
                 this.resourceForError(resource)
-            ), 7 , size, options)));
+            ), FileOperationResult.FILE_TOO_LARGE, size, options)));
         }
     }
     async canMove(source, target, overwrite) {
@@ -635,7 +635,7 @@ let FileService = class FileService extends Disposable {
         const fileStat = await this.resolve(target, { resolveMetadata: true });
         this._onDidRunOperation.fire(( (new FileOperationEvent(
             source,
-            mode === 'move' ? 2  : 3 ,
+            mode === 'move' ? FileOperation.MOVE : FileOperation.COPY,
             fileStat
         ))));
         return fileStat;
@@ -647,7 +647,7 @@ let FileService = class FileService extends Disposable {
         const fileStat = await this.resolve(target, { resolveMetadata: true });
         this._onDidRunOperation.fire(( (new FileOperationEvent(
             source,
-            mode === 'copy' ? 3  : 2 ,
+            mode === 'copy' ? FileOperation.COPY : FileOperation.MOVE,
             fileStat
         ))));
         return fileStat;
@@ -751,7 +751,7 @@ let FileService = class FileService extends Disposable {
                     "Unable to move/copy '{0}' because target '{1}' already exists at destination.",
                     this.resourceForError(source),
                     this.resourceForError(target)
-                ), 4 )));
+                ), FileOperationResult.FILE_MOVE_CONFLICT)));
             }
             if (sourceProvider === targetProvider) {
                 const { providerExtUri } = this.getExtUri(sourceProvider);
@@ -776,13 +776,13 @@ let FileService = class FileService extends Disposable {
         };
     }
     isPathCaseSensitive(provider) {
-        return !!((provider.capabilities & 1024) );
+        return !!(provider.capabilities & FileSystemProviderCapabilities.PathCaseSensitive);
     }
     async createFolder(resource) {
         const provider = this.throwIfFileSystemIsReadonly(await this.withProvider(resource), resource);
         await this.mkdirp(provider, resource);
         const fileStat = await this.resolve(resource, { resolveMetadata: true });
-        this._onDidRunOperation.fire(( (new FileOperationEvent(resource, 0 , fileStat))));
+        this._onDidRunOperation.fire(( (new FileOperationEvent(resource, FileOperation.CREATE, fileStat))));
         return fileStat;
     }
     async mkdirp(provider, directory) {
@@ -801,7 +801,7 @@ let FileService = class FileService extends Disposable {
     async doValidateDelete(resource, options) {
         const provider = this.throwIfFileSystemIsReadonly(await this.withProvider(resource), resource);
         const useTrash = !!options?.useTrash;
-        if (useTrash && !((provider.capabilities & 4096) )) {
+        if (useTrash && !(provider.capabilities & FileSystemProviderCapabilities.Trash)) {
             throw ( (new Error(localizeWithPath(
                 _moduleId,
                 20,
@@ -810,7 +810,7 @@ let FileService = class FileService extends Disposable {
             ))));
         }
         const atomic = options?.atomic;
-        if (atomic && !((provider.capabilities & 65536) )) {
+        if (atomic && !(provider.capabilities & FileSystemProviderCapabilities.FileAtomicDelete)) {
             throw ( (new Error(localizeWithPath(
                 _moduleId,
                 21,
@@ -841,7 +841,7 @@ let FileService = class FileService extends Disposable {
                 23,
                 "Unable to delete nonexistent file '{0}'",
                 this.resourceForError(resource)
-            ), 1 )));
+            ), FileOperationResult.FILE_NOT_FOUND)));
         }
         const recursive = !!options?.recursive;
         if (!recursive) {
@@ -870,7 +870,7 @@ let FileService = class FileService extends Disposable {
         const recursive = !!deleteFileOptions?.recursive;
         const atomic = deleteFileOptions?.atomic ?? false;
         await provider.delete(resource, { recursive, useTrash, atomic });
-        this._onDidRunOperation.fire(( (new FileOperationEvent(resource, 1 ))));
+        this._onDidRunOperation.fire(( (new FileOperationEvent(resource, FileOperation.DELETE))));
     }
     async cloneFile(source, target) {
         const sourceProvider = await this.withProvider(source);
@@ -1108,13 +1108,13 @@ let FileService = class FileService extends Disposable {
         await this.doWriteUnbuffered(targetProvider, target, undefined, buffer);
     }
     throwIfFileSystemIsReadonly(provider, resource) {
-        if (provider.capabilities & 2048 ) {
+        if (provider.capabilities & FileSystemProviderCapabilities.Readonly) {
             throw ( (new FileOperationError(localizeWithPath(
                 _moduleId,
                 25,
                 "Unable to modify read-only file '{0}'",
                 this.resourceForError(resource)
-            ), 6 )));
+            ), FileOperationResult.FILE_PERMISSION_DENIED)));
         }
         return provider;
     }
@@ -1125,7 +1125,7 @@ let FileService = class FileService extends Disposable {
                 25,
                 "Unable to modify read-only file '{0}'",
                 this.resourceForError(resource)
-            ), 6 )));
+            ), FileOperationResult.FILE_PERMISSION_DENIED)));
         }
     }
     resourceForError(resource) {

package/vscode/src/vs/workbench/services/files/browser/elevatedFileService.js

@@ -1,3 +1,4 @@
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
 class BrowserElevatedFileService {

package/vscode/src/vs/workbench/services/textfile/browser/browserTextFileService.js

@@ -1,6 +1,8 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { AbstractTextFileService } from './textFileService.js';
+import { TextFileEditorModelState } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
@@ -27,7 +29,7 @@ let BrowserTextFileService = class BrowserTextFileService extends AbstractTextFi
         this._register(this.lifecycleService.onBeforeShutdown(event => event.veto(this.onBeforeShutdown(), 'veto.textFiles')));
     }
     onBeforeShutdown() {
-        if (( this.files.models.some(model => model.hasState(2 )))) {
+        if (( this.files.models.some(model => model.hasState(TextFileEditorModelState.PENDING_SAVE)))) {
             return true;
         }
         return false;

package/vscode/src/vs/workbench/services/textfile/browser/textFileService.js

@@ -1,8 +1,9 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { TextFileOperationError, toBufferOrReadable, stringToSnapshot } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
+import { TextFileEditorModelState, TextFileOperationError, TextFileOperationResult, toBufferOrReadable, stringToSnapshot } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
 import { SaveSourceRegistry } from 'vscode/vscode/vs/workbench/common/editor';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
+import { FileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { extname } from 'vscode/vscode/vs/base/common/path';
@@ -27,7 +28,7 @@ import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/wor
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { WORKSPACE_EXTENSION } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
-import { UTF8, toEncodeReadable, toDecodeStream, UTF16be, UTF16le, UTF8_with_bom, encodingExists } from 'vscode/vscode/vs/workbench/services/textfile/common/encoding';
+import { UTF8, DecodeStreamErrorKind, toEncodeReadable, toDecodeStream, UTF16be, UTF16le, UTF8_with_bom, encodingExists } from 'vscode/vscode/vs/workbench/services/textfile/common/encoding';
 import { consumeStream } from 'vscode/vscode/vs/base/common/stream';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -91,7 +92,7 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
             }
             registerListeners() {
                 this._register(this.files.onDidResolve(({ model }) => {
-                    if (model.isReadonly() || model.hasState(4 )) {
+                    if (model.isReadonly() || model.hasState(TextFileEditorModelState.ORPHAN)) {
                         this._onDidChange.fire([model.resource]);
                     }
                 }));
@@ -105,7 +106,7 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
                     return undefined;
                 }
                 const isReadonly = model.isReadonly();
-                const isOrphaned = model.hasState(4 );
+                const isOrphaned = model.hasState(TextFileEditorModelState.ORPHAN);
                 if (isReadonly && isOrphaned) {
                     return {
                         color: listErrorForeground,
@@ -176,10 +177,10 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
         }
         catch (error) {
             cts.dispose(true);
-            if (error.decodeStreamErrorKind === 1 ) {
+            if (error.decodeStreamErrorKind === DecodeStreamErrorKind.STREAM_IS_BINARY) {
                 throw ( (new TextFileOperationError(
                     localizeWithPath(_moduleId, 6, "File seems to be binary and cannot be opened as text"),
-                    0 ,
+                    TextFileOperationResult.FILE_IS_BINARY,
                     options
                 )));
             }
@@ -331,8 +332,8 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
             }
             catch (error) {
                 if (targetExists) {
-                    if (error.textFileOperationResult === 0  ||
-                        error.fileOperationResult === 7 ) {
+                    if (error.textFileOperationResult === TextFileOperationResult.FILE_IS_BINARY ||
+                        error.fileOperationResult === FileOperationResult.FILE_TOO_LARGE) {
                         await this.fileService.del(target);
                         return this.doSaveAsTextFile(sourceModel, source, target, options);
                     }

package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModelManager.js

@@ -7,6 +7,7 @@ import { TextFileEditorModel } from 'vscode/vscode/vs/workbench/services/textfil
 import { Disposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import { FileChangeType, FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ResourceQueue, Promises } from 'vscode/vscode/vs/base/common/async';
 import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
@@ -30,7 +31,9 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
         this.notificationService = notificationService;
         this.workingCopyFileService = workingCopyFileService;
         this.uriIdentityService = uriIdentityService;
-        this._onDidCreate = this._register(( (new Emitter())));
+        this._onDidCreate = this._register(( (new Emitter(
+            { leakWarningThreshold: 500  }
+        ))));
         this.onDidCreate = this._onDidCreate.event;
         this._onDidResolve = this._register(( (new Emitter())));
         this.onDidResolve = this._onDidResolve.event;
@@ -86,7 +89,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
             if (model.isDirty()) {
                 continue;
             }
-            if (e.contains(model.resource, 0 , 1 )) {
+            if (e.contains(model.resource, FileChangeType.UPDATED, FileChangeType.ADDED)) {
                 this.queueModelReload(model);
             }
         }
@@ -124,7 +127,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
         }
     }
     onWillRunWorkingCopyFileOperation(e) {
-        if (e.operation === 2  || e.operation === 3 ) {
+        if (e.operation === FileOperation.MOVE || e.operation === FileOperation.COPY) {
             const modelsToRestore = [];
             for (const { source, target } of e.files) {
                 if (source) {
@@ -160,7 +163,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
         }
     }
     onDidFailWorkingCopyFileOperation(e) {
-        if (((e.operation === 2  || e.operation === 3) )) {
+        if ((e.operation === FileOperation.MOVE || e.operation === FileOperation.COPY)) {
             const modelsToRestore = this.mapCorrelationIdToModelsToRestore.get(e.correlationId);
             if (modelsToRestore) {
                 this.mapCorrelationIdToModelsToRestore.delete(e.correlationId);
@@ -174,7 +177,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
     }
     onDidRunWorkingCopyFileOperation(e) {
         switch (e.operation) {
-            case 0 :
+            case FileOperation.CREATE:
                 e.waitUntil((async () => {
                     for (const { target } of e.files) {
                         const model = this.get(target);
@@ -184,14 +187,15 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
                     }
                 })());
                 break;
-            case 2 :
-            case 3 :
+            case FileOperation.MOVE:
+            case FileOperation.COPY:
                 e.waitUntil((async () => {
                     const modelsToRestore = this.mapCorrelationIdToModelsToRestore.get(e.correlationId);
                     if (modelsToRestore) {
                         this.mapCorrelationIdToModelsToRestore.delete(e.correlationId);
                         await Promises.settled(( (modelsToRestore.map(async (modelToRestore) => {
-                            const restoredModel = await this.resolve(modelToRestore.target, {
+                            const target = this.uriIdentityService.asCanonicalUri(modelToRestore.target);
+                            const restoredModel = await this.resolve(target, {
                                 reload: { async: false },
                                 contents: modelToRestore.snapshot ? createTextBufferFactoryFromSnapshot(modelToRestore.snapshot) : undefined,
                                 encoding: modelToRestore.encoding
@@ -199,7 +203,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
                             if (modelToRestore.languageId &&
                                 modelToRestore.languageId !== PLAINTEXT_LANGUAGE_ID &&
                                 restoredModel.getLanguageId() === PLAINTEXT_LANGUAGE_ID &&
-                                extname(modelToRestore.target) !== PLAINTEXT_EXTENSION) {
+                                extname(target) !== PLAINTEXT_EXTENSION) {
                                 restoredModel.updateTextEditorModel(undefined, modelToRestore.languageId);
                             }
                         }))));

package/vscode/src/vs/workbench/services/textfile/common/textFileSaveParticipant.js

@@ -3,6 +3,7 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { raceCancellation } from 'vscode/vscode/vs/base/common/async';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { insert } from 'vscode/vscode/vs/base/common/arrays';
@@ -23,7 +24,7 @@ let TextFileSaveParticipant = class TextFileSaveParticipant extends Disposable {
         const cts = ( (new CancellationTokenSource(token)));
         return this.progressService.withProgress({
             title: ( localizeWithPath(_moduleId, 0, "Saving '{0}'", model.name)),
-            location: 15 ,
+            location: ProgressLocation.Notification,
             cancellable: true,
             delay: model.isDirty() ? 3000 : 5000
         }, async (progress) => {