@codingame/monaco-vscode-bulk-edit-service-override 37.2.0 → 37.3.0

package/common.d.ts

@@ -0,0 +1,2 @@
+import { type IEditorOverrideServices } from "@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices";
+export default function getServiceOverride(): IEditorOverrideServices;

package/common.js

@@ -0,0 +1,13 @@
+
+import '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
+import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
+import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service';
+import { BulkEditService } from './vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.js';
+
+function getServiceOverride() {
+    return {
+        [IBulkEditService.toString()]: new SyncDescriptor(BulkEditService, [], true)
+    };
+}
+
+export { getServiceOverride as default };

package/index.d.ts

@@ -1,2 +1 @@
-import { type IEditorOverrideServices } from "@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices";
-export default function getServiceOverride(): IEditorOverrideServices;
+export { default } from "./common.js";

package/index.js

@@ -1,14 +1,3 @@
 
-import '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
-import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
-import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service';
-import { BulkEditService } from './vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.js';
-import './vscode/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.js';
-
-function getServiceOverride() {
-    return {
-        [IBulkEditService.toString()]: new SyncDescriptor(BulkEditService, [], true)
-    };
-}
-
-export { getServiceOverride as default };
+export { default } from './common.js';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-bulk-edit-service-override",
-  "version": "37.2.0",
+  "version": "37.3.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - bulk-edit service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "37.2.0"
+    "@codingame/monaco-vscode-api": "37.3.0"
   },
   "main": "index.js",
   "module": "index.js",
@@ -31,6 +31,14 @@
       "types": "./vscode/src/*.d.ts",
       "default": "./vscode/src/*.js"
     },
+    "./session": {
+      "types": "./session.d.ts",
+      "default": "./session.js"
+    },
+    "./common": {
+      "types": "./common.d.ts",
+      "default": "./common.js"
+    },
     "./*": {
       "types": "./*.d.ts",
       "default": "./*.js"

package/session.d.ts

@@ -0,0 +1 @@
+export { default } from "./common.js";

package/session.js

@@ -0,0 +1,2 @@
+
+export { default } from './common.js';

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.js

@@ -28,7 +28,7 @@ import { ResourceAttachmentEdit, OpaqueEdits } from './opaqueEdits.js';
 import { isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 
 function liftEdits(edits) {
-    return ( edits.map(edit => {
+    return edits.map(edit => {
         if (ResourceTextEdit.is(edit)) {
             return ResourceTextEdit.lift(edit);
         }
@@ -42,7 +42,7 @@ function liftEdits(edits) {
             return ResourceAttachmentEdit.lift(edit);
         }
         throw ( new Error("Unsupported edit"));
-    }));
+    });
 }
 let BulkEdit = class BulkEdit {
     constructor(
@@ -83,21 +83,21 @@ let BulkEdit = class BulkEdit {
             }
         }
         if (this._edits.length === 0) {
-            return localize(5362, "Made no edits");
+            return localize(7334, "Made no edits");
         } else if (otherResources.size === 0) {
             if (textEditCount > 1 && textEditResources.size > 1) {
                 return localize(
-                    5363,
+                    7335,
                     "Made {0} text edits in {1} files",
                     textEditCount,
                     textEditResources.size
                 );
             } else {
-                return localize(5364, "Made {0} text edits in one file", textEditCount);
+                return localize(7336, "Made {0} text edits in one file", textEditCount);
             }
         } else {
             return localize(
-                5365,
+                7337,
                 "Made {0} text edits in {1} files, also created or deleted {2} files",
                 textEditCount,
                 textEditResources.size,
@@ -163,12 +163,12 @@ let BulkEdit = class BulkEdit {
     }
     async _performFileEdits(edits, undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress) {
         this._logService.debug("_performFileEdits", JSON.stringify(edits));
-        const model = this._instaService.createInstance(BulkFileEdits, this._label || ( localize(5366, "Workspace Edit")), this._code || "undoredo.workspaceEdit", undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress, this._token, edits);
+        const model = this._instaService.createInstance(BulkFileEdits, this._label || ( localize(7338, "Workspace Edit")), this._code || "undoredo.workspaceEdit", undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress, this._token, edits);
         return await model.apply();
     }
     async _performTextEdits(edits, undoRedoGroup, undoRedoSource, progress, reason) {
         this._logService.debug("_performTextEdits", JSON.stringify(edits));
-        const model = this._instaService.createInstance(BulkTextEdits, this._label || ( localize(5366, "Workspace Edit")), this._code || "undoredo.workspaceEdit", this._editor, undoRedoGroup, undoRedoSource, progress, this._token, edits);
+        const model = this._instaService.createInstance(BulkTextEdits, this._label || ( localize(7338, "Workspace Edit")), this._code || "undoredo.workspaceEdit", this._editor, undoRedoGroup, undoRedoSource, progress, this._token, edits);
         return await model.apply(reason);
     }
     async _performCellEdits(edits, undoRedoGroup, undoRedoSource, progress) {
@@ -217,7 +217,7 @@ let BulkEditService = class BulkEditService {
         let edits = liftEdits(Array.isArray(editsIn) ? editsIn : editsIn.edits);
         if (edits.length === 0) {
             return {
-                ariaSummary: ( localize(5367, "Made no edits")),
+                ariaSummary: ( localize(7339, "Made no edits")),
                 isApplied: false
             };
         }
@@ -284,11 +284,11 @@ let BulkEditService = class BulkEditService {
     }
     async _saveAll(resources) {
         const set = ( new ResourceSet(resources));
-        const saves = ( this._workingCopyService.dirtyWorkingCopies.map(async copy => {
+        const saves = this._workingCopyService.dirtyWorkingCopies.map(async copy => {
             if (( set.has(copy.resource))) {
                 await copy.save();
             }
-        }));
+        });
         const result = await Promise.allSettled(saves);
         for (const item of result) {
             if (item.status === "rejected") {
@@ -300,24 +300,24 @@ let BulkEditService = class BulkEditService {
         let message;
         switch (reason) {
         case ShutdownReason.CLOSE:
-            message = ( localize(5368, "Are you sure you want to close the window?"));
+            message = ( localize(7340, "Are you sure you want to close the window?"));
             break;
         case ShutdownReason.LOAD:
-            message = ( localize(5369, "Are you sure you want to change the workspace?"));
+            message = ( localize(7341, "Are you sure you want to change the workspace?"));
             break;
         case ShutdownReason.RELOAD:
-            message = ( localize(5370, "Are you sure you want to reload the window?"));
+            message = ( localize(7342, "Are you sure you want to reload the window?"));
             break;
         default:
-            message = isMacintosh ? ( localize(5371, "Are you sure you want to quit?")) : ( localize(5372, "Are you sure you want to exit?"));
+            message = isMacintosh ? ( localize(7343, "Are you sure you want to quit?")) : ( localize(7344, "Are you sure you want to exit?"));
             break;
         }
         const result = await this._dialogService.confirm({
             message,
             detail: ( localize(
-                5373,
+                7345,
                 "'{0}' is in progress.",
-                label || ( localize(5374, "File operation"))
+                label || ( localize(7346, "File operation"))
             ))
         });
         return !result.confirmed;
@@ -330,7 +330,7 @@ const autoSaveSetting = "files.refactoring.autoSave";
     properties: {
         [autoSaveSetting]: {
             description: ( localize(
-                5375,
+                7347,
                 "Controls if files that were part of a refactoring are saved automatically"
             )),
             default: true,

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.js

@@ -67,7 +67,7 @@ let RenameOperation = RenameOperation_1 = class RenameOperation {
         }, this._workingCopyFileService, this._fileService));
     }
     toString() {
-        return `(rename ${( this._edits.map(edit => `${edit.oldUri} to ${edit.newUri}`)).join(", ")})`;
+        return `(rename ${this._edits.map(edit => `${edit.oldUri} to ${edit.newUri}`).join(", ")})`;
     }
 };
 RenameOperation = RenameOperation_1 = ( __decorate([( __param(2, IWorkingCopyFileService)), ( __param(3, IFileService))], RenameOperation));
@@ -129,7 +129,7 @@ let CopyOperation = class CopyOperation {
         });
     }
     toString() {
-        return `(copy ${( this._edits.map(edit => `${edit.oldUri} to ${edit.newUri}`)).join(", ")})`;
+        return `(copy ${this._edits.map(edit => `${edit.oldUri} to ${edit.newUri}`).join(", ")})`;
     }
 };
 CopyOperation = ( __decorate([( __param(2, IWorkingCopyFileService)), ( __param(3, IFileService)), ( __param(4, IInstantiationService))], CopyOperation));
@@ -158,7 +158,7 @@ let CreateOperation = class CreateOperation {
         this._textFileService = _textFileService;
     }
     get uris() {
-        return ( this._edits.map(edit => edit.newUri));
+        return this._edits.map(edit => edit.newUri);
     }
     async perform(token) {
         const folderCreates = [];
@@ -195,9 +195,9 @@ let CreateOperation = class CreateOperation {
         });
     }
     toString() {
-        return `(create ${( this._edits.map(
+        return `(create ${this._edits.map(
     edit => edit.options.folder ? `folder ${edit.newUri}` : `file ${edit.newUri} with ${edit.contents?.byteLength || 0} bytes`
-)).join(", ")})`;
+).join(", ")})`;
     }
 };
 CreateOperation = ( __decorate([( __param(2, IFileService)), ( __param(3, IWorkingCopyFileService)), ( __param(4, IInstantiationService)), ( __param(5, ITextFileService))], CreateOperation));
@@ -228,7 +228,7 @@ let DeleteOperation = class DeleteOperation {
         this._logService = _logService;
     }
     get uris() {
-        return ( this._edits.map(edit => edit.oldUri));
+        return this._edits.map(edit => edit.oldUri);
     }
     async perform(token) {
         const deletes = [];
@@ -278,7 +278,7 @@ let DeleteOperation = class DeleteOperation {
         });
     }
     toString() {
-        return `(delete ${( this._edits.map(edit => edit.oldUri)).join(", ")})`;
+        return `(delete ${this._edits.map(edit => edit.oldUri).join(", ")})`;
     }
 };
 DeleteOperation = ( __decorate([( __param(2, IWorkingCopyFileService)), ( __param(3, IFileService)), ( __param(4, IConfigurationService)), ( __param(5, IInstantiationService)), ( __param(6, ILogService))], DeleteOperation));
@@ -305,7 +305,7 @@ class FileUndoRedoElement {
         }
     }
     toString() {
-        return ( this.operations.map(op => String(op))).join(", ");
+        return this.operations.map(op => String(op)).join(", ");
     }
 }
 let BulkFileEdits = class BulkFileEdits {

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.js

@@ -73,8 +73,8 @@ class ModelEditTask {
     }
     apply(reason) {
         if (this._edits.length > 0) {
-            this._edits = (
-            this._edits.map(this._transformSnippetStringToInsertText, this)).sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
+            this._edits =
+            this._edits.map(this._transformSnippetStringToInsertText, this).sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
             this.model.pushEditOperations(null, this._edits, () => null, undefined, reason);
         }
         if (this._newEol !== undefined) {
@@ -127,8 +127,8 @@ class EditorEditTask extends ModelEditTask {
                     undoStopAfter: false
                 });
             } else {
-                this._edits = (
-                this._edits.map(this._transformSnippetStringToInsertText, this)).sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
+                this._edits =
+                this._edits.map(this._transformSnippetStringToInsertText, this).sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
                 this._editor.executeEdits(reason, this._edits);
             }
         }
@@ -210,7 +210,7 @@ let BulkTextEdits = class BulkTextEdits {
                 }
                 const makeGroupMoreMinimal = async (start, end) => {
                     const oldEdits = edits.slice(start, end);
-                    const newEdits = await this._editorWorker.computeMoreMinimalEdits(ref.object.textEditorModel.uri, ( oldEdits.map(e => e.textEdit)), false);
+                    const newEdits = await this._editorWorker.computeMoreMinimalEdits(ref.object.textEditorModel.uri, oldEdits.map(e => e.textEdit), false);
                     if (!newEdits) {
                         oldEdits.forEach(task.addEdit, task);
                     } else {
@@ -268,7 +268,7 @@ let BulkTextEdits = class BulkTextEdits {
                 }
                 this._progress.report(undefined);
             } else {
-                const multiModelEditStackElement = ( new MultiModelEditStackElement(this._label, this._code, ( tasks.map(t => ( new SingleModelEditStackElement(this._label, this._code, t.model, t.getBeforeCursorState()))))));
+                const multiModelEditStackElement = ( new MultiModelEditStackElement(this._label, this._code, tasks.map(t => ( new SingleModelEditStackElement(this._label, this._code, t.model, t.getBeforeCursorState())))));
                 this._undoRedoService.pushElement(multiModelEditStackElement, this._undoRedoGroup, this._undoRedoSource);
                 for (const task of tasks) {
                     task.apply();

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/conflicts.d.ts

@@ -1,16 +0,0 @@
-import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
-import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { ResourceEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService";
-import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-export declare class ConflictDetector {
-    private readonly _conflicts;
-    private readonly _disposables;
-    private readonly _onDidConflict;
-    readonly onDidConflict: Event<this>;
-    constructor(edits: ResourceEdit[], fileService: IFileService, modelService: IModelService, logService: ILogService);
-    dispose(): void;
-    list(): URI[];
-    hasConflicts(): boolean;
-}

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/conflicts.js

@@ -1,73 +0,0 @@
-
-import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
-import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
-import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { ResourceTextEdit, ResourceFileEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
-import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-
-let ConflictDetector = class ConflictDetector {
-    constructor(edits, fileService, modelService, logService) {
-        this._conflicts = ( new ResourceMap());
-        this._disposables = ( new DisposableStore());
-        this._onDidConflict = ( new Emitter());
-        this.onDidConflict = this._onDidConflict.event;
-        const _workspaceEditResources = ( new ResourceMap());
-        for (const edit of edits) {
-            if (edit instanceof ResourceTextEdit) {
-                _workspaceEditResources.set(edit.resource, true);
-                if (typeof edit.versionId === "number") {
-                    const model = modelService.getModel(edit.resource);
-                    if (model && model.getVersionId() !== edit.versionId) {
-                        this._conflicts.set(edit.resource, true);
-                        this._onDidConflict.fire(this);
-                    }
-                }
-            } else if (edit instanceof ResourceFileEdit) {
-                if (edit.newResource) {
-                    _workspaceEditResources.set(edit.newResource, true);
-                } else if (edit.oldResource) {
-                    _workspaceEditResources.set(edit.oldResource, true);
-                }
-            } else if (edit instanceof ResourceNotebookCellEdit) {
-                _workspaceEditResources.set(edit.resource, true);
-            } else {
-                logService.warn("UNKNOWN edit type", edit);
-            }
-        }
-        this._disposables.add(fileService.onDidFilesChange(e => {
-            for (const uri of ( _workspaceEditResources.keys())) {
-                if (!modelService.getModel(uri) && e.contains(uri)) {
-                    this._conflicts.set(uri, true);
-                    this._onDidConflict.fire(this);
-                    break;
-                }
-            }
-        }));
-        const onDidChangeModel = model => {
-            if (( _workspaceEditResources.has(model.uri))) {
-                this._conflicts.set(model.uri, true);
-                this._onDidConflict.fire(this);
-            }
-        };
-        for (const model of modelService.getModels()) {
-            this._disposables.add(model.onDidChangeContent(() => onDidChangeModel(model)));
-        }
-    }
-    dispose() {
-        this._disposables.dispose();
-        this._onDidConflict.dispose();
-    }
-    list() {
-        return [...( this._conflicts.keys())];
-    }
-    hasConflicts() {
-        return this._conflicts.size > 0;
-    }
-};
-ConflictDetector = ( __decorate([( __param(1, IFileService)), ( __param(2, IModelService)), ( __param(3, ILogService))], ConflictDetector));
-
-export { ConflictDetector };

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.d.ts

@@ -1 +0,0 @@
-export {};