@codingame/monaco-vscode-files-service-override 11.1.2 → 12.0.0

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

@@ -1,12 +1,14 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize } from 'vscode/vscode/vs/nls';
 import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { TextFileEditorModel } from 'vscode/vscode/vs/workbench/services/textfile/common/textFileEditorModel';
+import { TextFileEditorModel } from '@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common/vscode/vs/workbench/services/textfile/common/textFileEditorModel';
 import { Disposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import { FileChangeType, FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ResourceQueue, Promises } from 'vscode/vscode/vs/base/common/async';
 import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
@@ -20,7 +22,7 @@ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/commo
 
 let TextFileEditorModelManager = class TextFileEditorModelManager extends Disposable {
     get models() {
-        return [...( (this.mapResourceToModel.values()))];
+        return [...( this.mapResourceToModel.values())];
     }
     constructor(instantiationService, fileService, notificationService, workingCopyFileService, uriIdentityService) {
         super();
@@ -29,39 +31,39 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
         this.notificationService = notificationService;
         this.workingCopyFileService = workingCopyFileService;
         this.uriIdentityService = uriIdentityService;
-        this._onDidCreate = this._register(( (new Emitter(
+        this._onDidCreate = this._register(( new Emitter(
             { leakWarningThreshold: 500  }
-        ))));
+        )));
         this.onDidCreate = this._onDidCreate.event;
-        this._onDidResolve = this._register(( (new Emitter())));
+        this._onDidResolve = this._register(( new Emitter()));
         this.onDidResolve = this._onDidResolve.event;
-        this._onDidRemove = this._register(( (new Emitter())));
+        this._onDidRemove = this._register(( new Emitter()));
         this.onDidRemove = this._onDidRemove.event;
-        this._onDidChangeDirty = this._register(( (new Emitter())));
+        this._onDidChangeDirty = this._register(( new Emitter()));
         this.onDidChangeDirty = this._onDidChangeDirty.event;
-        this._onDidChangeReadonly = this._register(( (new Emitter())));
+        this._onDidChangeReadonly = this._register(( new Emitter()));
         this.onDidChangeReadonly = this._onDidChangeReadonly.event;
-        this._onDidChangeOrphaned = this._register(( (new Emitter())));
+        this._onDidChangeOrphaned = this._register(( new Emitter()));
         this.onDidChangeOrphaned = this._onDidChangeOrphaned.event;
-        this._onDidSaveError = this._register(( (new Emitter())));
+        this._onDidSaveError = this._register(( new Emitter()));
         this.onDidSaveError = this._onDidSaveError.event;
-        this._onDidSave = this._register(( (new Emitter())));
+        this._onDidSave = this._register(( new Emitter()));
         this.onDidSave = this._onDidSave.event;
-        this._onDidRevert = this._register(( (new Emitter())));
+        this._onDidRevert = this._register(( new Emitter()));
         this.onDidRevert = this._onDidRevert.event;
-        this._onDidChangeEncoding = this._register(( (new Emitter())));
+        this._onDidChangeEncoding = this._register(( new Emitter()));
         this.onDidChangeEncoding = this._onDidChangeEncoding.event;
-        this.mapResourceToModel = ( (new ResourceMap()));
-        this.mapResourceToModelListeners = ( (new ResourceMap()));
-        this.mapResourceToDisposeListener = ( (new ResourceMap()));
-        this.mapResourceToPendingModelResolvers = ( (new ResourceMap()));
-        this.modelResolveQueue = this._register(( (new ResourceQueue())));
+        this.mapResourceToModel = ( new ResourceMap());
+        this.mapResourceToModelListeners = ( new ResourceMap());
+        this.mapResourceToDisposeListener = ( new ResourceMap());
+        this.mapResourceToPendingModelResolvers = ( new ResourceMap());
+        this.modelResolveQueue = this._register(( new ResourceQueue()));
         this.saveErrorHandler = (() => {
             const notificationService = this.notificationService;
             return {
                 onSaveError(error, model) {
                     notificationService.error(( localize(
-                        9983,
+                        11774,
                         "Failed to save '{0}': {1}",
                         model.name,
                         toErrorMessage(error, false)
@@ -69,7 +71,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
                 }
             };
         })();
-        this.mapCorrelationIdToModelsToRestore = ( (new Map()));
+        this.mapCorrelationIdToModelsToRestore = ( new Map());
         this.saveParticipants = this._register(this.instantiationService.createInstance(TextFileSaveParticipant));
         this.registerListeners();
     }
@@ -86,7 +88,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
             if (model.isDirty()) {
                 continue;
             }
-            if (e.contains(model.resource, 0 , 1 )) {
+            if (e.contains(model.resource, FileChangeType.UPDATED, FileChangeType.ADDED)) {
                 this.queueModelReload(model);
             }
         }
@@ -124,7 +126,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
         }
     }
     onWillRunWorkingCopyFileOperation(e) {
-        if (e.operation === 2  || e.operation === 3 ) {
+        if (e.operation === FileOperation.MOVE || e.operation === FileOperation.COPY) {
             const modelsToRestore = [];
             for (const { source, target } of e.files) {
                 if (source) {
@@ -160,7 +162,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
         }
     }
     onDidFailWorkingCopyFileOperation(e) {
-        if (((e.operation === 2  || e.operation === 3) )) {
+        if ((e.operation === FileOperation.MOVE || e.operation === FileOperation.COPY)) {
             const modelsToRestore = this.mapCorrelationIdToModelsToRestore.get(e.correlationId);
             if (modelsToRestore) {
                 this.mapCorrelationIdToModelsToRestore.delete(e.correlationId);
@@ -174,7 +176,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
     }
     onDidRunWorkingCopyFileOperation(e) {
         switch (e.operation) {
-            case 0 :
+            case FileOperation.CREATE:
                 e.waitUntil((async () => {
                     for (const { target } of e.files) {
                         const model = this.get(target);
@@ -184,13 +186,13 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
                     }
                 })());
                 break;
-            case 2 :
-            case 3 :
+            case FileOperation.MOVE:
+            case FileOperation.COPY:
                 e.waitUntil((async () => {
                     const modelsToRestore = this.mapCorrelationIdToModelsToRestore.get(e.correlationId);
                     if (modelsToRestore) {
                         this.mapCorrelationIdToModelsToRestore.delete(e.correlationId);
-                        await Promises.settled(( (modelsToRestore.map(async (modelToRestore) => {
+                        await Promises.settled(( modelsToRestore.map(async (modelToRestore) => {
                             const target = this.uriIdentityService.asCanonicalUri(modelToRestore.target);
                             const restoredModel = await this.resolve(target, {
                                 reload: { async: false },
@@ -203,7 +205,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
                                 extname(target) !== PLAINTEXT_EXTENSION) {
                                 restoredModel.updateTextEditorModel(undefined, modelToRestore.languageId);
                             }
-                        }))));
+                        })));
                     }
                 })());
                 break;
@@ -213,13 +215,11 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
         return this.mapResourceToModel.get(resource);
     }
     has(resource) {
-        return (
-             (this.mapResourceToModel.has(resource))
-        );
+        return ( this.mapResourceToModel.has(resource));
     }
     async reload(model) {
         await this.joinPendingResolves(model.resource);
-        if (model.isDirty() || model.isDisposed() || !( (this.has(model.resource)))) {
+        if (model.isDirty() || model.isDisposed() || !( this.has(model.resource))) {
             return;
         }
         await this.doResolve(model, { reload: { async: false } });
@@ -311,7 +311,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
     }
     async doJoinPendingResolves(resource) {
         let currentModelCopyResolve;
-        while (( (this.mapResourceToPendingModelResolvers.has(resource)))) {
+        while (( this.mapResourceToPendingModelResolvers.has(resource))) {
             const nextPendingModelResolve = this.mapResourceToPendingModelResolvers.get(resource);
             if (nextPendingModelResolve === currentModelCopyResolve) {
                 return;
@@ -325,7 +325,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
         }
     }
     registerModel(model) {
-        const modelListeners = ( (new DisposableStore()));
+        const modelListeners = ( new DisposableStore());
         modelListeners.add(model.onDidResolve(reason => this._onDidResolve.fire({ model, reason })));
         modelListeners.add(model.onDidChangeDirty(() => this._onDidChangeDirty.fire(model)));
         modelListeners.add(model.onDidChangeReadonly(() => this._onDidChangeReadonly.fire(model)));
@@ -370,7 +370,7 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
     }
     canDispose(model) {
         if (model.isDisposed() ||
-            (!( (this.mapResourceToPendingModelResolvers.has(model.resource))) && !model.isDirty())) {
+            (!( this.mapResourceToPendingModelResolvers.has(model.resource)) && !model.isDirty())) {
             return true;
         }
         return this.doCanDispose(model);
@@ -391,18 +391,18 @@ let TextFileEditorModelManager = class TextFileEditorModelManager extends Dispos
         super.dispose();
         this.mapResourceToModel.clear();
         this.mapResourceToPendingModelResolvers.clear();
-        dispose(( (this.mapResourceToDisposeListener.values())));
+        dispose(( this.mapResourceToDisposeListener.values()));
         this.mapResourceToDisposeListener.clear();
-        dispose(( (this.mapResourceToModelListeners.values())));
+        dispose(( this.mapResourceToModelListeners.values()));
         this.mapResourceToModelListeners.clear();
     }
 };
-TextFileEditorModelManager = ( (__decorate([
-    ( (__param(0, IInstantiationService))),
-    ( (__param(1, IFileService))),
-    ( (__param(2, INotificationService))),
-    ( (__param(3, IWorkingCopyFileService))),
-    ( (__param(4, IUriIdentityService)))
-], TextFileEditorModelManager)));
+TextFileEditorModelManager = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IFileService)),
+    ( __param(2, INotificationService)),
+    ( __param(3, IWorkingCopyFileService)),
+    ( __param(4, IUriIdentityService))
+], TextFileEditorModelManager));
 
 export { TextFileEditorModelManager };

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

@@ -0,0 +1,15 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IProgress, IProgressStep } from "vscode/vscode/vs/platform/progress/common/progress";
+import { IProgressService } from "vscode/vscode/vs/platform/progress/common/progress.service";
+import { ITextFileSaveParticipant, ITextFileEditorModel, ITextFileSaveParticipantContext } from "vscode/vscode/vs/workbench/services/textfile/common/textfiles";
+import { IDisposable, Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+export declare class TextFileSaveParticipant extends Disposable {
+    private readonly logService;
+    private readonly progressService;
+    private readonly saveParticipants;
+    constructor(logService: ILogService, progressService: IProgressService);
+    addSaveParticipant(participant: ITextFileSaveParticipant): IDisposable;
+    participate(model: ITextFileEditorModel, context: ITextFileSaveParticipantContext, progress: IProgress<IProgressStep>, token: CancellationToken): Promise<void>;
+    dispose(): void;
+}

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

@@ -1,7 +1,9 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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 { LinkedList } from 'vscode/vscode/vs/base/common/linkedList';
@@ -14,23 +16,23 @@ let TextFileSaveParticipant = class TextFileSaveParticipant extends Disposable {
         super();
         this.logService = logService;
         this.progressService = progressService;
-        this.saveParticipants = ( (new LinkedList()));
+        this.saveParticipants = ( new LinkedList());
     }
     addSaveParticipant(participant) {
         const remove = this.saveParticipants.push(participant);
         return toDisposable(() => remove());
     }
     async participate(model, context, progress, token) {
-        const cts = ( (new CancellationTokenSource(token)));
+        const cts = ( new CancellationTokenSource(token));
         model.textEditorModel?.pushStackElement();
         progress.report({
-            message: ( localize(11516, "Running Code Actions and Formatters..."))
+            message: ( localize(11775, "Running Code Actions and Formatters..."))
         });
         let bubbleCancel = false;
         await this.progressService.withProgress({
             priority: NotificationPriority.URGENT,
-            location: 15 ,
-            cancellable: ( localize(11517, "Skip")),
+            location: ProgressLocation.Notification,
+            cancellable: ( localize(11776, "Skip")),
             delay: model.isDirty() ? 5000 : 3000
         }, async (progress) => {
             for (const saveParticipant of this.saveParticipants) {
@@ -57,7 +59,7 @@ let TextFileSaveParticipant = class TextFileSaveParticipant extends Disposable {
         model.textEditorModel?.pushStackElement();
         cts.dispose();
         if (bubbleCancel) {
-            throw ( (new CancellationError()));
+            throw ( new CancellationError());
         }
     }
     dispose() {
@@ -65,9 +67,9 @@ let TextFileSaveParticipant = class TextFileSaveParticipant extends Disposable {
         super.dispose();
     }
 };
-TextFileSaveParticipant = ( (__decorate([
-    ( (__param(0, ILogService))),
-    ( (__param(1, IProgressService)))
-], TextFileSaveParticipant)));
+TextFileSaveParticipant = ( __decorate([
+    ( __param(0, ILogService)),
+    ( __param(1, IProgressService))
+], TextFileSaveParticipant));
 
 export { TextFileSaveParticipant };