@codingame/monaco-vscode-base-service-override 6.0.3 → 7.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-base-service-override",
-  "version": "6.0.3",
+  "version": "7.0.1",
   "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.1"
   }
 }

package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js

@@ -198,17 +198,17 @@ function getColor(color) {
 }
 let DecorationsService = class DecorationsService {
     constructor(uriIdentityService, themeService) {
-        this._onDidChangeDecorationsDelayed = ( (new DebounceEmitter({ merge: all => all.flat() })));
-        this._onDidChangeDecorations = ( (new Emitter()));
+        this._store = ( (new DisposableStore()));
+        this._onDidChangeDecorationsDelayed = this._store.add(( (new DebounceEmitter({ merge: all => all.flat() }))));
+        this._onDidChangeDecorations = this._store.add(( (new Emitter())));
         this.onDidChangeDecorations = this._onDidChangeDecorations.event;
         this._provider = ( (new LinkedList()));
         this._decorationStyles = ( (new DecorationStyles(themeService)));
         this._data = TernarySearchTree.forUris(key => uriIdentityService.extUri.ignorePathCasing(key));
-        this._onDidChangeDecorationsDelayed.event(event => { this._onDidChangeDecorations.fire(( (new FileDecorationChangeEvent(event)))); });
+        this._store.add(this._onDidChangeDecorationsDelayed.event(event => { this._onDidChangeDecorations.fire(( (new FileDecorationChangeEvent(event)))); }));
     }
     dispose() {
-        this._onDidChangeDecorations.dispose();
-        this._onDidChangeDecorationsDelayed.dispose();
+        this._store.dispose();
         this._data.clear();
     }
     registerDecorationsProvider(provider) {

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.js

@@ -1,19 +1,13 @@
 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/workingCopy/common/storedFileWorkingCopySaveParticipant";
 let StoredFileWorkingCopySaveParticipant = class StoredFileWorkingCopySaveParticipant extends Disposable {
     get length() { return this.saveParticipants.length; }
-    constructor(progressService, logService) {
+    constructor(logService) {
         super();
-        this.progressService = progressService;
         this.logService = logService;
         this.saveParticipants = [];
     }
@@ -21,41 +15,29 @@ let StoredFileWorkingCopySaveParticipant = class StoredFileWorkingCopySavePartic
         const remove = insert(this.saveParticipants, participant);
         return toDisposable(() => remove());
     }
-    participate(workingCopy, context, token) {
-        const cts = ( (new CancellationTokenSource(token)));
-        return this.progressService.withProgress({
-            title: ( localizeWithPath(_moduleId, 0, "Saving '{0}'", workingCopy.name)),
-            location: ProgressLocation.Notification,
-            cancellable: true,
-            delay: workingCopy.isDirty() ? 3000 : 5000
-        }, async (progress) => {
-            workingCopy.model?.pushStackElement();
-            for (const saveParticipant of this.saveParticipants) {
-                if (cts.token.isCancellationRequested || workingCopy.isDisposed()) {
-                    break;
-                }
-                try {
-                    const promise = saveParticipant.participate(workingCopy, context, progress, cts.token);
-                    await raceCancellation(promise, cts.token);
-                }
-                catch (err) {
-                    this.logService.warn(err);
-                }
+    async participate(workingCopy, context, progress, token) {
+        workingCopy.model?.pushStackElement();
+        for (const saveParticipant of this.saveParticipants) {
+            if (token.isCancellationRequested || workingCopy.isDisposed()) {
+                break;
             }
-            workingCopy.model?.pushStackElement();
-            cts.dispose();
-        }, () => {
-            cts.dispose(true);
-        });
+            try {
+                const promise = saveParticipant.participate(workingCopy, context, progress, token);
+                await raceCancellation(promise, token);
+            }
+            catch (err) {
+                this.logService.warn(err);
+            }
+        }
+        workingCopy.model?.pushStackElement();
     }
     dispose() {
         this.saveParticipants.splice(0, this.saveParticipants.length);
         super.dispose();
     }
 };
-StoredFileWorkingCopySaveParticipant = ( (__decorate([
-    ( (__param(0, IProgressService))),
-    ( (__param(1, ILogService)))
-], StoredFileWorkingCopySaveParticipant)));
+StoredFileWorkingCopySaveParticipant = ( __decorate([
+    ( __param(0, ILogService))
+], StoredFileWorkingCopySaveParticipant));
 
 export { StoredFileWorkingCopySaveParticipant };

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileService.js

@@ -155,8 +155,8 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
     addSaveParticipant(participant) {
         return this.saveParticipants.addSaveParticipant(participant);
     }
-    runSaveParticipants(workingCopy, context, token) {
-        return this.saveParticipants.participate(workingCopy, context, token);
+    runSaveParticipants(workingCopy, context, progress, token) {
+        return this.saveParticipants.participate(workingCopy, context, progress, token);
     }
     registerWorkingCopyProvider(provider) {
         const remove = insert(this.workingCopyProviders, provider);