@codingame/monaco-vscode-bulk-edit-service-override 11.1.2 → 12.0.1

package/index.d.ts

@@ -1 +1,2 @@
-export { default } from 'vscode/service-override/bulkEdit';
+import { type IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+export default function getServiceOverride(): IEditorOverrideServices;

package/index.js

@@ -1 +1,14 @@
-export { default } from './bulkEdit.js';
+
+import 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
+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 };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-bulk-edit-service-override",
-  "version": "11.1.2",
+  "version": "12.0.1",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - bulk-edit service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,20 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - bulk-edit service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common": "12.0.1",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "12.0.1",
+    "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common": "12.0.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.1"
+  },
+  "peerDependencies": {
+    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "12.0.1"
+  },
+  "peerDependenciesMeta": {
+    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": {
+      "optional": true
+    }
+  },
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,10 +36,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.2"
   }
 }

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

@@ -0,0 +1,28 @@
+import { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IBulkEditOptions, IBulkEditPreviewHandler, IBulkEditResult, IBulkEditService, ResourceEdit } from "vscode/vscode/vs/editor/browser/services/bulkEditService";
+import { WorkspaceEdit } from "vscode/vscode/vs/editor/common/languages";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IDialogService } from "vscode/vscode/vs/platform/dialogs/common/dialogs.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+import { ILifecycleService } from "vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
+import { IWorkingCopyService } from "vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service";
+export declare class BulkEditService implements IBulkEditService {
+    private readonly _instaService;
+    private readonly _logService;
+    private readonly _editorService;
+    private readonly _lifecycleService;
+    private readonly _dialogService;
+    private readonly _workingCopyService;
+    private readonly _configService;
+    readonly _serviceBrand: undefined;
+    private readonly _activeUndoRedoGroups;
+    private _previewHandler?;
+    constructor(_instaService: IInstantiationService, _logService: ILogService, _editorService: IEditorService, _lifecycleService: ILifecycleService, _dialogService: IDialogService, _workingCopyService: IWorkingCopyService, _configService: IConfigurationService);
+    setPreviewHandler(handler: IBulkEditPreviewHandler): IDisposable;
+    hasPreviewHandler(): boolean;
+    apply(editsIn: ResourceEdit[] | WorkspaceEdit, options?: IBulkEditOptions): Promise<IBulkEditResult>;
+    private _saveAll;
+    private _shouldVeto;
+}

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

@@ -1,41 +1,47 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { LinkedList } from 'vscode/vscode/vs/base/common/linkedList';
 import { ResourceMap, ResourceSet } from 'vscode/vscode/vs/base/common/map';
 import { isCodeEditor, isDiffEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { ResourceTextEdit, ResourceFileEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
+import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { UndoRedoGroup } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
-import { ResourceNotebookCellEdit, BulkCellEdits } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { ResourceNotebookCellEdit, BulkCellEdits } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { BulkFileEdits } from './bulkFileEdits.js';
 import { BulkTextEdits } from './bulkTextEdits.js';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ShutdownReason } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
+import { ResourceAttachmentEdit, OpaqueEdits } from './opaqueEdits.js';
 
 function liftEdits(edits) {
-    return (
-         (edits.map(edit => {
-            if (ResourceTextEdit.is(edit)) {
-                return ResourceTextEdit.lift(edit);
-            }
-            if (ResourceFileEdit.is(edit)) {
-                return ResourceFileEdit.lift(edit);
-            }
-            if (ResourceNotebookCellEdit.is(edit)) {
-                return ResourceNotebookCellEdit.lift(edit);
-            }
-            throw ( (new Error('Unsupported edit')));
-        }))
-    );
+    return ( edits.map(edit => {
+        if (ResourceTextEdit.is(edit)) {
+            return ResourceTextEdit.lift(edit);
+        }
+        if (ResourceFileEdit.is(edit)) {
+            return ResourceFileEdit.lift(edit);
+        }
+        if (ResourceNotebookCellEdit.is(edit)) {
+            return ResourceNotebookCellEdit.lift(edit);
+        }
+        if (ResourceAttachmentEdit.is(edit)) {
+            return ResourceAttachmentEdit.lift(edit);
+        }
+        throw ( new Error('Unsupported edit'));
+    }));
 }
 let BulkEdit = class BulkEdit {
     constructor(_label, _code, _editor, _progress, _token, _edits, _undoRedoGroup, _undoRedoSource, _confirmBeforeUndo, _instaService, _logService) {
@@ -52,8 +58,8 @@ let BulkEdit = class BulkEdit {
         this._logService = _logService;
     }
     ariaMessage() {
-        const otherResources = ( (new ResourceMap()));
-        const textEditResources = ( (new ResourceMap()));
+        const otherResources = ( new ResourceMap());
+        const textEditResources = ( new ResourceMap());
         let textEditCount = 0;
         for (const edit of this._edits) {
             if (edit instanceof ResourceTextEdit) {
@@ -65,29 +71,29 @@ let BulkEdit = class BulkEdit {
             }
         }
         if (this._edits.length === 0) {
-            return ( localize(2110, "Made no edits"));
+            return localize(4061, "Made no edits");
         }
         else if (otherResources.size === 0) {
             if (textEditCount > 1 && textEditResources.size > 1) {
-                return ( localize(
-                    2111,
+                return localize(
+                    4062,
                     "Made {0} text edits in {1} files",
                     textEditCount,
                     textEditResources.size
-                ));
+                );
             }
             else {
-                return ( localize(2112, "Made {0} text edits in one file", textEditCount));
+                return localize(4063, "Made {0} text edits in one file", textEditCount);
             }
         }
         else {
-            return ( localize(
-                2113,
+            return localize(
+                4064,
                 "Made {0} text edits in {1} files, also created or deleted {2} files",
                 textEditCount,
                 textEditResources.size,
                 otherResources.size
-            ));
+            );
         }
     }
     async perform() {
@@ -122,6 +128,9 @@ let BulkEdit = class BulkEdit {
             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');
             }
@@ -131,12 +140,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(2114, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress, this._token, edits);
+        const model = this._instaService.createInstance(BulkFileEdits, this._label || ( localize(4065, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress, this._token, edits);
         return await model.apply();
     }
     async _performTextEdits(edits, undoRedoGroup, undoRedoSource, progress) {
         this._logService.debug('_performTextEdits', JSON.stringify(edits));
-        const model = this._instaService.createInstance(BulkTextEdits, this._label || ( localize(2114, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', this._editor, undoRedoGroup, undoRedoSource, progress, this._token, edits);
+        const model = this._instaService.createInstance(BulkTextEdits, this._label || ( localize(4065, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', this._editor, undoRedoGroup, undoRedoSource, progress, this._token, edits);
         return await model.apply();
     }
     async _performCellEdits(edits, undoRedoGroup, undoRedoSource, progress) {
@@ -144,11 +153,16 @@ let BulkEdit = class BulkEdit {
         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));
+        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) {
         this._instaService = _instaService;
@@ -158,7 +172,7 @@ let BulkEditService = class BulkEditService {
         this._dialogService = _dialogService;
         this._workingCopyService = _workingCopyService;
         this._configService = _configService;
-        this._activeUndoRedoGroups = ( (new LinkedList()));
+        this._activeUndoRedoGroups = ( new LinkedList());
     }
     setPreviewHandler(handler) {
         this._previewHandler = handler;
@@ -174,9 +188,9 @@ let BulkEditService = class BulkEditService {
     async apply(editsIn, options) {
         let edits = liftEdits(Array.isArray(editsIn) ? editsIn : editsIn.edits);
         if (edits.length === 0) {
-            return { ariaSummary: ( localize(2115, "Made no edits")), isApplied: false };
+            return { ariaSummary: ( localize(4066, "Made no edits")), isApplied: false };
         }
-        if (this._previewHandler && (options?.showPreview || ( (edits.some(value => value.metadata?.needsConfirmation))))) {
+        if (this._previewHandler && (options?.showPreview || ( edits.some(value => value.metadata?.needsConfirmation)))) {
             edits = await this._previewHandler(edits, options);
         }
         let codeEditor = options?.editor;
@@ -189,7 +203,7 @@ let BulkEditService = class BulkEditService {
                 codeEditor = candidate.getModifiedEditor();
             }
         }
-        if (codeEditor && codeEditor.getOption(94 )) {
+        if (codeEditor && codeEditor.getOption(EditorOption.readOnly)) {
             codeEditor = undefined;
         }
         let undoRedoGroup;
@@ -203,7 +217,7 @@ let BulkEditService = class BulkEditService {
             }
         }
         if (!undoRedoGroup) {
-            undoRedoGroup = ( (new UndoRedoGroup()));
+            undoRedoGroup = ( new UndoRedoGroup());
             undoRedoGroupRemove = this._activeUndoRedoGroups.push(undoRedoGroup);
         }
         const label = options?.quotableLabel || options?.label;
@@ -227,12 +241,12 @@ let BulkEditService = class BulkEditService {
         }
     }
     async _saveAll(resources) {
-        const set = ( (new ResourceSet(resources)));
-        const saves = ( (this._workingCopyService.dirtyWorkingCopies.map(async (copy) => {
-            if (( (set.has(copy.resource)))) {
+        const set = ( new ResourceSet(resources));
+        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') {
@@ -244,47 +258,51 @@ let BulkEditService = class BulkEditService {
         let message;
         let primaryButton;
         switch (reason) {
-            case 1 :
-                message = ( localize(2116, "Are you sure you want to close the window?"));
-                primaryButton = ( localize(2117, "&&Close Window"));
+            case ShutdownReason.CLOSE:
+                message = ( localize(4067, "Are you sure you want to close the window?"));
+                primaryButton = ( localize(4068, "&&Close Window"));
                 break;
-            case 4 :
-                message = ( localize(2118, "Are you sure you want to change the workspace?"));
-                primaryButton = ( localize(2119, "Change &&Workspace"));
+            case ShutdownReason.LOAD:
+                message = ( localize(4069, "Are you sure you want to change the workspace?"));
+                primaryButton = ( localize(4070, "Change &&Workspace"));
                 break;
-            case 3 :
-                message = ( localize(2120, "Are you sure you want to reload the window?"));
-                primaryButton = ( localize(2121, "&&Reload Window"));
+            case ShutdownReason.RELOAD:
+                message = ( localize(4071, "Are you sure you want to reload the window?"));
+                primaryButton = ( localize(4072, "&&Reload Window"));
                 break;
             default:
-                message = ( localize(2122, "Are you sure you want to quit?"));
-                primaryButton = ( localize(2123, "&&Quit"));
+                message = ( localize(4073, "Are you sure you want to quit?"));
+                primaryButton = ( localize(4074, "&&Quit"));
                 break;
         }
         const result = await this._dialogService.confirm({
             message,
-            detail: ( localize(2124, "'{0}' is in progress.", label || ( localize(2125, "File operation")))),
+            detail: ( localize(
+                4075,
+                "'{0}' is in progress.",
+                label || ( localize(4076, "File operation"))
+            )),
             primaryButton
         });
         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)));
+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({
+( Registry.as(Extensions.Configuration)).registerConfiguration({
     id: 'files',
     properties: {
         [autoSaveSetting]: {
             description: ( localize(
-                2126,
+                4077,
                 "Controls if files that were part of a refactoring are saved automatically"
             )),
             default: true,

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

@@ -0,0 +1,21 @@
+import { IProgress } from "vscode/vscode/vs/platform/progress/common/progress";
+import { UndoRedoGroup, UndoRedoSource } from "vscode/vscode/vs/platform/undoRedo/common/undoRedo";
+import { IUndoRedoService } from "vscode/vscode/vs/platform/undoRedo/common/undoRedo.service";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { ResourceFileEdit } from "vscode/vscode/vs/editor/browser/services/bulkEditService";
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+export declare class BulkFileEdits {
+    private readonly _label;
+    private readonly _code;
+    private readonly _undoRedoGroup;
+    private readonly _undoRedoSource;
+    private readonly _confirmBeforeUndo;
+    private readonly _progress;
+    private readonly _token;
+    private readonly _edits;
+    private readonly _instaService;
+    private readonly _undoRedoService;
+    constructor(_label: string, _code: string, _undoRedoGroup: UndoRedoGroup, _undoRedoSource: UndoRedoSource | undefined, _confirmBeforeUndo: boolean, _progress: IProgress<void>, _token: CancellationToken, _edits: ResourceFileEdit[], _instaService: IInstantiationService, _undoRedoService: IUndoRedoService);
+    apply(): Promise<readonly URI[]>;
+}

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.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 { FileSystemProviderCapabilities } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
+import { UndoRedoElementType } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
 import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
-import { tail } from 'vscode/vscode/vs/base/common/arrays';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 
@@ -219,7 +221,7 @@ let DeleteOperation = class DeleteOperation {
             deletes.push({
                 resource: edit.oldUri,
                 recursive: edit.options.recursive,
-                useTrash: !edit.options.skipTrashBin && this._fileService.hasCapability(edit.oldUri, 4096 ) && this._configurationService.getValue('files.enableTrash')
+                useTrash: !edit.options.skipTrashBin && this._fileService.hasCapability(edit.oldUri, FileSystemProviderCapabilities.Trash) && this._configurationService.getValue('files.enableTrash')
             });
             let fileContent;
             if (!edit.undoesCreate && !edit.options.folder && !(typeof edit.options.maxSize === 'number' && fileStat.size > edit.options.maxSize)) {
@@ -260,7 +262,7 @@ class FileUndoRedoElement {
         this.code = code;
         this.operations = operations;
         this.confirmBeforeUndo = confirmBeforeUndo;
-        this.type = 1 ;
+        this.type = UndoRedoElementType.Workspace;
         this.resources = operations.flatMap(op => op.uris);
     }
     async undo() {
@@ -318,7 +320,7 @@ let BulkFileEdits = class BulkFileEdits {
         groups[0] = [edits[0]];
         for (let i = 1; i < edits.length; i++) {
             const edit = edits[i];
-            const lastGroup = tail(groups);
+            const lastGroup = groups.at(-1);
             if (lastGroup?.[0].type === edit.type) {
                 lastGroup.push(edit);
             }

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

@@ -0,0 +1,29 @@
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { ICodeEditor } from "vscode/vscode/vs/editor/browser/editorBrowser";
+import { ITextModelService } from "vscode/vscode/vs/editor/common/services/resolverService";
+import { IProgress } from "vscode/vscode/vs/platform/progress/common/progress";
+import { IEditorWorkerService } from "vscode/vscode/vs/editor/common/services/editorWorker";
+import { UndoRedoGroup, UndoRedoSource } from "vscode/vscode/vs/platform/undoRedo/common/undoRedo";
+import { IUndoRedoService } from "vscode/vscode/vs/platform/undoRedo/common/undoRedo.service";
+import { IModelService } from "vscode/vscode/vs/editor/common/services/model";
+import { ResourceTextEdit } from "vscode/vscode/vs/editor/browser/services/bulkEditService";
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+export declare class BulkTextEdits {
+    private readonly _label;
+    private readonly _code;
+    private readonly _editor;
+    private readonly _undoRedoGroup;
+    private readonly _undoRedoSource;
+    private readonly _progress;
+    private readonly _token;
+    private readonly _editorWorker;
+    private readonly _modelService;
+    private readonly _textModelResolverService;
+    private readonly _undoRedoService;
+    private readonly _edits;
+    constructor(_label: string, _code: string, _editor: ICodeEditor | undefined, _undoRedoGroup: UndoRedoGroup, _undoRedoSource: UndoRedoSource | undefined, _progress: IProgress<void>, _token: CancellationToken, edits: ResourceTextEdit[], _editorWorker: IEditorWorkerService, _modelService: IModelService, _textModelResolverService: ITextModelService, _undoRedoService: IUndoRedoService);
+    private _validateBeforePrepare;
+    private _createEditsTasks;
+    private _validateTasks;
+    apply(): Promise<readonly URI[]>;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';

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

@@ -0,0 +1,16 @@
+import { IFileService } from "vscode/vscode/vs/platform/files/common/files.service";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IModelService } from "vscode/vscode/vs/editor/common/services/model";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { ResourceEdit } from "vscode/vscode/vs/editor/browser/services/bulkEditService";
+import { ILogService } from "vscode/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,11 +1,12 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { ResourceTextEdit, ResourceFileEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
-import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 
 let ConflictDetector = class ConflictDetector {

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

@@ -0,0 +1,25 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { ResourceEdit } from "vscode/vscode/vs/editor/browser/services/bulkEditService";
+import { ICustomEdit, WorkspaceEditMetadata } from "vscode/vscode/vs/editor/common/languages";
+import { IProgress } from "vscode/vscode/vs/platform/progress/common/progress";
+import { UndoRedoGroup, UndoRedoSource } from "vscode/vscode/vs/platform/undoRedo/common/undoRedo";
+import { IUndoRedoService } from "vscode/vscode/vs/platform/undoRedo/common/undoRedo.service";
+export declare class ResourceAttachmentEdit extends ResourceEdit implements ICustomEdit {
+    readonly resource: URI;
+    readonly undo: () => Promise<void> | void;
+    readonly redo: () => Promise<void> | void;
+    static is(candidate: any): candidate is ICustomEdit;
+    static lift(edit: ICustomEdit): ResourceAttachmentEdit;
+    constructor(resource: URI, undo: () => Promise<void> | void, redo: () => Promise<void> | void, metadata?: WorkspaceEditMetadata);
+}
+export declare class OpaqueEdits {
+    private readonly _undoRedoGroup;
+    private readonly _undoRedoSource;
+    private readonly _progress;
+    private readonly _token;
+    private readonly _edits;
+    private readonly _undoRedoService;
+    constructor(_undoRedoGroup: UndoRedoGroup, _undoRedoSource: UndoRedoSource | undefined, _progress: IProgress<void>, _token: CancellationToken, _edits: ResourceAttachmentEdit[], _undoRedoService: IUndoRedoService);
+    apply(): Promise<readonly URI[]>;
+}

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

@@ -0,0 +1,67 @@
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { isObject } from 'vscode/vscode/vs/base/common/types';
+import { ResourceEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
+import { UndoRedoElementType } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
+import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo.service';
+
+class ResourceAttachmentEdit extends ResourceEdit {
+    static is(candidate) {
+        if (candidate instanceof ResourceAttachmentEdit) {
+            return true;
+        }
+        else {
+            return isObject(candidate)
+                && (Boolean(candidate.undo && candidate.redo));
+        }
+    }
+    static lift(edit) {
+        if (edit instanceof ResourceAttachmentEdit) {
+            return edit;
+        }
+        else {
+            return ( new ResourceAttachmentEdit(edit.resource, edit.undo, edit.redo, edit.metadata));
+        }
+    }
+    constructor(resource, undo, redo, metadata) {
+        super(metadata);
+        this.resource = resource;
+        this.undo = undo;
+        this.redo = redo;
+    }
+}
+let OpaqueEdits = class OpaqueEdits {
+    constructor(_undoRedoGroup, _undoRedoSource, _progress, _token, _edits, _undoRedoService) {
+        this._undoRedoGroup = _undoRedoGroup;
+        this._undoRedoSource = _undoRedoSource;
+        this._progress = _progress;
+        this._token = _token;
+        this._edits = _edits;
+        this._undoRedoService = _undoRedoService;
+    }
+    async apply() {
+        const resources = [];
+        for (const edit of this._edits) {
+            if (this._token.isCancellationRequested) {
+                break;
+            }
+            await edit.redo();
+            this._undoRedoService.pushElement({
+                type: UndoRedoElementType.Resource,
+                resource: edit.resource,
+                label: edit.metadata?.label || 'Custom Edit',
+                code: 'paste',
+                undo: edit.undo,
+                redo: edit.redo,
+            }, this._undoRedoGroup, this._undoRedoSource);
+            this._progress.report(undefined);
+            resources.push(edit.resource);
+        }
+        return resources;
+    }
+};
+OpaqueEdits = ( __decorate([
+    ( __param(5, IUndoRedoService))
+], OpaqueEdits));
+
+export { OpaqueEdits, ResourceAttachmentEdit };

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

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