@codingame/monaco-vscode-bulk-edit-service-override 25.1.2 → 26.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-bulk-edit-service-override",
-  "version": "25.1.2",
+  "version": "26.0.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": "25.1.2"
+    "@codingame/monaco-vscode-api": "26.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -41,11 +41,23 @@ function liftEdits(edits) {
         if (ResourceAttachmentEdit.is(edit)) {
             return ResourceAttachmentEdit.lift(edit);
         }
-        throw ( new Error('Unsupported edit'));
+        throw ( new Error("Unsupported edit"));
     }));
 }
 let BulkEdit = class BulkEdit {
-    constructor(_label, _code, _editor, _progress, _token, _edits, _undoRedoGroup, _undoRedoSource, _confirmBeforeUndo, _instaService, _logService) {
+    constructor(
+        _label,
+        _code,
+        _editor,
+        _progress,
+        _token,
+        _edits,
+        _undoRedoGroup,
+        _undoRedoSource,
+        _confirmBeforeUndo,
+        _instaService,
+        _logService
+    ) {
         this._label = _label;
         this._code = _code;
         this._editor = _editor;
@@ -66,30 +78,26 @@ let BulkEdit = class BulkEdit {
             if (edit instanceof ResourceTextEdit) {
                 textEditCount += 1;
                 textEditResources.set(edit.resource, true);
-            }
-            else if (edit instanceof ResourceFileEdit) {
+            } else if (edit instanceof ResourceFileEdit) {
                 otherResources.set(edit.oldResource ?? edit.newResource, true);
             }
         }
         if (this._edits.length === 0) {
-            return localize(4506, "Made no edits");
-        }
-        else if (otherResources.size === 0) {
+            return localize(4516, "Made no edits");
+        } else if (otherResources.size === 0) {
             if (textEditCount > 1 && textEditResources.size > 1) {
                 return localize(
-                    4507,
+                    4517,
                     "Made {0} text edits in {1} files",
                     textEditCount,
                     textEditResources.size
                 );
+            } else {
+                return localize(4518, "Made {0} text edits in one file", textEditCount);
             }
-            else {
-                return localize(4508, "Made {0} text edits in one file", textEditCount);
-            }
-        }
-        else {
+        } else {
             return localize(
-                4509,
+                4519,
                 "Made {0} text edits in {1} files, also created or deleted {2} files",
                 textEditCount,
                 textEditResources.size,
@@ -105,14 +113,20 @@ let BulkEdit = class BulkEdit {
         for (let i = 1; i < this._edits.length; i++) {
             if (Object.getPrototypeOf(this._edits[i - 1]) === Object.getPrototypeOf(this._edits[i])) {
                 ranges[ranges.length - 1]++;
-            }
-            else {
+            } else {
                 ranges.push(1);
             }
         }
         const increment = this._edits.length > 1 ? 0 : undefined;
-        this._progress.report({ increment, total: 100 });
-        const progress = { report: _ => this._progress.report({ increment: 100 / this._edits.length }) };
+        this._progress.report({
+            increment,
+            total: 100
+        });
+        const progress = {
+            report: _ => this._progress.report({
+                increment: 100 / this._edits.length
+            })
+        };
         const resources = [];
         let index = 0;
         for (const range of ranges) {
@@ -121,51 +135,64 @@ let BulkEdit = class BulkEdit {
             }
             const group = this._edits.slice(index, index + range);
             if (group[0] instanceof ResourceFileEdit) {
-                resources.push(await this._performFileEdits(group, this._undoRedoGroup, this._undoRedoSource, this._confirmBeforeUndo, progress));
-            }
-            else if (group[0] instanceof ResourceTextEdit) {
-                resources.push(await this._performTextEdits(group, this._undoRedoGroup, this._undoRedoSource, progress, reason));
-            }
-            else if (group[0] instanceof ResourceNotebookCellEdit) {
-                resources.push(await this._performCellEdits(group, this._undoRedoGroup, this._undoRedoSource, progress));
-            }
-            else if (group[0] instanceof ResourceAttachmentEdit) {
-                resources.push(await this._performOpaqueEdits(group, this._undoRedoGroup, this._undoRedoSource, progress));
-            }
-            else {
-                console.log('UNKNOWN EDIT');
+                resources.push(await this._performFileEdits(
+                    group,
+                    this._undoRedoGroup,
+                    this._undoRedoSource,
+                    this._confirmBeforeUndo,
+                    progress
+                ));
+            } else if (group[0] instanceof ResourceTextEdit) {
+                resources.push(
+                    await this._performTextEdits(group, this._undoRedoGroup, this._undoRedoSource, progress, reason)
+                );
+            } else if (group[0] instanceof ResourceNotebookCellEdit) {
+                resources.push(
+                    await this._performCellEdits(group, this._undoRedoGroup, this._undoRedoSource, progress)
+                );
+            } else if (group[0] instanceof ResourceAttachmentEdit) {
+                resources.push(
+                    await this._performOpaqueEdits(group, this._undoRedoGroup, this._undoRedoSource, progress)
+                );
+            } else {
+                console.log("UNKNOWN EDIT");
             }
             index = index + range;
         }
         return resources.flat();
     }
     async _performFileEdits(edits, undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress) {
-        this._logService.debug('_performFileEdits', JSON.stringify(edits));
-        const model = this._instaService.createInstance(BulkFileEdits, this._label || ( localize(4510, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress, this._token, edits);
+        this._logService.debug("_performFileEdits", JSON.stringify(edits));
+        const model = this._instaService.createInstance(BulkFileEdits, this._label || ( localize(4520, "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(4510, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', this._editor, undoRedoGroup, undoRedoSource, progress, this._token, edits);
+        this._logService.debug("_performTextEdits", JSON.stringify(edits));
+        const model = this._instaService.createInstance(BulkTextEdits, this._label || ( localize(4520, "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) {
-        this._logService.debug('_performCellEdits', JSON.stringify(edits));
+        this._logService.debug("_performCellEdits", JSON.stringify(edits));
         const model = this._instaService.createInstance(BulkCellEdits, undoRedoGroup, undoRedoSource, progress, this._token, edits);
         return await model.apply();
     }
     async _performOpaqueEdits(edits, undoRedoGroup, undoRedoSource, progress) {
-        this._logService.debug('_performOpaqueEdits', JSON.stringify(edits));
+        this._logService.debug("_performOpaqueEdits", JSON.stringify(edits));
         const model = this._instaService.createInstance(OpaqueEdits, undoRedoGroup, undoRedoSource, progress, this._token, edits);
         return await model.apply();
     }
 };
-BulkEdit = ( __decorate([
-    ( __param(9, IInstantiationService)),
-    ( __param(10, ILogService))
-], BulkEdit));
+BulkEdit = ( __decorate([( __param(9, IInstantiationService)), ( __param(10, ILogService))], BulkEdit));
 let BulkEditService = class BulkEditService {
-    constructor(_instaService, _logService, _editorService, _lifecycleService, _dialogService, _workingCopyService, _configService) {
+    constructor(
+        _instaService,
+        _logService,
+        _editorService,
+        _lifecycleService,
+        _dialogService,
+        _workingCopyService,
+        _configService
+    ) {
         this._instaService = _instaService;
         this._logService = _logService;
         this._editorService = _editorService;
@@ -189,7 +216,10 @@ let BulkEditService = class BulkEditService {
     async apply(editsIn, options) {
         let edits = liftEdits(Array.isArray(editsIn) ? editsIn : editsIn.edits);
         if (edits.length === 0) {
-            return { ariaSummary: ( localize(4511, "Made no edits")), isApplied: false };
+            return {
+                ariaSummary: ( localize(4521, "Made no edits")),
+                isApplied: false
+            };
         }
         if (this._previewHandler && (options?.showPreview || ( edits.some(value => value.metadata?.needsConfirmation)))) {
             edits = await this._previewHandler(edits, options);
@@ -199,8 +229,7 @@ let BulkEditService = class BulkEditService {
             const candidate = this._editorService.activeTextEditorControl;
             if (isCodeEditor(candidate)) {
                 codeEditor = candidate;
-            }
-            else if (isDiffEditor(candidate)) {
+            } else if (isDiffEditor(candidate)) {
                 codeEditor = candidate.getModifiedEditor();
             }
         }
@@ -208,8 +237,8 @@ let BulkEditService = class BulkEditService {
             codeEditor = undefined;
         }
         let undoRedoGroup;
-        let undoRedoGroupRemove = () => { };
-        if (typeof options?.undoRedoGroupId === 'number') {
+        let undoRedoGroupRemove = () => {};
+        if (typeof options?.undoRedoGroupId === "number") {
             for (const candidate of this._activeUndoRedoGroups) {
                 if (candidate.id === options.undoRedoGroupId) {
                     undoRedoGroup = candidate;
@@ -222,35 +251,47 @@ let BulkEditService = class BulkEditService {
             undoRedoGroupRemove = this._activeUndoRedoGroups.push(undoRedoGroup);
         }
         const label = options?.quotableLabel || options?.label;
-        const bulkEdit = this._instaService.createInstance(BulkEdit, label, options?.code, codeEditor, options?.progress ?? Progress.None, options?.token ?? CancellationToken.None, edits, undoRedoGroup, options?.undoRedoSource, !!options?.confirmBeforeUndo);
+        const bulkEdit = this._instaService.createInstance(
+            BulkEdit,
+            label,
+            options?.code,
+            codeEditor,
+            options?.progress ?? Progress.None,
+            options?.token ?? CancellationToken.None,
+            edits,
+            undoRedoGroup,
+            options?.undoRedoSource,
+            !!options?.confirmBeforeUndo
+        );
         let listener;
         try {
-            listener = this._lifecycleService.onBeforeShutdown(e => e.veto(this._shouldVeto(label, e.reason), 'veto.blukEditService'));
+            listener = this._lifecycleService.onBeforeShutdown(e => e.veto(this._shouldVeto(label, e.reason), "veto.blukEditService"));
             const resources = await bulkEdit.perform(options?.reason);
             if (options?.respectAutoSaveConfig && this._configService.getValue(autoSaveSetting) === true && resources.length > 1) {
                 await this._saveAll(resources);
             }
-            return { ariaSummary: bulkEdit.ariaMessage(), isApplied: edits.length > 0 };
-        }
-        catch (err) {
+            return {
+                ariaSummary: bulkEdit.ariaMessage(),
+                isApplied: edits.length > 0
+            };
+        } catch (err) {
             this._logService.error(err);
             throw err;
-        }
-        finally {
+        } finally {
             listener?.dispose();
             undoRedoGroupRemove();
         }
     }
     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') {
+            if (item.status === "rejected") {
                 this._logService.warn(item.reason);
             }
         }
@@ -258,50 +299,42 @@ let BulkEditService = class BulkEditService {
     async _shouldVeto(label, reason) {
         let message;
         switch (reason) {
-            case ShutdownReason.CLOSE:
-                message = ( localize(4512, "Are you sure you want to close the window?"));
-                break;
-            case ShutdownReason.LOAD:
-                message = ( localize(4513, "Are you sure you want to change the workspace?"));
-                break;
-            case ShutdownReason.RELOAD:
-                message = ( localize(4514, "Are you sure you want to reload the window?"));
-                break;
-            default:
-                message = isMacintosh ? ( localize(4515, "Are you sure you want to quit?")) : ( localize(4516, "Are you sure you want to exit?"));
-                break;
+        case ShutdownReason.CLOSE:
+            message = ( localize(4522, "Are you sure you want to close the window?"));
+            break;
+        case ShutdownReason.LOAD:
+            message = ( localize(4523, "Are you sure you want to change the workspace?"));
+            break;
+        case ShutdownReason.RELOAD:
+            message = ( localize(4524, "Are you sure you want to reload the window?"));
+            break;
+        default:
+            message = isMacintosh ? ( localize(4525, "Are you sure you want to quit?")) : ( localize(4526, "Are you sure you want to exit?"));
+            break;
         }
         const result = await this._dialogService.confirm({
             message,
             detail: ( localize(
-                4517,
+                4527,
                 "'{0}' is in progress.",
-                label || ( localize(4518, "File operation"))
-            )),
+                label || ( localize(4528, "File operation"))
+            ))
         });
         return !result.confirmed;
     }
 };
-BulkEditService = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, ILogService)),
-    ( __param(2, IEditorService)),
-    ( __param(3, ILifecycleService)),
-    ( __param(4, IDialogService)),
-    ( __param(5, IWorkingCopyService)),
-    ( __param(6, IConfigurationService))
-], BulkEditService));
-const autoSaveSetting = 'files.refactoring.autoSave';
+BulkEditService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, ILogService)), ( __param(2, IEditorService)), ( __param(3, ILifecycleService)), ( __param(4, IDialogService)), ( __param(5, IWorkingCopyService)), ( __param(6, IConfigurationService))], BulkEditService));
+const autoSaveSetting = "files.refactoring.autoSave";
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
-    id: 'files',
+    id: "files",
     properties: {
         [autoSaveSetting]: {
             description: ( localize(
-                4519,
+                4529,
                 "Controls if files that were part of a refactoring are saved automatically"
             )),
             default: true,
-            type: 'boolean'
+            type: "boolean"
         }
     }
 });