@codingame/monaco-vscode-files-service-override 10.1.4 → 11.0.1

package/package.json

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

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

@@ -10,13 +10,13 @@ import { createFileSystemProviderError, FileSystemProviderErrorCode, FileType, F
 import { DBClosedError } from 'vscode/vscode/vs/base/browser/indexedDB';
 import { BroadcastDataChannel } from 'vscode/vscode/vs/base/browser/broadcast';
 
-const ERR_FILE_NOT_FOUND = createFileSystemProviderError(( localize(740, "File does not exist")), FileSystemProviderErrorCode.FileNotFound);
-const ERR_FILE_IS_DIR = createFileSystemProviderError(( localize(741, "File is Directory")), FileSystemProviderErrorCode.FileIsADirectory);
-const ERR_FILE_NOT_DIR = createFileSystemProviderError(( localize(742, "File is not a directory")), FileSystemProviderErrorCode.FileNotADirectory);
-const ERR_DIR_NOT_EMPTY = createFileSystemProviderError(( localize(743, "Directory is not empty")), FileSystemProviderErrorCode.Unknown);
-const ERR_FILE_EXCEEDS_STORAGE_QUOTA = createFileSystemProviderError(( localize(744, "File exceeds available storage quota")), FileSystemProviderErrorCode.FileExceedsStorageQuota);
+const ERR_FILE_NOT_FOUND = createFileSystemProviderError(( localize(736, "File does not exist")), FileSystemProviderErrorCode.FileNotFound);
+const ERR_FILE_IS_DIR = createFileSystemProviderError(( localize(737, "File is Directory")), FileSystemProviderErrorCode.FileIsADirectory);
+const ERR_FILE_NOT_DIR = createFileSystemProviderError(( localize(738, "File is not a directory")), FileSystemProviderErrorCode.FileNotADirectory);
+const ERR_DIR_NOT_EMPTY = createFileSystemProviderError(( localize(739, "Directory is not empty")), FileSystemProviderErrorCode.Unknown);
+const ERR_FILE_EXCEEDS_STORAGE_QUOTA = createFileSystemProviderError(( localize(740, "File exceeds available storage quota")), FileSystemProviderErrorCode.FileExceedsStorageQuota);
 const ERR_UNKNOWN_INTERNAL = (message) => createFileSystemProviderError(( localize(
-    745,
+    741,
     "Internal error occurred in IndexedDB File System Provider. ({0})",
     message
 )), FileSystemProviderErrorCode.Unknown);

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

@@ -34,7 +34,7 @@ async function mkdirp(providerExtUri, provider, directory) {
             const stat = await provider.stat(directory);
             if ((stat.type & FileType.Directory) === 0) {
                 throw ( (new Error(localize(
-                    712,
+                    708,
                     "Unable to create folder '{0}' that already exists but is not a directory",
                     resourceForError(directory)
                 ))));
@@ -149,7 +149,7 @@ let FileService = class FileService extends Disposable {
     async withProvider(resource) {
         if (!isAbsolutePath(resource)) {
             throw ( (new FileOperationError(localize(
-                713,
+                709,
                 "Unable to resolve filesystem provider with relative file path '{0}'",
                 this.resourceForError(resource)
             ), 8 )));
@@ -159,7 +159,7 @@ let FileService = class FileService extends Disposable {
         if (!provider) {
             const error = ( (new ErrorNoTelemetry()));
             error.message = ( localize(
-                714,
+                710,
                 "ENOPRO: No file system provider found for resource '{0}'",
                  (resource.toString())
             ));
@@ -192,7 +192,7 @@ let FileService = class FileService extends Disposable {
         catch (error) {
             if (toFileSystemProviderErrorCode(error) === FileSystemProviderErrorCode.FileNotFound) {
                 throw ( (new FileOperationError(localize(
-                    715,
+                    711,
                     "Unable to resolve nonexistent file '{0}'",
                     this.resourceForError(resource)
                 ), 1 )));
@@ -303,7 +303,7 @@ let FileService = class FileService extends Disposable {
     async doValidateCreateFile(resource, options) {
         if (!options?.overwrite && (await this.exists(resource))) {
             throw ( (new FileOperationError(localize(
-                716,
+                712,
                 "Unable to create file '{0}' that already exists when overwrite flag is not set",
                 this.resourceForError(resource)
             ), 3 , options)));
@@ -361,7 +361,7 @@ let FileService = class FileService extends Disposable {
         }
         catch (error) {
             throw ( (new FileOperationError(localize(
-                717,
+                713,
                 "Unable to write file '{0}' ({1})",
                 this.resourceForError(resource),
                 ( (ensureFileSystemProviderError(error).toString()))
@@ -373,7 +373,7 @@ let FileService = class FileService extends Disposable {
         const unlock = !!options?.unlock;
         if (unlock && !((provider.capabilities & 8192) )) {
             throw ( (new Error(localize(
-                718,
+                714,
                 "Unable to unlock file '{0}' because provider does not support it.",
                 this.resourceForError(resource)
             ))));
@@ -382,21 +382,21 @@ let FileService = class FileService extends Disposable {
         if (atomic) {
             if (!((provider.capabilities & 32768) )) {
                 throw ( (new Error(localize(
-                    719,
+                    715,
                     "Unable to atomically write file '{0}' because provider does not support it.",
                     this.resourceForError(resource)
                 ))));
             }
             if (!((provider.capabilities & 2) )) {
                 throw ( (new Error(localize(
-                    720,
+                    716,
                     "Unable to atomically write file '{0}' because provider does not support unbuffered writes.",
                     this.resourceForError(resource)
                 ))));
             }
             if (unlock) {
                 throw ( (new Error(localize(
-                    721,
+                    717,
                     "Unable to unlock file '{0}' because atomic write is enabled.",
                     this.resourceForError(resource)
                 ))));
@@ -411,7 +411,7 @@ let FileService = class FileService extends Disposable {
         }
         if ((stat.type & FileType.Directory) !== 0) {
             throw ( (new FileOperationError(localize(
-                722,
+                718,
                 "Unable to write file '{0}' that is actually a directory",
                 this.resourceForError(resource)
             ), 0 , options)));
@@ -421,7 +421,7 @@ let FileService = class FileService extends Disposable {
             typeof stat.mtime === 'number' && typeof stat.size === 'number' &&
             options.mtime < stat.mtime && options.etag !== etag({ mtime: options.mtime , size: stat.size })) {
             throw ( (new FileOperationError(
-                localize(723, "File Modified Since"),
+                localize(719, "File Modified Since"),
                 3 ,
                 options
             )));
@@ -508,7 +508,7 @@ let FileService = class FileService extends Disposable {
     }
     restoreReadError(error, resource, options) {
         const message = ( localize(
-            724,
+            720,
             "Unable to read file '{0}' ({1})",
             this.resourceForError(resource),
              (ensureFileSystemProviderError(error).toString())
@@ -574,13 +574,13 @@ let FileService = class FileService extends Disposable {
         const stat = await this.resolve(resource, { resolveMetadata: true });
         if (stat.isDirectory) {
             throw ( (new FileOperationError(localize(
-                725,
+                721,
                 "Unable to read file '{0}' that is actually a directory",
                 this.resourceForError(resource)
             ), 0 , options)));
         }
         if (typeof options?.etag === 'string' && options.etag !== ETAG_DISABLED && options.etag === stat.etag) {
-            throw ( (new NotModifiedSinceFileOperationError(localize(726, "File not modified since"), stat, options)));
+            throw ( (new NotModifiedSinceFileOperationError(localize(722, "File not modified since"), stat, options)));
         }
         this.validateReadFileLimits(resource, stat.size, options);
         return stat;
@@ -588,7 +588,7 @@ let FileService = class FileService extends Disposable {
     validateReadFileLimits(resource, size, options) {
         if (typeof options?.limits?.size === 'number' && size > options.limits.size) {
             throw ( (new TooLargeFileOperationError(localize(
-                727,
+                723,
                 "Unable to read file '{0}' that is too large to open",
                 this.resourceForError(resource)
             ), 7 , size, options)));
@@ -710,7 +710,7 @@ let FileService = class FileService extends Disposable {
             }
             if (isSameResourceWithDifferentPathCase && mode === 'copy') {
                 throw ( (new Error(localize(
-                    728,
+                    724,
                     "Unable to copy when source '{0}' is same as target '{1}' with different path case on a case insensitive file system",
                     this.resourceForError(source),
                     this.resourceForError(target)
@@ -718,7 +718,7 @@ let FileService = class FileService extends Disposable {
             }
             if (!isSameResourceWithDifferentPathCase && providerExtUri.isEqualOrParent(target, source)) {
                 throw ( (new Error(localize(
-                    729,
+                    725,
                     "Unable to move/copy when source '{0}' is parent of target '{1}'.",
                     this.resourceForError(source),
                     this.resourceForError(target)
@@ -729,7 +729,7 @@ let FileService = class FileService extends Disposable {
         if (exists && !isSameResourceWithDifferentPathCase) {
             if (!overwrite) {
                 throw ( (new FileOperationError(localize(
-                    730,
+                    726,
                     "Unable to move/copy '{0}' because target '{1}' already exists at destination.",
                     this.resourceForError(source),
                     this.resourceForError(target)
@@ -739,7 +739,7 @@ let FileService = class FileService extends Disposable {
                 const { providerExtUri } = this.getExtUri(sourceProvider);
                 if (providerExtUri.isEqualOrParent(source, target)) {
                     throw ( (new Error(localize(
-                        731,
+                        727,
                         "Unable to move/copy '{0}' into '{1}' since a file would replace the folder it is contained in.",
                         this.resourceForError(source),
                         this.resourceForError(target)
@@ -784,7 +784,7 @@ let FileService = class FileService extends Disposable {
         const useTrash = !!options?.useTrash;
         if (useTrash && !((provider.capabilities & 4096) )) {
             throw ( (new Error(localize(
-                732,
+                728,
                 "Unable to delete file '{0}' via trash because provider does not support it.",
                 this.resourceForError(resource)
             ))));
@@ -792,14 +792,14 @@ let FileService = class FileService extends Disposable {
         const atomic = options?.atomic;
         if (atomic && !((provider.capabilities & 65536) )) {
             throw ( (new Error(localize(
-                733,
+                729,
                 "Unable to delete file '{0}' atomically because provider does not support it.",
                 this.resourceForError(resource)
             ))));
         }
         if (useTrash && atomic) {
             throw ( (new Error(localize(
-                734,
+                730,
                 "Unable to atomically delete file '{0}' because using trash is enabled.",
                 this.resourceForError(resource)
             ))));
@@ -815,7 +815,7 @@ let FileService = class FileService extends Disposable {
         }
         else {
             throw ( (new FileOperationError(localize(
-                735,
+                731,
                 "Unable to delete nonexistent file '{0}'",
                 this.resourceForError(resource)
             ), 1 )));
@@ -825,7 +825,7 @@ let FileService = class FileService extends Disposable {
             const stat = await this.resolve(resource);
             if (stat.isDirectory && Array.isArray(stat.children) && stat.children.length > 0) {
                 throw ( (new Error(localize(
-                    736,
+                    732,
                     "Unable to delete non-empty folder '{0}'.",
                     this.resourceForError(resource)
                 ))));
@@ -1086,7 +1086,7 @@ let FileService = class FileService extends Disposable {
     throwIfFileSystemIsReadonly(provider, resource) {
         if (provider.capabilities & 2048 ) {
             throw ( (new FileOperationError(localize(
-                737,
+                733,
                 "Unable to modify read-only file '{0}'",
                 this.resourceForError(resource)
             ), 6 )));
@@ -1096,7 +1096,7 @@ let FileService = class FileService extends Disposable {
     throwIfFileIsReadonly(resource, stat) {
         if ((stat.permissions ?? 0) & FilePermission.Readonly) {
             throw ( (new FileOperationError(localize(
-                737,
+                733,
                 "Unable to modify read-only file '{0}'",
                 this.resourceForError(resource)
             ), 6 )));

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

@@ -61,7 +61,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
             return {
                 onSaveError(error, model) {
                     notificationService.error(( localize(
-                        9909,
+                        9982,
                         "Failed to save '{0}': {1}",
                         model.name,
                         toErrorMessage(error, false)

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

@@ -1,42 +1,73 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 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 { 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';
+import { LinkedList } from 'vscode/vscode/vs/base/common/linkedList';
+import { localize } from 'vscode/vscode/vs/nls';
+import { NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { isCancellationError, CancellationError } from 'vscode/vscode/vs/base/common/errors';
 
 let TextFileSaveParticipant = class TextFileSaveParticipant extends Disposable {
-    constructor(logService) {
+    constructor(logService, progressService) {
         super();
         this.logService = logService;
-        this.saveParticipants = [];
+        this.progressService = progressService;
+        this.saveParticipants = ( (new LinkedList()));
     }
     addSaveParticipant(participant) {
-        const remove = insert(this.saveParticipants, participant);
+        const remove = this.saveParticipants.push(participant);
         return toDisposable(() => remove());
     }
     async participate(model, context, progress, token) {
+        const cts = ( (new CancellationTokenSource(token)));
         model.textEditorModel?.pushStackElement();
-        for (const saveParticipant of this.saveParticipants) {
-            if (token.isCancellationRequested || !model.textEditorModel ) {
-                break;
+        progress.report({
+            message: ( localize(11518, "Running Code Actions and Formatters..."))
+        });
+        let bubbleCancel = false;
+        await this.progressService.withProgress({
+            priority: NotificationPriority.URGENT,
+            location: 15 ,
+            cancellable: ( localize(11519, "Skip")),
+            delay: model.isDirty() ? 5000 : 3000
+        }, async (progress) => {
+            for (const saveParticipant of this.saveParticipants) {
+                if (cts.token.isCancellationRequested || !model.textEditorModel ) {
+                    break;
+                }
+                try {
+                    const promise = saveParticipant.participate(model, context, progress, cts.token);
+                    await raceCancellation(promise, cts.token);
+                }
+                catch (err) {
+                    if (!isCancellationError(err)) {
+                        this.logService.error(err);
+                    }
+                    else if (!cts.token.isCancellationRequested) {
+                        cts.cancel();
+                        bubbleCancel = true;
+                    }
+                }
             }
-            try {
-                const promise = saveParticipant.participate(model, context, progress, token);
-                await raceCancellation(promise, token);
-            }
-            catch (err) {
-                this.logService.error(err);
-            }
-        }
+        }, () => {
+            cts.cancel();
+        });
         model.textEditorModel?.pushStackElement();
+        cts.dispose();
+        if (bubbleCancel) {
+            throw ( (new CancellationError()));
+        }
     }
     dispose() {
-        this.saveParticipants.splice(0, this.saveParticipants.length);
+        this.saveParticipants.clear();
         super.dispose();
     }
 };
-TextFileSaveParticipant = ( __decorate([
-    ( __param(0, ILogService))
-], TextFileSaveParticipant));
+TextFileSaveParticipant = ( (__decorate([
+    ( (__param(0, ILogService))),
+    ( (__param(1, IProgressService)))
+], TextFileSaveParticipant)));
 
 export { TextFileSaveParticipant };