@codingame/monaco-vscode-files-service-override 13.1.7 → 14.0.1

package/index.js

@@ -19,11 +19,10 @@ import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/netw
 import { IndexedDBFileSystemProvider } from './vscode/src/vs/platform/files/browser/indexedDBFileSystemProvider.js';
 import { IndexedDB } from '@codingame/monaco-vscode-2f06fe84-148e-5e6b-a7ca-c7989c5f128a-common/vscode/vs/base/browser/indexedDB';
 export { IndexedDB } from '@codingame/monaco-vscode-2f06fe84-148e-5e6b-a7ca-c7989c5f128a-common/vscode/vs/base/browser/indexedDB';
-import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 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-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
+import { FilesConfigurationService } from '@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-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';
@@ -752,23 +751,11 @@ class FileServiceOverride extends FileService {
             }
         }
     }
-    async initialize(telemetryService) {
-        for (const { scheme } of this.listCapabilities()) {
-            const provider = this.getProvider(scheme);
-            if (provider instanceof IndexedDBFileSystemProvider) {
-                this._register(provider.onReportError((e) => telemetryService.publicLog2('indexedDBFileSystemProviderError', e)));
-            }
-        }
-    }
 }
 FileServiceOverride.$di$dependencies = [];
 const fileLogger = new BufferLogger();
 registerServiceInitializePreParticipant(async (accessor) => {
     fileLogger.logger = accessor.get(ILogService);
-    const fileService = accessor.get(IFileService);
-    if (fileService instanceof FileServiceOverride) {
-        fileService.initialize(accessor.get(ITelemetryService));
-    }
 });
 function getServiceOverride() {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-files-service-override",
-  "version": "13.1.7",
+  "version": "14.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - files service-override",
   "keywords": [],
@@ -15,14 +15,15 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "13.1.7",
-    "@codingame/monaco-vscode-15626ec7-b165-51e1-8caf-7bcc2ae9b95a-common": "13.1.7",
-    "@codingame/monaco-vscode-2e67e044-0db9-5fa6-8bd1-3737a7d586d4-common": "13.1.7",
-    "@codingame/monaco-vscode-2f06fe84-148e-5e6b-a7ca-c7989c5f128a-common": "13.1.7",
-    "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common": "13.1.7",
-    "@codingame/monaco-vscode-api": "13.1.7",
-    "@codingame/monaco-vscode-cea4d01f-6526-5c2f-8b09-b168fead499f-common": "13.1.7",
-    "@codingame/monaco-vscode-e7080bda-ce3e-5243-9a35-98cd9634dbda-common": "13.1.7"
+    "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "14.0.1",
+    "@codingame/monaco-vscode-15626ec7-b165-51e1-8caf-7bcc2ae9b95a-common": "14.0.1",
+    "@codingame/monaco-vscode-2e67e044-0db9-5fa6-8bd1-3737a7d586d4-common": "14.0.1",
+    "@codingame/monaco-vscode-2f06fe84-148e-5e6b-a7ca-c7989c5f128a-common": "14.0.1",
+    "@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common": "14.0.1",
+    "@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-common": "14.0.1",
+    "@codingame/monaco-vscode-api": "14.0.1",
+    "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common": "14.0.1",
+    "@codingame/monaco-vscode-cea4d01f-6526-5c2f-8b09-b168fead499f-common": "14.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/files/browser/indexedDBFileSystemProvider.d.ts

@@ -3,30 +3,6 @@ import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IFileDeleteOptions, IFileOverwriteOptions, FileSystemProviderCapabilities, FileType, IFileWriteOptions, IFileChange, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files";
 import { IndexedDB } from "@codingame/monaco-vscode-2f06fe84-148e-5e6b-a7ca-c7989c5f128a-common/vscode/vs/base/browser/indexedDB";
-export type IndexedDBFileSystemProviderErrorDataClassification = {
-    owner: "sandy081";
-    comment: "Information about errors that occur in the IndexedDB file system provider";
-    readonly scheme: {
-        classification: "SystemMetaData";
-        purpose: "FeatureInsight";
-        comment: "IndexedDB file system provider scheme for which this error occurred";
-    };
-    readonly operation: {
-        classification: "SystemMetaData";
-        purpose: "FeatureInsight";
-        comment: "operation during which this error occurred";
-    };
-    readonly code: {
-        classification: "SystemMetaData";
-        purpose: "PerformanceAndHealth";
-        comment: "error code";
-    };
-};
-export type IndexedDBFileSystemProviderErrorData = {
-    readonly scheme: string;
-    readonly operation: string;
-    readonly code: string;
-};
 type DirEntry = [
     string,
     FileType
@@ -41,8 +17,6 @@ export declare class IndexedDBFileSystemProvider extends Disposable implements I
     private readonly changesBroadcastChannel;
     private readonly _onDidChangeFile;
     readonly onDidChangeFile: Event<readonly IFileChange[]>;
-    private readonly _onReportError;
-    readonly onReportError: Event<IndexedDBFileSystemProviderErrorData>;
     private readonly mtimes;
     private cachedFiletree;
     private writeManyThrottler;
@@ -63,6 +37,5 @@ export declare class IndexedDBFileSystemProvider extends Disposable implements I
     private writeMany;
     private deleteKeys;
     reset(): Promise<void>;
-    private reportError;
 }
 export {};

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

@@ -7,17 +7,16 @@ import { ExtUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resou
 import { isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 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, FileSystemProviderError } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
-import { DBClosedError } from '@codingame/monaco-vscode-2f06fe84-148e-5e6b-a7ca-c7989c5f128a-common/vscode/vs/base/browser/indexedDB';
-import { BroadcastDataChannel } from '@codingame/monaco-vscode-e7080bda-ce3e-5243-9a35-98cd9634dbda-common/vscode/vs/base/browser/broadcast';
+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';
 
-const ERR_FILE_NOT_FOUND = createFileSystemProviderError(( localize(1741, "File does not exist")), FileSystemProviderErrorCode.FileNotFound);
-const ERR_FILE_IS_DIR = createFileSystemProviderError(( localize(1742, "File is Directory")), FileSystemProviderErrorCode.FileIsADirectory);
-const ERR_FILE_NOT_DIR = createFileSystemProviderError(( localize(1743, "File is not a directory")), FileSystemProviderErrorCode.FileNotADirectory);
-const ERR_DIR_NOT_EMPTY = createFileSystemProviderError(( localize(1744, "Directory is not empty")), FileSystemProviderErrorCode.Unknown);
-const ERR_FILE_EXCEEDS_STORAGE_QUOTA = createFileSystemProviderError(( localize(1745, "File exceeds available storage quota")), FileSystemProviderErrorCode.FileExceedsStorageQuota);
+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_UNKNOWN_INTERNAL = (message) => createFileSystemProviderError(( localize(
-    1746,
+    1781,
     "Internal error occurred in IndexedDB File System Provider. ({0})",
     message
 )), FileSystemProviderErrorCode.Unknown);
@@ -142,8 +141,6 @@ class IndexedDBFileSystemProvider extends Disposable {
         this.extUri = ( new ExtUri(() => false)) ;
         this._onDidChangeFile = this._register(( new Emitter()));
         this.onDidChangeFile = this._onDidChangeFile.event;
-        this._onReportError = this._register(( new Emitter()));
-        this.onReportError = this._onReportError.event;
         this.mtimes = ( new Map());
         this.fileWriteBatch = [];
         this.writeManyThrottler = ( new Throttler());
@@ -201,7 +198,6 @@ class IndexedDBFileSystemProvider extends Disposable {
             }
         }
         catch (error) {
-            this.reportError('readDir', error);
             throw error;
         }
     }
@@ -220,7 +216,6 @@ class IndexedDBFileSystemProvider extends Disposable {
             return buffer;
         }
         catch (error) {
-            this.reportError('readFile', error);
             throw error;
         }
     }
@@ -233,7 +228,6 @@ class IndexedDBFileSystemProvider extends Disposable {
             await this.bulkWrite([[resource, content]]);
         }
         catch (error) {
-            this.reportError('writeFile', error);
             throw error;
         }
     }
@@ -378,9 +372,6 @@ class IndexedDBFileSystemProvider extends Disposable {
     async reset() {
         await this.indexedDB.runInTransaction(this.store, 'readwrite', objectStore => objectStore.clear());
     }
-    reportError(operation, error) {
-        this._onReportError.fire({ scheme: this.scheme, operation, code: error instanceof FileSystemProviderError || error instanceof DBClosedError ? error.code : 'unknown' });
-    }
 }
 
 export { IndexedDBFileSystemProvider };

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(
-                    1747,
+                    1782,
                     "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(
-                1748,
+                1783,
                 "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(
-                1749,
+                1784,
                 "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(
-                    1750,
+                    1785,
                     "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(
-                1751,
+                1786,
                 "Unable to create file '{0}' that already exists when overwrite flag is not set",
                 this.resourceForError(resource)
             )), FileOperationResult.FILE_MODIFIED_SINCE, options));
@@ -356,7 +356,7 @@ let FileService = class FileService extends Disposable {
         }
         catch (error) {
             throw ( new FileOperationError(( localize(
-                1752,
+                1787,
                 "Unable to write file '{0}' ({1})",
                 this.resourceForError(resource),
                 (ensureFileSystemProviderError(error).toString())
@@ -368,7 +368,7 @@ let FileService = class FileService extends Disposable {
         const unlock = !!options?.unlock;
         if (unlock && !(provider.capabilities & FileSystemProviderCapabilities.FileWriteUnlock)) {
             throw ( new Error(( localize(
-                1753,
+                1788,
                 "Unable to unlock file '{0}' because provider does not support it.",
                 this.resourceForError(resource)
             ))));
@@ -377,21 +377,21 @@ let FileService = class FileService extends Disposable {
         if (atomic) {
             if (!(provider.capabilities & FileSystemProviderCapabilities.FileAtomicWrite)) {
                 throw ( new Error(( localize(
-                    1754,
+                    1789,
                     "Unable to atomically write file '{0}' because provider does not support it.",
                     this.resourceForError(resource)
                 ))));
             }
             if (!(provider.capabilities & FileSystemProviderCapabilities.FileReadWrite)) {
                 throw ( new Error(( localize(
-                    1755,
+                    1790,
                     "Unable to atomically write file '{0}' because provider does not support unbuffered writes.",
                     this.resourceForError(resource)
                 ))));
             }
             if (unlock) {
                 throw ( new Error(( localize(
-                    1756,
+                    1791,
                     "Unable to unlock file '{0}' because atomic write is enabled.",
                     this.resourceForError(resource)
                 ))));
@@ -406,7 +406,7 @@ let FileService = class FileService extends Disposable {
         }
         if ((stat.type & FileType.Directory) !== 0) {
             throw ( new FileOperationError(( localize(
-                1757,
+                1792,
                 "Unable to write file '{0}' that is actually a directory",
                 this.resourceForError(resource)
             )), FileOperationResult.FILE_IS_DIRECTORY, options));
@@ -415,7 +415,7 @@ let FileService = class FileService extends Disposable {
         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(1758, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options));
+            throw ( new FileOperationError(( localize(1793, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options));
         }
         return stat;
     }
@@ -497,7 +497,7 @@ let FileService = class FileService extends Disposable {
     }
     restoreReadError(error, resource, options) {
         const message = ( localize(
-            1759,
+            1794,
             "Unable to read file '{0}' ({1})",
             this.resourceForError(resource),
             (ensureFileSystemProviderError(error).toString())
@@ -557,13 +557,13 @@ let FileService = class FileService extends Disposable {
         const stat = await this.resolve(resource, { resolveMetadata: true });
         if (stat.isDirectory) {
             throw ( new FileOperationError(( localize(
-                1760,
+                1795,
                 "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(1761, "File not modified since")), stat, options));
+            throw ( new NotModifiedSinceFileOperationError(( localize(1796, "File not modified since")), stat, options));
         }
         this.validateReadFileLimits(resource, stat.size, options);
         return stat;
@@ -571,7 +571,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(
-                1762,
+                1797,
                 "Unable to read file '{0}' that is too large to open",
                 this.resourceForError(resource)
             )), FileOperationResult.FILE_TOO_LARGE, size, options));
@@ -693,7 +693,7 @@ let FileService = class FileService extends Disposable {
             }
             if (isSameResourceWithDifferentPathCase && mode === 'copy') {
                 throw ( new Error(( localize(
-                    1763,
+                    1798,
                     "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 +701,7 @@ let FileService = class FileService extends Disposable {
             }
             if (!isSameResourceWithDifferentPathCase && providerExtUri.isEqualOrParent(target, source)) {
                 throw ( new Error(( localize(
-                    1764,
+                    1799,
                     "Unable to move/copy when source '{0}' is parent of target '{1}'.",
                     this.resourceForError(source),
                     this.resourceForError(target)
@@ -712,7 +712,7 @@ let FileService = class FileService extends Disposable {
         if (exists && !isSameResourceWithDifferentPathCase) {
             if (!overwrite) {
                 throw ( new FileOperationError(( localize(
-                    1765,
+                    1800,
                     "Unable to move/copy '{0}' because target '{1}' already exists at destination.",
                     this.resourceForError(source),
                     this.resourceForError(target)
@@ -722,7 +722,7 @@ let FileService = class FileService extends Disposable {
                 const { providerExtUri } = this.getExtUri(sourceProvider);
                 if (providerExtUri.isEqualOrParent(source, target)) {
                     throw ( new Error(( localize(
-                        1766,
+                        1801,
                         "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 +767,7 @@ let FileService = class FileService extends Disposable {
         const useTrash = !!options?.useTrash;
         if (useTrash && !(provider.capabilities & FileSystemProviderCapabilities.Trash)) {
             throw ( new Error(( localize(
-                1767,
+                1802,
                 "Unable to delete file '{0}' via trash because provider does not support it.",
                 this.resourceForError(resource)
             ))));
@@ -775,14 +775,14 @@ let FileService = class FileService extends Disposable {
         const atomic = options?.atomic;
         if (atomic && !(provider.capabilities & FileSystemProviderCapabilities.FileAtomicDelete)) {
             throw ( new Error(( localize(
-                1768,
+                1803,
                 "Unable to delete file '{0}' atomically because provider does not support it.",
                 this.resourceForError(resource)
             ))));
         }
         if (useTrash && atomic) {
             throw ( new Error(( localize(
-                1769,
+                1804,
                 "Unable to atomically delete file '{0}' because using trash is enabled.",
                 this.resourceForError(resource)
             ))));
@@ -798,7 +798,7 @@ let FileService = class FileService extends Disposable {
         }
         else {
             throw ( new FileOperationError(( localize(
-                1770,
+                1805,
                 "Unable to delete nonexistent file '{0}'",
                 this.resourceForError(resource)
             )), FileOperationResult.FILE_NOT_FOUND));
@@ -808,7 +808,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(
-                    1771,
+                    1806,
                     "Unable to delete non-empty folder '{0}'.",
                     this.resourceForError(resource)
                 ))));
@@ -1067,7 +1067,7 @@ let FileService = class FileService extends Disposable {
     throwIfFileSystemIsReadonly(provider, resource) {
         if (provider.capabilities & FileSystemProviderCapabilities.Readonly) {
             throw ( new FileOperationError(( localize(
-                1772,
+                1807,
                 "Unable to modify read-only file '{0}'",
                 this.resourceForError(resource)
             )), FileOperationResult.FILE_PERMISSION_DENIED));
@@ -1077,7 +1077,7 @@ let FileService = class FileService extends Disposable {
     throwIfFileIsReadonly(resource, stat) {
         if ((stat.permissions ?? 0) & FilePermission.Readonly) {
             throw ( new FileOperationError(( localize(
-                1772,
+                1807,
                 "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(1779, "File is too large to open")), FileSystemProviderErrorCode.FileTooLarge);
+        throw createFileSystemProviderError(( localize(1814, "File is too large to open")), FileSystemProviderErrorCode.FileTooLarge);
     }
     return true;
 }

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

@@ -13,12 +13,12 @@ import { IElevatedFileService } from "@codingame/monaco-vscode-api/vscode/vs/wor
 import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
-import { IUntitledTextEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/untitled/common/untitledTextEditorService.service";
+import { IUntitledTextEditorModelManager } from "@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/services/untitled/common/untitledTextEditorService";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IWorkingCopyFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service";
 import { IDecorationsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/decorations/common/decorations.service";
 export declare class BrowserTextFileService extends AbstractTextFileService {
-    constructor(fileService: IFileService, untitledTextEditorService: IUntitledTextEditorService, lifecycleService: ILifecycleService, instantiationService: IInstantiationService, modelService: IModelService, environmentService: IWorkbenchEnvironmentService, dialogService: IDialogService, fileDialogService: IFileDialogService, textResourceConfigurationService: ITextResourceConfigurationService, filesConfigurationService: IFilesConfigurationService, codeEditorService: ICodeEditorService, pathService: IPathService, workingCopyFileService: IWorkingCopyFileService, uriIdentityService: IUriIdentityService, languageService: ILanguageService, elevatedFileService: IElevatedFileService, logService: ILogService, decorationsService: IDecorationsService);
+    constructor(fileService: IFileService, untitledTextEditorService: IUntitledTextEditorModelManager, lifecycleService: ILifecycleService, instantiationService: IInstantiationService, modelService: IModelService, environmentService: IWorkbenchEnvironmentService, dialogService: IDialogService, fileDialogService: IFileDialogService, textResourceConfigurationService: ITextResourceConfigurationService, filesConfigurationService: IFilesConfigurationService, codeEditorService: ICodeEditorService, pathService: IPathService, workingCopyFileService: IWorkingCopyFileService, uriIdentityService: IUriIdentityService, languageService: ILanguageService, elevatedFileService: IElevatedFileService, logService: ILogService, decorationsService: IDecorationsService);
     private registerListeners;
     private onBeforeShutdown;
 }

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { AbstractTextFileService } from './textFileService.js';
-import { TextFileEditorModelState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles';
+import { TextFileEditorModelState } from '@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-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';

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-api/vscode/vs/workbench/services/textfile/common/textfiles";
+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 { 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";
@@ -8,7 +8,6 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 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 { IUntitledTextEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/untitled/common/untitledTextEditorService.service";
 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 { IFileDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
@@ -52,7 +51,7 @@ export declare abstract class AbstractTextFileService extends Disposable impleme
     private static readonly TEXTFILE_SAVE_REPLACE_SOURCE;
     readonly files: ITextFileEditorModelManager;
     readonly untitled: IUntitledTextEditorModelManager;
-    constructor(fileService: IFileService, untitledTextEditorService: IUntitledTextEditorService, lifecycleService: ILifecycleService, instantiationService: IInstantiationService, modelService: IModelService, environmentService: IWorkbenchEnvironmentService, dialogService: IDialogService, fileDialogService: IFileDialogService, textResourceConfigurationService: ITextResourceConfigurationService, filesConfigurationService: IFilesConfigurationService, codeEditorService: ICodeEditorService, pathService: IPathService, workingCopyFileService: IWorkingCopyFileService, uriIdentityService: IUriIdentityService, languageService: ILanguageService, logService: ILogService, elevatedFileService: IElevatedFileService, decorationsService: IDecorationsService);
+    constructor(fileService: IFileService, untitledTextEditorService: IUntitledTextEditorModelManager, lifecycleService: ILifecycleService, instantiationService: IInstantiationService, modelService: IModelService, environmentService: IWorkbenchEnvironmentService, dialogService: IDialogService, fileDialogService: IFileDialogService, textResourceConfigurationService: ITextResourceConfigurationService, filesConfigurationService: IFilesConfigurationService, codeEditorService: ICodeEditorService, pathService: IPathService, workingCopyFileService: IWorkingCopyFileService, uriIdentityService: IUriIdentityService, languageService: ILanguageService, logService: ILogService, elevatedFileService: IElevatedFileService, decorationsService: IDecorationsService);
     private provideDecorations;
     private _encoding;
     get encoding(): EncodingOracle;

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-api/vscode/vs/workbench/services/textfile/common/textfiles';
+import { TextFileEditorModelState, TextFileOperationError, TextFileOperationResult, toBufferOrReadable, stringToSnapshot } from '@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-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';
@@ -22,7 +22,7 @@ import { bufferToStream } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration';
 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-e7080bda-ce3e-5243-9a35-98cd9634dbda-common/vscode/vs/workbench/common/editor/textEditorModel';
+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 { 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';
@@ -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(11774, "File Created"))); }
-    static { this.TEXTFILE_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('textFileOverwrite.source', ( localize(11775, "File Replaced"))); }
+    static { this.TEXTFILE_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('textFileCreate.source', ( localize(11998, "File Created"))); }
+    static { this.TEXTFILE_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('textFileOverwrite.source', ( localize(11999, "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(11776, "Text File Model Decorations"));
+                this.label = ( localize(12000, "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(11777, "Deleted, Read-only")),
+                        tooltip: ( localize(12001, "Deleted, Read-only")),
                     };
                 }
                 else if (isReadonly) {
                     return {
                         letter: Codicon.lockSmall,
-                        tooltip: ( localize(11778, "Read-only")),
+                        tooltip: ( localize(12002, "Read-only")),
                     };
                 }
                 else if (isOrphaned) {
                     return {
                         color: listErrorForeground,
                         strikethrough: true,
-                        tooltip: ( localize(11779, "Deleted")),
+                        tooltip: ( localize(12003, "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(11780, "File seems to be binary and cannot be opened as text")), TextFileOperationResult.FILE_IS_BINARY, options));
+                throw ( new TextFileOperationError(( localize(12004, "File seems to be binary and cannot be opened as text")), TextFileOperationResult.FILE_IS_BINARY, options));
             }
             else {
                 throw error;
@@ -307,6 +307,9 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
         catch (error) {
             this.logService.error(error);
         }
+        if (source.scheme === Schemas.untitled) {
+            this.untitled.notifyDidSave(source, target);
+        }
         return target;
     }
     async doSaveAsTextFile(sourceModel, source, target, options) {
@@ -392,17 +395,17 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                11781,
+                12005,
                 "'{0}' already exists. Do you want to replace it?",
                 basename(resource)
             )),
             detail: ( localize(
-                11782,
+                12006,
                 "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(11783, "&&Replace")),
+            primaryButton: ( localize(12007, "&&Replace")),
         });
         return confirmed;
     }
@@ -410,12 +413,12 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                11784,
+                12008,
                 "'{0}' is marked as read-only. Do you want to save anyway?",
                 basename(resource)
             )),
-            detail: ( localize(11785, "Paths can be configured as read-only via settings.")),
-            primaryButton: ( localize(11786, "&&Save Anyway"))
+            detail: ( localize(12009, "Paths can be configured as read-only via settings.")),
+            primaryButton: ( localize(12010, "&&Save Anyway"))
         });
         return confirmed;
     }

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-api/vscode/vs/workbench/services/textfile/common/textfiles";
+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 { 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(
-                        11790,
+                        12014,
                         "Failed to save '{0}': {1}",
                         model.name,
                         toErrorMessage(error, false)
@@ -148,10 +148,14 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
                         else {
                             targetModelResource = joinPath(target, sourceModelResource.path.substr(source.path.length + 1));
                         }
+                        const languageId = sourceModel.getLanguageId();
                         modelsToRestore.push({
                             source: sourceModelResource,
                             target: targetModelResource,
-                            languageId: sourceModel.getLanguageId(),
+                            language: languageId ? {
+                                id: languageId,
+                                explicit: sourceModel.languageChangeSource === 'user'
+                            } : undefined,
                             encoding: sourceModel.getEncoding(),
                             snapshot: sourceModel.isDirty() ? sourceModel.createSnapshot() : undefined
                         });
@@ -199,11 +203,13 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
                                 contents: modelToRestore.snapshot ? createTextBufferFactoryFromSnapshot(modelToRestore.snapshot) : undefined,
                                 encoding: modelToRestore.encoding
                             });
-                            if (modelToRestore.languageId &&
-                                modelToRestore.languageId !== PLAINTEXT_LANGUAGE_ID &&
-                                restoredModel.getLanguageId() === PLAINTEXT_LANGUAGE_ID &&
-                                extname(target) !== PLAINTEXT_EXTENSION) {
-                                restoredModel.updateTextEditorModel(undefined, modelToRestore.languageId);
+                            if (modelToRestore.language?.id && modelToRestore.language.id !== PLAINTEXT_LANGUAGE_ID) {
+                                if (modelToRestore.language.explicit) {
+                                    restoredModel.setLanguageId(modelToRestore.language.id);
+                                }
+                                else if (restoredModel.getLanguageId() === PLAINTEXT_LANGUAGE_ID && extname(target) !== PLAINTEXT_EXTENSION) {
+                                    restoredModel.updateTextEditorModel(undefined, modelToRestore.language.id);
+                                }
                             }
                         })));
                     }
@@ -256,7 +262,9 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
                             await model.resolve(options);
                         }
                         catch (error) {
-                            onUnexpectedError(error);
+                            if (!model.isDisposed()) {
+                                onUnexpectedError(error);
+                            }
                         }
                     })();
                 }

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-api/vscode/vs/workbench/services/textfile/common/textfiles";
+import { ITextFileSaveParticipant, ITextFileEditorModel, ITextFileSaveParticipantContext } from "@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-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,13 +26,13 @@ let TextFileSaveParticipant = class TextFileSaveParticipant extends Disposable {
         const cts = ( new CancellationTokenSource(token));
         model.textEditorModel?.pushStackElement();
         progress.report({
-            message: ( localize(11791, "Running Code Actions and Formatters..."))
+            message: ( localize(12015, "Running Code Actions and Formatters..."))
         });
         let bubbleCancel = false;
         await this.progressService.withProgress({
             priority: NotificationPriority.URGENT,
             location: ProgressLocation.Notification,
-            cancellable: ( localize(11792, "Skip")),
+            cancellable: ( localize(12016, "Skip")),
             delay: model.isDirty() ? 5000 : 3000
         }, async (progress) => {
             for (const saveParticipant of this.saveParticipants) {