@codingame/monaco-vscode-files-service-override 6.0.3 → 7.0.0

package/package.json

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

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

@@ -224,7 +224,10 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
     doGetDecodedStream(resource, stream, options) {
         return toDecodeStream(stream, {
             acceptTextOnly: options?.acceptTextOnly ?? false,
-            guessEncoding: options?.autoGuessEncoding || this.textResourceConfigurationService.getValue(resource, 'files.autoGuessEncoding'),
+            guessEncoding: options?.autoGuessEncoding ||
+                this.textResourceConfigurationService.getValue(resource, 'files.autoGuessEncoding'),
+            candidateGuessEncodings: options?.candidateGuessEncodings ||
+                this.textResourceConfigurationService.getValue(resource, 'files.candidateGuessEncodings'),
             overwriteEncoding: async (detectedEncoding) => {
                 const { encoding } = await this.encoding.getPreferredReadEncoding(resource, options, detectedEncoding ?? undefined);
                 return encoding;

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

@@ -368,8 +368,8 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
     addSaveParticipant(participant) {
         return this.saveParticipants.addSaveParticipant(participant);
     }
-    runSaveParticipants(model, context, token) {
-        return this.saveParticipants.participate(model, context, token);
+    runSaveParticipants(model, context, progress, token) {
+        return this.saveParticipants.participate(model, context, progress, token);
     }
     canDispose(model) {
         if (model.isDisposed() ||

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

@@ -1,18 +1,12 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { raceCancellation } from 'vscode/vscode/vs/base/common/async';
-import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
-import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { insert } from 'vscode/vscode/vs/base/common/arrays';
 
-const _moduleId = "vs/workbench/services/textfile/common/textFileSaveParticipant";
 let TextFileSaveParticipant = class TextFileSaveParticipant extends Disposable {
-    constructor(progressService, logService) {
+    constructor(logService) {
         super();
-        this.progressService = progressService;
         this.logService = logService;
         this.saveParticipants = [];
     }
@@ -20,42 +14,29 @@ let TextFileSaveParticipant = class TextFileSaveParticipant extends Disposable {
         const remove = insert(this.saveParticipants, participant);
         return toDisposable(() => remove());
     }
-    participate(model, context, token) {
-        const cts = ( (new CancellationTokenSource(token)));
-        return this.progressService.withProgress({
-            title: ( localizeWithPath(_moduleId, 0, "Saving '{0}'", model.name)),
-            location: ProgressLocation.Notification,
-            cancellable: true,
-            delay: model.isDirty() ? 3000 : 5000
-        }, async (progress) => {
-            model.textEditorModel?.pushStackElement();
-            for (const saveParticipant of this.saveParticipants) {
-                if (cts.token.isCancellationRequested || !model.textEditorModel ) {
-                    break;
-                }
-                try {
-                    const promise = saveParticipant.participate(model, context, progress, cts.token);
-                    await raceCancellation(promise, cts.token);
-                }
-                catch (err) {
-                    this.logService.error(err);
-                }
+    async participate(model, context, progress, token) {
+        model.textEditorModel?.pushStackElement();
+        for (const saveParticipant of this.saveParticipants) {
+            if (token.isCancellationRequested || !model.textEditorModel ) {
+                break;
             }
-            model.textEditorModel?.pushStackElement();
-        }, () => {
-            cts.cancel();
-        }).finally(() => {
-            cts.dispose();
-        });
+            try {
+                const promise = saveParticipant.participate(model, context, progress, token);
+                await raceCancellation(promise, token);
+            }
+            catch (err) {
+                this.logService.error(err);
+            }
+        }
+        model.textEditorModel?.pushStackElement();
     }
     dispose() {
         this.saveParticipants.splice(0, this.saveParticipants.length);
         super.dispose();
     }
 };
-TextFileSaveParticipant = ( (__decorate([
-    ( (__param(0, IProgressService))),
-    ( (__param(1, ILogService)))
-], TextFileSaveParticipant)));
+TextFileSaveParticipant = ( __decorate([
+    ( __param(0, ILogService))
+], TextFileSaveParticipant));
 
 export { TextFileSaveParticipant };