@codingame/monaco-vscode-files-service-override 14.0.5 → 15.0.0

package/index.js

@@ -22,7 +22,7 @@ export { IndexedDB } from '@codingame/monaco-vscode-2f06fe84-148e-5e6b-a7ca-c798
 import { BufferLogger } from '@codingame/monaco-vscode-cea4d01f-6526-5c2f-8b09-b168fead499f-common/vscode/vs/platform/log/common/bufferLog';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { BrowserTextFileService } from './vscode/src/vs/workbench/services/textfile/browser/browserTextFileService.js';
-import { FilesConfigurationService } from '@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
+import { FilesConfigurationService } from '@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 import { BrowserElevatedFileService } from './vscode/src/vs/workbench/services/files/browser/elevatedFileService.js';
 import { IElevatedFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/files/common/elevatedFileService.service';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-files-service-override",
-  "version": "14.0.5",
+  "version": "15.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - files service-override",
   "keywords": [],
@@ -15,15 +15,15 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "14.0.5",
-    "@codingame/monaco-vscode-15626ec7-b165-51e1-8caf-7bcc2ae9b95a-common": "14.0.5",
-    "@codingame/monaco-vscode-2e67e044-0db9-5fa6-8bd1-3737a7d586d4-common": "14.0.5",
-    "@codingame/monaco-vscode-2f06fe84-148e-5e6b-a7ca-c7989c5f128a-common": "14.0.5",
-    "@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common": "14.0.5",
-    "@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-common": "14.0.5",
-    "@codingame/monaco-vscode-api": "14.0.5",
-    "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common": "14.0.5",
-    "@codingame/monaco-vscode-cea4d01f-6526-5c2f-8b09-b168fead499f-common": "14.0.5"
+    "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "15.0.0",
+    "@codingame/monaco-vscode-15626ec7-b165-51e1-8caf-7bcc2ae9b95a-common": "15.0.0",
+    "@codingame/monaco-vscode-2e67e044-0db9-5fa6-8bd1-3737a7d586d4-common": "15.0.0",
+    "@codingame/monaco-vscode-2f06fe84-148e-5e6b-a7ca-c7989c5f128a-common": "15.0.0",
+    "@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common": "15.0.0",
+    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "15.0.0",
+    "@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common": "15.0.0",
+    "@codingame/monaco-vscode-api": "15.0.0",
+    "@codingame/monaco-vscode-cea4d01f-6526-5c2f-8b09-b168fead499f-common": "15.0.0"
   },
   "main": "index.js",
   "module": "index.js",
@@ -33,12 +33,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js",
-      "types": "./vscode/src/*.d.ts"
+      "types": "./vscode/src/*.d.ts",
+      "default": "./vscode/src/*.js"
     },
     "./*": {
-      "default": "./*.js",
-      "types": "./*.d.ts"
+      "types": "./*.d.ts",
+      "default": "./*.js"
     }
   },
   "typesVersions": {

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

@@ -8,15 +8,15 @@ import { isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/typ
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { createFileSystemProviderError, FileSystemProviderErrorCode, FileType, FileSystemProviderCapabilities, FileChangeType } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
-import { BroadcastDataChannel } from '@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common/vscode/vs/base/browser/broadcast';
+import { BroadcastDataChannel } from '@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/base/browser/broadcast';
 
-const ERR_FILE_NOT_FOUND = createFileSystemProviderError(( localize(1776, "File does not exist")), FileSystemProviderErrorCode.FileNotFound);
-const ERR_FILE_IS_DIR = createFileSystemProviderError(( localize(1777, "File is Directory")), FileSystemProviderErrorCode.FileIsADirectory);
-const ERR_FILE_NOT_DIR = createFileSystemProviderError(( localize(1778, "File is not a directory")), FileSystemProviderErrorCode.FileNotADirectory);
-const ERR_DIR_NOT_EMPTY = createFileSystemProviderError(( localize(1779, "Directory is not empty")), FileSystemProviderErrorCode.Unknown);
-const ERR_FILE_EXCEEDS_STORAGE_QUOTA = createFileSystemProviderError(( localize(1780, "File exceeds available storage quota")), FileSystemProviderErrorCode.FileExceedsStorageQuota);
+const ERR_FILE_NOT_FOUND = createFileSystemProviderError(( localize(1781, "File does not exist")), FileSystemProviderErrorCode.FileNotFound);
+const ERR_FILE_IS_DIR = createFileSystemProviderError(( localize(1782, "File is Directory")), FileSystemProviderErrorCode.FileIsADirectory);
+const ERR_FILE_NOT_DIR = createFileSystemProviderError(( localize(1783, "File is not a directory")), FileSystemProviderErrorCode.FileNotADirectory);
+const ERR_DIR_NOT_EMPTY = createFileSystemProviderError(( localize(1784, "Directory is not empty")), FileSystemProviderErrorCode.Unknown);
+const ERR_FILE_EXCEEDS_STORAGE_QUOTA = createFileSystemProviderError(( localize(1785, "File exceeds available storage quota")), FileSystemProviderErrorCode.FileExceedsStorageQuota);
 const ERR_UNKNOWN_INTERNAL = (message) => createFileSystemProviderError(( localize(
-    1781,
+    1786,
     "Internal error occurred in IndexedDB File System Provider. ({0})",
     message
 )), FileSystemProviderErrorCode.Unknown);

package/vscode/src/vs/platform/files/common/fileService.d.ts

@@ -52,6 +52,7 @@ export declare class FileService extends Disposable implements IFileService {
     private doValidateCreateFile;
     createFile(resource: URI, bufferOrReadableOrStream?: VSBuffer | VSBufferReadable | VSBufferReadableStream, options?: ICreateFileOptions): Promise<IFileStatWithMetadata>;
     writeFile(resource: URI, bufferOrReadableOrStream: VSBuffer | VSBufferReadable | VSBufferReadableStream, options?: IWriteFileOptions): Promise<IFileStatWithMetadata>;
+    private peekBufferForWriting;
     private validateWriteFile;
     readFile(resource: URI, options?: IReadFileOptions, token?: CancellationToken): Promise<IFileContent>;
     private doReadFileAtomic;
@@ -88,7 +89,9 @@ export declare class FileService extends Disposable implements IFileService {
     readonly onDidWatchError: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<Error>;
     private readonly activeWatchers;
     private static WATCHER_CORRELATION_IDS;
-    createWatcher(resource: URI, options: IWatchOptionsWithoutCorrelation): IFileSystemWatcher;
+    createWatcher(resource: URI, options: IWatchOptionsWithoutCorrelation & {
+        recursive: false;
+    }): IFileSystemWatcher;
     watch(resource: URI, options: IWatchOptionsWithCorrelation): IFileSystemWatcher;
     watch(resource: URI, options?: IWatchOptionsWithoutCorrelation): IDisposable;
     private doWatch;

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

@@ -33,7 +33,7 @@ async function mkdirp(providerExtUri, provider, directory) {
             const stat = await provider.stat(directory);
             if ((stat.type & FileType.Directory) === 0) {
                 throw ( new Error(( localize(
-                    1782,
+                    1787,
                     "Unable to create folder '{0}' that already exists but is not a directory",
                     resourceForError(directory)
                 ))));
@@ -144,7 +144,7 @@ let FileService = class FileService extends Disposable {
     async withProvider(resource) {
         if (!isAbsolutePath(resource)) {
             throw ( new FileOperationError(( localize(
-                1783,
+                1788,
                 "Unable to resolve filesystem provider with relative file path '{0}'",
                 this.resourceForError(resource)
             )), FileOperationResult.FILE_INVALID_PATH));
@@ -154,7 +154,7 @@ let FileService = class FileService extends Disposable {
         if (!provider) {
             const error = ( new ErrorNoTelemetry());
             error.message = ( localize(
-                1784,
+                1789,
                 "ENOPRO: No file system provider found for resource '{0}'",
                 (resource.toString())
             ));
@@ -187,7 +187,7 @@ let FileService = class FileService extends Disposable {
         catch (error) {
             if (toFileSystemProviderErrorCode(error) === FileSystemProviderErrorCode.FileNotFound) {
                 throw ( new FileOperationError(( localize(
-                    1785,
+                    1790,
                     "Unable to resolve nonexistent file '{0}'",
                     this.resourceForError(resource)
                 )), FileOperationResult.FILE_NOT_FOUND));
@@ -298,7 +298,7 @@ let FileService = class FileService extends Disposable {
     async doValidateCreateFile(resource, options) {
         if (!options?.overwrite && (await this.exists(resource))) {
             throw ( new FileOperationError(( localize(
-                1786,
+                1791,
                 "Unable to create file '{0}' that already exists when overwrite flag is not set",
                 this.resourceForError(resource)
             )), FileOperationResult.FILE_MODIFIED_SINCE, options));
@@ -321,27 +321,12 @@ let FileService = class FileService extends Disposable {
             }
         }
         try {
-            const stat = await this.validateWriteFile(provider, resource, writeFileOptions);
+            let { stat, buffer: bufferOrReadableOrStreamOrBufferedStream } = await this.validateWriteFile(provider, resource, bufferOrReadableOrStream, writeFileOptions);
             if (!stat) {
                 await this.mkdirp(provider, providerExtUri.dirname(resource));
             }
-            let bufferOrReadableOrStreamOrBufferedStream;
-            if (hasReadWriteCapability(provider) && !(bufferOrReadableOrStream instanceof VSBuffer)) {
-                if (isReadableStream(bufferOrReadableOrStream)) {
-                    const bufferedStream = await peekStream(bufferOrReadableOrStream, 3);
-                    if (bufferedStream.ended) {
-                        bufferOrReadableOrStreamOrBufferedStream = VSBuffer.concat(bufferedStream.buffer);
-                    }
-                    else {
-                        bufferOrReadableOrStreamOrBufferedStream = bufferedStream;
-                    }
-                }
-                else {
-                    bufferOrReadableOrStreamOrBufferedStream = peekReadable(bufferOrReadableOrStream, data => VSBuffer.concat(data), 3);
-                }
-            }
-            else {
-                bufferOrReadableOrStreamOrBufferedStream = bufferOrReadableOrStream;
+            if (!bufferOrReadableOrStreamOrBufferedStream) {
+                bufferOrReadableOrStreamOrBufferedStream = await this.peekBufferForWriting(provider, bufferOrReadableOrStream);
             }
             if (!hasOpenReadWriteCloseCapability(provider) ||
                 (hasReadWriteCapability(provider) && bufferOrReadableOrStreamOrBufferedStream instanceof VSBuffer) ||
@@ -356,7 +341,7 @@ let FileService = class FileService extends Disposable {
         }
         catch (error) {
             throw ( new FileOperationError(( localize(
-                1787,
+                1792,
                 "Unable to write file '{0}' ({1})",
                 this.resourceForError(resource),
                 (ensureFileSystemProviderError(error).toString())
@@ -364,11 +349,32 @@ let FileService = class FileService extends Disposable {
         }
         return this.resolve(resource, { resolveMetadata: true });
     }
-    async validateWriteFile(provider, resource, options) {
+    async peekBufferForWriting(provider, bufferOrReadableOrStream) {
+        let peekResult;
+        if (hasReadWriteCapability(provider) && !(bufferOrReadableOrStream instanceof VSBuffer)) {
+            if (isReadableStream(bufferOrReadableOrStream)) {
+                const bufferedStream = await peekStream(bufferOrReadableOrStream, 3);
+                if (bufferedStream.ended) {
+                    peekResult = VSBuffer.concat(bufferedStream.buffer);
+                }
+                else {
+                    peekResult = bufferedStream;
+                }
+            }
+            else {
+                peekResult = peekReadable(bufferOrReadableOrStream, data => VSBuffer.concat(data), 3);
+            }
+        }
+        else {
+            peekResult = bufferOrReadableOrStream;
+        }
+        return peekResult;
+    }
+    async validateWriteFile(provider, resource, bufferOrReadableOrStream, options) {
         const unlock = !!options?.unlock;
         if (unlock && !(provider.capabilities & FileSystemProviderCapabilities.FileWriteUnlock)) {
             throw ( new Error(( localize(
-                1788,
+                1793,
                 "Unable to unlock file '{0}' because provider does not support it.",
                 this.resourceForError(resource)
             ))));
@@ -377,21 +383,21 @@ let FileService = class FileService extends Disposable {
         if (atomic) {
             if (!(provider.capabilities & FileSystemProviderCapabilities.FileAtomicWrite)) {
                 throw ( new Error(( localize(
-                    1789,
+                    1794,
                     "Unable to atomically write file '{0}' because provider does not support it.",
                     this.resourceForError(resource)
                 ))));
             }
             if (!(provider.capabilities & FileSystemProviderCapabilities.FileReadWrite)) {
                 throw ( new Error(( localize(
-                    1790,
+                    1795,
                     "Unable to atomically write file '{0}' because provider does not support unbuffered writes.",
                     this.resourceForError(resource)
                 ))));
             }
             if (unlock) {
                 throw ( new Error(( localize(
-                    1791,
+                    1796,
                     "Unable to unlock file '{0}' because atomic write is enabled.",
                     this.resourceForError(resource)
                 ))));
@@ -402,22 +408,34 @@ let FileService = class FileService extends Disposable {
             stat = await provider.stat(resource);
         }
         catch (error) {
-            return undefined;
+            return Object.create(null);
         }
         if ((stat.type & FileType.Directory) !== 0) {
             throw ( new FileOperationError(( localize(
-                1792,
+                1797,
                 "Unable to write file '{0}' that is actually a directory",
                 this.resourceForError(resource)
             )), FileOperationResult.FILE_IS_DIRECTORY, options));
         }
         this.throwIfFileIsReadonly(resource, stat);
+        let buffer;
         if (typeof options?.mtime === 'number' && typeof options.etag === 'string' && options.etag !== ETAG_DISABLED &&
             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(1793, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options));
+            buffer = await this.peekBufferForWriting(provider, bufferOrReadableOrStream);
+            if (buffer instanceof VSBuffer && buffer.byteLength === stat.size) {
+                try {
+                    const { value } = await this.readFile(resource, { limits: { size: stat.size } });
+                    if (buffer.equals(value)) {
+                        return { stat, buffer };
+                    }
+                }
+                catch (error) {
+                }
+            }
+            throw ( new FileOperationError(( localize(1798, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options));
         }
-        return stat;
+        return { stat, buffer };
     }
     async readFile(resource, options, token) {
         const provider = await this.withReadProvider(resource);
@@ -497,7 +515,7 @@ let FileService = class FileService extends Disposable {
     }
     restoreReadError(error, resource, options) {
         const message = ( localize(
-            1794,
+            1799,
             "Unable to read file '{0}' ({1})",
             this.resourceForError(resource),
             (ensureFileSystemProviderError(error).toString())
@@ -557,13 +575,13 @@ let FileService = class FileService extends Disposable {
         const stat = await this.resolve(resource, { resolveMetadata: true });
         if (stat.isDirectory) {
             throw ( new FileOperationError(( localize(
-                1795,
+                1800,
                 "Unable to read file '{0}' that is actually a directory",
                 this.resourceForError(resource)
             )), FileOperationResult.FILE_IS_DIRECTORY, options));
         }
         if (typeof options?.etag === 'string' && options.etag !== ETAG_DISABLED && options.etag === stat.etag) {
-            throw ( new NotModifiedSinceFileOperationError(( localize(1796, "File not modified since")), stat, options));
+            throw ( new NotModifiedSinceFileOperationError(( localize(1801, "File not modified since")), stat, options));
         }
         this.validateReadFileLimits(resource, stat.size, options);
         return stat;
@@ -571,7 +589,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(
-                1797,
+                1802,
                 "Unable to read file '{0}' that is too large to open",
                 this.resourceForError(resource)
             )), FileOperationResult.FILE_TOO_LARGE, size, options));
@@ -693,7 +711,7 @@ let FileService = class FileService extends Disposable {
             }
             if (isSameResourceWithDifferentPathCase && mode === 'copy') {
                 throw ( new Error(( localize(
-                    1798,
+                    1803,
                     "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)
@@ -701,7 +719,7 @@ let FileService = class FileService extends Disposable {
             }
             if (!isSameResourceWithDifferentPathCase && providerExtUri.isEqualOrParent(target, source)) {
                 throw ( new Error(( localize(
-                    1799,
+                    1804,
                     "Unable to move/copy when source '{0}' is parent of target '{1}'.",
                     this.resourceForError(source),
                     this.resourceForError(target)
@@ -712,7 +730,7 @@ let FileService = class FileService extends Disposable {
         if (exists && !isSameResourceWithDifferentPathCase) {
             if (!overwrite) {
                 throw ( new FileOperationError(( localize(
-                    1800,
+                    1805,
                     "Unable to move/copy '{0}' because target '{1}' already exists at destination.",
                     this.resourceForError(source),
                     this.resourceForError(target)
@@ -722,7 +740,7 @@ let FileService = class FileService extends Disposable {
                 const { providerExtUri } = this.getExtUri(sourceProvider);
                 if (providerExtUri.isEqualOrParent(source, target)) {
                     throw ( new Error(( localize(
-                        1801,
+                        1806,
                         "Unable to move/copy '{0}' into '{1}' since a file would replace the folder it is contained in.",
                         this.resourceForError(source),
                         this.resourceForError(target)
@@ -767,7 +785,7 @@ let FileService = class FileService extends Disposable {
         const useTrash = !!options?.useTrash;
         if (useTrash && !(provider.capabilities & FileSystemProviderCapabilities.Trash)) {
             throw ( new Error(( localize(
-                1802,
+                1807,
                 "Unable to delete file '{0}' via trash because provider does not support it.",
                 this.resourceForError(resource)
             ))));
@@ -775,14 +793,14 @@ let FileService = class FileService extends Disposable {
         const atomic = options?.atomic;
         if (atomic && !(provider.capabilities & FileSystemProviderCapabilities.FileAtomicDelete)) {
             throw ( new Error(( localize(
-                1803,
+                1808,
                 "Unable to delete file '{0}' atomically because provider does not support it.",
                 this.resourceForError(resource)
             ))));
         }
         if (useTrash && atomic) {
             throw ( new Error(( localize(
-                1804,
+                1809,
                 "Unable to atomically delete file '{0}' because using trash is enabled.",
                 this.resourceForError(resource)
             ))));
@@ -798,7 +816,7 @@ let FileService = class FileService extends Disposable {
         }
         else {
             throw ( new FileOperationError(( localize(
-                1805,
+                1810,
                 "Unable to delete nonexistent file '{0}'",
                 this.resourceForError(resource)
             )), FileOperationResult.FILE_NOT_FOUND));
@@ -808,7 +826,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(
-                    1806,
+                    1811,
                     "Unable to delete non-empty folder '{0}'.",
                     this.resourceForError(resource)
                 ))));
@@ -1067,7 +1085,7 @@ let FileService = class FileService extends Disposable {
     throwIfFileSystemIsReadonly(provider, resource) {
         if (provider.capabilities & FileSystemProviderCapabilities.Readonly) {
             throw ( new FileOperationError(( localize(
-                1807,
+                1812,
                 "Unable to modify read-only file '{0}'",
                 this.resourceForError(resource)
             )), FileOperationResult.FILE_PERMISSION_DENIED));
@@ -1077,7 +1095,7 @@ let FileService = class FileService extends Disposable {
     throwIfFileIsReadonly(resource, stat) {
         if ((stat.permissions ?? 0) & FilePermission.Readonly) {
             throw ( new FileOperationError(( localize(
-                1807,
+                1812,
                 "Unable to modify read-only file '{0}'",
                 this.resourceForError(resource)
             )), FileOperationResult.FILE_PERMISSION_DENIED));

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

@@ -70,7 +70,7 @@ function throwIfCancelled(token) {
 }
 function throwIfTooLarge(totalBytesRead, options) {
     if (typeof options?.limits?.size === 'number' && totalBytesRead > options.limits.size) {
-        throw createFileSystemProviderError(( localize(1814, "File is too large to open")), FileSystemProviderErrorCode.FileTooLarge);
+        throw createFileSystemProviderError(( localize(1819, "File is too large to open")), FileSystemProviderErrorCode.FileTooLarge);
     }
     return true;
 }

package/vscode/src/vs/workbench/services/textfile/browser/browserTextFileService.d.ts

@@ -1,9 +1,9 @@
 import { AbstractTextFileService } from "./textFileService.js";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
-import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model";
-import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
-import { ITextResourceConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration";
+import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+import { ITextResourceConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service";
 import { IFileDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";

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

@@ -1,14 +1,14 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { AbstractTextFileService } from './textFileService.js';
-import { TextFileEditorModelState } from '@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-common/vscode/vs/workbench/services/textfile/common/textfiles';
+import { TextFileEditorModelState } from '@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common/vscode/vs/workbench/services/textfile/common/textfiles';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
-import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
-import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration';
+import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service';
 import { IDialogService, IFileDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';

package/vscode/src/vs/workbench/services/textfile/browser/textFileService.d.ts

@@ -1,5 +1,5 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ITextFileStreamContent, ITextFileContent, IResourceEncodings, IReadTextFileOptions, IWriteTextFileOptions, ITextFileSaveOptions, ITextFileEditorModelManager, IResourceEncoding, ITextFileSaveAsOptions, IReadTextFileEncodingOptions } from "@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-common/vscode/vs/workbench/services/textfile/common/textfiles";
+import { ITextFileStreamContent, ITextFileContent, IResourceEncodings, IReadTextFileOptions, IWriteTextFileOptions, ITextFileSaveOptions, ITextFileEditorModelManager, IResourceEncoding, ITextFileSaveAsOptions, IReadTextFileEncodingOptions } from "@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common/vscode/vs/workbench/services/textfile/common/textfiles";
 import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
 import { IRevertOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
@@ -9,21 +9,21 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { IUntitledTextEditorModelManager } from "@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/services/untitled/common/untitledTextEditorService";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { IFileDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
 import { ITextSnapshot } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { ITextResourceConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration";
+import { ITextResourceConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service";
 import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
-import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService";
+import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service";
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
 import { IFileOperationUndoRedoInfo } from "@codingame/monaco-vscode-base-service-override/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService";
 import { IWorkingCopyFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { ReadableStream } from "@codingame/monaco-vscode-api/vscode/vs/base/common/stream";
-import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IElevatedFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/files/common/elevatedFileService.service";
 import { IDecorationsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/decorations/common/decorations.service";
@@ -64,13 +64,14 @@ export declare abstract class AbstractTextFileService extends Disposable impleme
         options?: ICreateFileOptions;
     }[], undoInfo?: IFileOperationUndoRedoInfo): Promise<readonly IFileStatWithMetadata[]>;
     write(resource: URI, value: string | ITextSnapshot, options?: IWriteTextFileOptions): Promise<IFileStatWithMetadata>;
-    getEncodedReadable(resource: URI, value: ITextSnapshot): Promise<VSBufferReadable>;
-    getEncodedReadable(resource: URI, value: string): Promise<VSBuffer>;
-    getEncodedReadable(resource: URI, value?: ITextSnapshot): Promise<VSBufferReadable | undefined>;
-    getEncodedReadable(resource: URI, value?: string): Promise<VSBuffer | undefined>;
-    getEncodedReadable(resource: URI, value?: string | ITextSnapshot): Promise<VSBuffer | VSBufferReadable | undefined>;
-    getEncodedReadable(resource: URI, value: string | ITextSnapshot, options?: IWriteTextFileOptions): Promise<VSBuffer | VSBufferReadable>;
-    getDecodedStream(resource: URI, value: VSBufferReadableStream, options?: IReadTextFileEncodingOptions): Promise<ReadableStream<string>>;
+    getEncoding(resource: URI): string;
+    getEncodedReadable(resource: URI | undefined, value: ITextSnapshot): Promise<VSBufferReadable>;
+    getEncodedReadable(resource: URI | undefined, value: string): Promise<VSBuffer | VSBufferReadable>;
+    getEncodedReadable(resource: URI | undefined, value?: ITextSnapshot): Promise<VSBufferReadable | undefined>;
+    getEncodedReadable(resource: URI | undefined, value?: string): Promise<VSBuffer | VSBufferReadable | undefined>;
+    getEncodedReadable(resource: URI | undefined, value?: string | ITextSnapshot): Promise<VSBuffer | VSBufferReadable | undefined>;
+    getEncodedReadable(resource: URI | undefined, value: string | ITextSnapshot, options?: IWriteTextFileOptions): Promise<VSBuffer | VSBufferReadable>;
+    getDecodedStream(resource: URI | undefined, value: VSBufferReadableStream, options?: IReadTextFileEncodingOptions): Promise<ReadableStream<string>>;
     private doGetDecodedStream;
     save(resource: URI, options?: ITextFileSaveOptions): Promise<URI | undefined>;
     saveAs(source: URI, target?: URI, options?: ITextFileSaveAsOptions): Promise<URI | undefined>;
@@ -99,12 +100,13 @@ export declare class EncodingOracle extends Disposable implements IResourceEncod
     constructor(textResourceConfigurationService: ITextResourceConfigurationService, environmentService: IWorkbenchEnvironmentService, contextService: IWorkspaceContextService, uriIdentityService: IUriIdentityService);
     private registerListeners;
     private getDefaultEncodingOverrides;
-    getWriteEncoding(resource: URI, options?: IWriteTextFileOptions): Promise<{
+    getWriteEncoding(resource: URI | undefined, options?: IWriteTextFileOptions): Promise<{
         encoding: string;
         addBOM: boolean;
     }>;
-    getPreferredWriteEncoding(resource: URI, preferredEncoding?: string): Promise<IResourceEncoding>;
-    getPreferredReadEncoding(resource: URI, options?: IReadTextFileEncodingOptions, detectedEncoding?: string): Promise<IResourceEncoding>;
-    private getEncodingForResource;
+    getPreferredWriteEncoding(resource: URI | undefined, preferredEncoding?: string): Promise<IResourceEncoding>;
+    getPreferredReadEncoding(resource: URI | undefined, options?: IReadTextFileEncodingOptions, detectedEncoding?: string): Promise<IResourceEncoding>;
+    getUnvalidatedEncodingForResource(resource: URI | undefined, preferredEncoding?: string): string;
+    private getValidatedEncodingForResource;
     private getEncodingOverride;
 }

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { TextFileEditorModelState, TextFileOperationError, TextFileOperationResult, toBufferOrReadable, stringToSnapshot } from '@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-common/vscode/vs/workbench/services/textfile/common/textfiles';
+import { TextFileEditorModelState, TextFileOperationError, TextFileOperationResult, toBufferOrReadable, stringToSnapshot } from '@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common/vscode/vs/workbench/services/textfile/common/textfiles';
 import { SaveSourceRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { FileOperationResult } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
@@ -15,15 +15,15 @@ import { TextFileEditorModelManager } from '../common/textFileEditorModelManager
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { createTextBufferFactoryFromStream, createTextBufferFactoryFromSnapshot } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { isEqual, toLocalResource, basename, dirname, joinPath, extname as extname$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { IDialogService, IFileDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { bufferToStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
-import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration';
+import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service';
 import { PLAINTEXT_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/modesRegistry';
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
-import { BaseTextEditorModel } from '@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-common/vscode/vs/workbench/common/editor/textEditorModel';
-import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService';
+import { BaseTextEditorModel } from '@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common/vscode/vs/workbench/common/editor/textEditorModel';
+import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
@@ -31,7 +31,7 @@ import { WORKSPACE_EXTENSION } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { UTF8, DecodeStreamErrorKind, toEncodeReadable, toDecodeStream, UTF16be, UTF16le, UTF8_with_bom, encodingExists } from '@codingame/monaco-vscode-2e67e044-0db9-5fa6-8bd1-3737a7d586d4-common/vscode/vs/workbench/services/textfile/common/encoding';
 import { consumeStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stream';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { CancellationTokenSource, CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { IElevatedFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/files/common/elevatedFileService.service';
@@ -53,8 +53,8 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 var AbstractTextFileService_1;
 let AbstractTextFileService = class AbstractTextFileService extends Disposable {
     static { AbstractTextFileService_1 = this; }
-    static { this.TEXTFILE_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('textFileCreate.source', ( localize(11999, "File Created"))); }
-    static { this.TEXTFILE_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('textFileOverwrite.source', ( localize(12000, "File Replaced"))); }
+    static { this.TEXTFILE_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('textFileCreate.source', ( localize(12110, "File Created"))); }
+    static { this.TEXTFILE_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('textFileOverwrite.source', ( localize(12111, "File Replaced"))); }
     constructor(fileService, untitledTextEditorService, lifecycleService, instantiationService, modelService, environmentService, dialogService, fileDialogService, textResourceConfigurationService, filesConfigurationService, codeEditorService, pathService, workingCopyFileService, uriIdentityService, languageService, logService, elevatedFileService, decorationsService) {
         super();
         this.fileService = fileService;
@@ -84,7 +84,7 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
             constructor(files) {
                 super();
                 this.files = files;
-                this.label = ( localize(12001, "Text File Model Decorations"));
+                this.label = ( localize(12112, "Text File Model Decorations"));
                 this._onDidChange = this._register(( new Emitter()));
                 this.onDidChange = this._onDidChange.event;
                 this.registerListeners();
@@ -111,20 +111,20 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
                         color: listErrorForeground,
                         letter: Codicon.lockSmall,
                         strikethrough: true,
-                        tooltip: ( localize(12002, "Deleted, Read-only")),
+                        tooltip: ( localize(12113, "Deleted, Read-only")),
                     };
                 }
                 else if (isReadonly) {
                     return {
                         letter: Codicon.lockSmall,
-                        tooltip: ( localize(12003, "Read-only")),
+                        tooltip: ( localize(12114, "Read-only")),
                     };
                 }
                 else if (isOrphaned) {
                     return {
                         color: listErrorForeground,
                         strikethrough: true,
-                        tooltip: ( localize(12004, "Deleted")),
+                        tooltip: ( localize(12115, "Deleted")),
                     };
                 }
                 return undefined;
@@ -177,7 +177,7 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
         catch (error) {
             cts.dispose(true);
             if (error.decodeStreamErrorKind === DecodeStreamErrorKind.STREAM_IS_BINARY) {
-                throw ( new TextFileOperationError(( localize(12005, "File seems to be binary and cannot be opened as text")), TextFileOperationResult.FILE_IS_BINARY, options));
+                throw ( new TextFileOperationError(( localize(12116, "File seems to be binary and cannot be opened as text")), TextFileOperationResult.FILE_IS_BINARY, options));
             }
             else {
                 throw error;
@@ -202,6 +202,10 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
         }
         return this.fileService.writeFile(resource, readable, options);
     }
+    getEncoding(resource) {
+        const model = resource.scheme === Schemas.untitled ? this.untitled.get(resource) : this.files.get(resource);
+        return model?.getEncoding() ?? this.encoding.getUnvalidatedEncodingForResource(resource);
+    }
     async getEncodedReadable(resource, value, options) {
         const { encoding, addBOM } = await this.encoding.getWriteEncoding(resource, options);
         if (encoding === UTF8 && !addBOM) {
@@ -395,17 +399,17 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                12006,
+                12117,
                 "'{0}' already exists. Do you want to replace it?",
                 basename(resource)
             )),
             detail: ( localize(
-                12007,
+                12118,
                 "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(12008, "&&Replace")),
+            primaryButton: ( localize(12119, "&&Replace")),
         });
         return confirmed;
     }
@@ -413,12 +417,12 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                12009,
+                12120,
                 "'{0}' is marked as read-only. Do you want to save anyway?",
                 basename(resource)
             )),
-            detail: ( localize(12010, "Paths can be configured as read-only via settings.")),
-            primaryButton: ( localize(12011, "&&Save Anyway"))
+            detail: ( localize(12121, "Paths can be configured as read-only via settings.")),
+            primaryButton: ( localize(12122, "&&Save Anyway"))
         });
         return confirmed;
     }
@@ -551,7 +555,7 @@ let EncodingOracle = class EncodingOracle extends Disposable {
         return { encoding, addBOM: hasBOM };
     }
     async getPreferredWriteEncoding(resource, preferredEncoding) {
-        const resourceEncoding = await this.getEncodingForResource(resource, preferredEncoding);
+        const resourceEncoding = await this.getValidatedEncodingForResource(resource, preferredEncoding);
         return {
             encoding: resourceEncoding,
             hasBOM: resourceEncoding === UTF16be || resourceEncoding === UTF16le || resourceEncoding === UTF8_with_bom
@@ -573,13 +577,13 @@ let EncodingOracle = class EncodingOracle extends Disposable {
         else if (this.textResourceConfigurationService.getValue(resource, 'files.encoding') === UTF8_with_bom) {
             preferredEncoding = UTF8;
         }
-        const encoding = await this.getEncodingForResource(resource, preferredEncoding);
+        const encoding = await this.getValidatedEncodingForResource(resource, preferredEncoding);
         return {
             encoding,
             hasBOM: encoding === UTF16be || encoding === UTF16le || encoding === UTF8_with_bom
         };
     }
-    async getEncodingForResource(resource, preferredEncoding) {
+    getUnvalidatedEncodingForResource(resource, preferredEncoding) {
         let fileEncoding;
         const override = this.getEncodingOverride(resource);
         if (override) {
@@ -591,15 +595,17 @@ let EncodingOracle = class EncodingOracle extends Disposable {
         else {
             fileEncoding = this.textResourceConfigurationService.getValue(resource, 'files.encoding');
         }
-        if (fileEncoding !== UTF8) {
-            if (!fileEncoding || !(await encodingExists(fileEncoding))) {
-                fileEncoding = UTF8;
-            }
+        return fileEncoding || UTF8;
+    }
+    async getValidatedEncodingForResource(resource, preferredEncoding) {
+        let fileEncoding = this.getUnvalidatedEncodingForResource(resource, preferredEncoding);
+        if (fileEncoding !== UTF8 && !(await encodingExists(fileEncoding))) {
+            fileEncoding = UTF8;
         }
         return fileEncoding;
     }
     getEncodingOverride(resource) {
-        if (this.encodingOverrides?.length) {
+        if (resource && this.encodingOverrides?.length) {
             for (const override of this.encodingOverrides) {
                 if (override.parent && this.uriIdentityService.extUri.isEqualOrParent(resource, override.parent)) {
                     return override.encoding;

package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModelManager.d.ts

@@ -2,7 +2,7 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { TextFileEditorModel } from "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common/vscode/vs/workbench/services/textfile/common/textFileEditorModel";
 import { IDisposable, Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ITextFileEditorModel, ITextFileEditorModelManager, ITextFileEditorModelResolveOrCreateOptions, ITextFileResolveEvent, ITextFileSaveEvent, ITextFileSaveParticipant } from "@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-common/vscode/vs/workbench/services/textfile/common/textfiles";
+import { ITextFileEditorModel, ITextFileEditorModelManager, ITextFileEditorModelResolveOrCreateOptions, ITextFileResolveEvent, ITextFileSaveEvent, ITextFileSaveParticipant } from "@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common/vscode/vs/workbench/services/textfile/common/textfiles";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";

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

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

package/vscode/src/vs/workbench/services/textfile/common/textFileSaveParticipant.d.ts

@@ -2,7 +2,7 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IProgress, IProgressStep } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress";
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
-import { ITextFileSaveParticipant, ITextFileEditorModel, ITextFileSaveParticipantContext } from "@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-common/vscode/vs/workbench/services/textfile/common/textfiles";
+import { ITextFileSaveParticipant, ITextFileEditorModel, ITextFileSaveParticipantContext } from "@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common/vscode/vs/workbench/services/textfile/common/textfiles";
 import { IDisposable, Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 export declare class TextFileSaveParticipant extends Disposable {
     private readonly logService;

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

@@ -26,16 +26,21 @@ let TextFileSaveParticipant = class TextFileSaveParticipant extends Disposable {
         const cts = ( new CancellationTokenSource(token));
         model.textEditorModel?.pushStackElement();
         progress.report({
-            message: ( localize(12016, "Running Code Actions and Formatters..."))
+            message: ( localize(12127, "Running Code Actions and Formatters..."))
         });
         let bubbleCancel = false;
         await this.progressService.withProgress({
             priority: NotificationPriority.URGENT,
             location: ProgressLocation.Notification,
-            cancellable: ( localize(12017, "Skip")),
+            cancellable: ( localize(12128, "Skip")),
             delay: model.isDirty() ? 5000 : 3000
         }, async (progress) => {
-            for (const saveParticipant of this.saveParticipants) {
+            const participants = Array.from(this.saveParticipants).sort((a, b) => {
+                const aValue = a.ordinal ?? 0;
+                const bValue = b.ordinal ?? 0;
+                return aValue - bValue;
+            });
+            for (const saveParticipant of participants) {
                 if (cts.token.isCancellationRequested || !model.textEditorModel ) {
                     break;
                 }