@codingame/monaco-vscode-bulk-edit-service-override 9.0.3 → 10.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-bulk-edit-service-override",
-  "version": "9.0.3",
+  "version": "10.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.0"
   }
 }

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

@@ -5,12 +5,10 @@ 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';
@@ -20,7 +18,6 @@ import { ResourceNotebookCellEdit, BulkCellEdits } from 'vscode/vscode/vs/workbe
 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';
 
@@ -68,24 +65,24 @@ let BulkEdit = class BulkEdit {
             }
         }
         if (this._edits.length === 0) {
-            return ( localize(2102, "Made no edits"));
+            return ( localize(2113, "Made no edits"));
         }
         else if (otherResources.size === 0) {
             if (textEditCount > 1 && textEditResources.size > 1) {
                 return ( localize(
-                    2103,
+                    2114,
                     "Made {0} text edits in {1} files",
                     textEditCount,
                     textEditResources.size
                 ));
             }
             else {
-                return ( localize(2104, "Made {0} text edits in one file", textEditCount));
+                return ( localize(2115, "Made {0} text edits in one file", textEditCount));
             }
         }
         else {
             return ( localize(
-                2105,
+                2116,
                 "Made {0} text edits in {1} files, also created or deleted {2} files",
                 textEditCount,
                 textEditResources.size,
@@ -134,12 +131,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(2106, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress, this._token, edits);
+        const model = this._instaService.createInstance(BulkFileEdits, this._label || ( localize(2117, "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(2106, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', this._editor, undoRedoGroup, undoRedoSource, progress, this._token, edits);
+        const model = this._instaService.createInstance(BulkTextEdits, this._label || ( localize(2117, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', this._editor, undoRedoGroup, undoRedoSource, progress, this._token, edits);
         return await model.apply();
     }
     async _performCellEdits(edits, undoRedoGroup, undoRedoSource, progress) {
@@ -177,7 +174,7 @@ let BulkEditService = class BulkEditService {
     async apply(editsIn, options) {
         let edits = liftEdits(Array.isArray(editsIn) ? editsIn : editsIn.edits);
         if (edits.length === 0) {
-            return { ariaSummary: ( localize(2107, "Made no edits")), isApplied: false };
+            return { ariaSummary: ( localize(2118, "Made no edits")), isApplied: false };
         }
         if (this._previewHandler && (options?.showPreview || ( (edits.some(value => value.metadata?.needsConfirmation))))) {
             edits = await this._previewHandler(edits, options);
@@ -192,7 +189,7 @@ let BulkEditService = class BulkEditService {
                 codeEditor = candidate.getModifiedEditor();
             }
         }
-        if (codeEditor && codeEditor.getOption(EditorOption.readOnly)) {
+        if (codeEditor && codeEditor.getOption(94 )) {
             codeEditor = undefined;
         }
         let undoRedoGroup;
@@ -247,26 +244,26 @@ let BulkEditService = class BulkEditService {
         let message;
         let primaryButton;
         switch (reason) {
-            case ShutdownReason.CLOSE:
-                message = ( localize(2108, "Are you sure you want to close the window?"));
-                primaryButton = ( localize(2109, "&&Close Window"));
+            case 1 :
+                message = ( localize(2119, "Are you sure you want to close the window?"));
+                primaryButton = ( localize(2120, "&&Close Window"));
                 break;
-            case ShutdownReason.LOAD:
-                message = ( localize(2110, "Are you sure you want to change the workspace?"));
-                primaryButton = ( localize(2111, "Change &&Workspace"));
+            case 4 :
+                message = ( localize(2121, "Are you sure you want to change the workspace?"));
+                primaryButton = ( localize(2122, "Change &&Workspace"));
                 break;
-            case ShutdownReason.RELOAD:
-                message = ( localize(2112, "Are you sure you want to reload the window?"));
-                primaryButton = ( localize(2113, "&&Reload Window"));
+            case 3 :
+                message = ( localize(2123, "Are you sure you want to reload the window?"));
+                primaryButton = ( localize(2124, "&&Reload Window"));
                 break;
             default:
-                message = ( localize(2114, "Are you sure you want to quit?"));
-                primaryButton = ( localize(2115, "&&Quit"));
+                message = ( localize(2125, "Are you sure you want to quit?"));
+                primaryButton = ( localize(2126, "&&Quit"));
                 break;
         }
         const result = await this._dialogService.confirm({
             message,
-            detail: ( localize(2116, "'{0}' is in progress.", label || ( localize(2117, "File operation")))),
+            detail: ( localize(2127, "'{0}' is in progress.", label || ( localize(2128, "File operation")))),
             primaryButton
         });
         return !result.confirmed;
@@ -287,7 +284,7 @@ const autoSaveSetting = 'files.refactoring.autoSave';
     properties: {
         [autoSaveSetting]: {
             description: ( localize(
-                2118,
+                2129,
                 "Controls if files that were part of a refactoring are saved automatically"
             )),
             default: true,

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

@@ -1,9 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-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';
@@ -221,7 +219,7 @@ let DeleteOperation = class DeleteOperation {
             deletes.push({
                 resource: edit.oldUri,
                 recursive: edit.options.recursive,
-                useTrash: !edit.options.skipTrashBin && this._fileService.hasCapability(edit.oldUri, FileSystemProviderCapabilities.Trash) && this._configurationService.getValue('files.enableTrash')
+                useTrash: !edit.options.skipTrashBin && this._fileService.hasCapability(edit.oldUri, 4096 ) && this._configurationService.getValue('files.enableTrash')
             });
             let fileContent;
             if (!edit.undoesCreate && !edit.options.folder && !(typeof edit.options.maxSize === 'number' && fileStat.size > edit.options.maxSize)) {
@@ -262,7 +260,7 @@ class FileUndoRedoElement {
         this.code = code;
         this.operations = operations;
         this.confirmBeforeUndo = confirmBeforeUndo;
-        this.type = UndoRedoElementType.Workspace;
+        this.type = 1 ;
         this.resources = operations.flatMap(op => op.uris);
     }
     async undo() {

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

@@ -1,9 +1,9 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { BulkEditPane } from './bulkEditPane.js';
-import { ViewContainerLocation, Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { FocusedViewContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
@@ -11,8 +11,6 @@ import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/view
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { WorkbenchListFocusContextKey } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -36,15 +34,15 @@ let UXState = class UXState {
     constructor(_paneCompositeService, _editorGroupsService) {
         this._paneCompositeService = _paneCompositeService;
         this._editorGroupsService = _editorGroupsService;
-        this._activePanel = _paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel)?.getId();
+        this._activePanel = _paneCompositeService.getActivePaneComposite(1 )?.getId();
     }
     async restore(panels, editors) {
         if (panels) {
             if (typeof this._activePanel === 'string') {
-                await this._paneCompositeService.openPaneComposite(this._activePanel, ViewContainerLocation.Panel);
+                await this._paneCompositeService.openPaneComposite(this._activePanel, 1 );
             }
             else {
-                this._paneCompositeService.hideActivePaneComposite(ViewContainerLocation.Panel);
+                this._paneCompositeService.hideActivePaneComposite(1 );
             }
         }
         if (editors) {
@@ -96,12 +94,12 @@ let BulkEditPreviewContribution = class BulkEditPreviewContribution {
         if (view.hasInput()) {
             const { confirmed } = await this._dialogService.confirm({
                 type: Severity$1.Info,
-                message: ( localize(2119, "Another refactoring is being previewed.")),
+                message: ( localize(2130, "Another refactoring is being previewed.")),
                 detail: ( localize(
-                    2120,
+                    2131,
                     "Press 'Continue' to discard the previous refactoring and continue with the current refactoring."
                 )),
-                primaryButton: ( localize(2121, "&&Continue"))
+                primaryButton: ( localize(2132, "&&Continue"))
             });
             if (!confirmed) {
                 return [];
@@ -142,8 +140,8 @@ registerAction2(class ApplyAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.apply',
-            title: ( localize2(2122, "Apply Refactoring")),
-            category: ( localize2(2123, "Refactor Preview")),
+            title: ( localize2(2133, "Apply Refactoring")),
+            category: ( localize2(2134, "Refactor Preview")),
             icon: Codicon.check,
             precondition: ( (ContextKeyExpr.and(BulkEditPreviewContribution.ctxEnabled, BulkEditPane.ctxHasCheckedChanges))),
             menu: [{
@@ -151,12 +149,12 @@ registerAction2(class ApplyAction extends Action2 {
                     order: 1
                 }],
             keybinding: {
-                weight: KeybindingWeight.EditorContrib - 10,
+                weight: 100  - 10,
                 when: ( (ContextKeyExpr.and(
                     BulkEditPreviewContribution.ctxEnabled,
                      (FocusedViewContext.isEqualTo(BulkEditPane.ID))
                 ))),
-                primary: KeyMod.CtrlCmd + KeyCode.Enter,
+                primary: 2048  + 3 ,
             }
         });
     }
@@ -170,8 +168,8 @@ registerAction2(class DiscardAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.discard',
-            title: ( localize2(2124, "Discard Refactoring")),
-            category: ( localize2(2123, "Refactor Preview")),
+            title: ( localize2(2135, "Discard Refactoring")),
+            category: ( localize2(2134, "Refactor Preview")),
             icon: Codicon.clearAll,
             precondition: BulkEditPreviewContribution.ctxEnabled,
             menu: [{
@@ -190,13 +188,13 @@ registerAction2(class ToggleAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.toggleCheckedState',
-            title: ( localize2(2125, "Toggle Change")),
-            category: ( localize2(2123, "Refactor Preview")),
+            title: ( localize2(2136, "Toggle Change")),
+            category: ( localize2(2134, "Refactor Preview")),
             precondition: BulkEditPreviewContribution.ctxEnabled,
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
+                weight: 200 ,
                 when: WorkbenchListFocusContextKey,
-                primary: KeyCode.Space,
+                primary: 10 ,
             },
             menu: {
                 id: MenuId.BulkEditContext,
@@ -214,8 +212,8 @@ registerAction2(class GroupByFile extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.groupByFile',
-            title: ( localize2(2126, "Group Changes By File")),
-            category: ( localize2(2123, "Refactor Preview")),
+            title: ( localize2(2137, "Group Changes By File")),
+            category: ( localize2(2134, "Refactor Preview")),
             icon: Codicon.ungroupByRefType,
             precondition: ( (ContextKeyExpr.and(
                 BulkEditPane.ctxHasCategories,
@@ -243,8 +241,8 @@ registerAction2(class GroupByType extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.groupByType',
-            title: ( localize2(2127, "Group Changes By Type")),
-            category: ( localize2(2123, "Refactor Preview")),
+            title: ( localize2(2138, "Group Changes By Type")),
+            category: ( localize2(2134, "Refactor Preview")),
             icon: Codicon.groupByRefType,
             precondition: ( (ContextKeyExpr.and(
                 BulkEditPane.ctxHasCategories,
@@ -269,8 +267,8 @@ registerAction2(class ToggleGrouping extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.toggleGrouping',
-            title: ( localize2(2127, "Group Changes By Type")),
-            category: ( localize2(2123, "Refactor Preview")),
+            title: ( localize2(2138, "Group Changes By Type")),
+            category: ( localize2(2134, "Refactor Preview")),
             icon: Codicon.listTree,
             toggled: ( (BulkEditPane.ctxGroupByFile.negate())),
             precondition: ( (ContextKeyExpr.and(BulkEditPane.ctxHasCategories, BulkEditPreviewContribution.ctxEnabled))),
@@ -286,11 +284,11 @@ registerAction2(class ToggleGrouping extends Action2 {
         view?.toggleGrouping();
     }
 });
-registerWorkbenchContribution2(BulkEditPreviewContribution.ID, BulkEditPreviewContribution, WorkbenchPhase.BlockRestore);
-const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codicon.lightbulb, ( localize(2128, 'View icon of the refactor preview view.')));
+registerWorkbenchContribution2(BulkEditPreviewContribution.ID, BulkEditPreviewContribution, 2 );
+const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codicon.lightbulb, ( localize(2139, 'View icon of the refactor preview view.')));
 const container = ( (Registry.as(Extensions.ViewContainersRegistry))).registerViewContainer({
     id: BulkEditPane.ID,
-    title: ( localize2(2129, "Refactor Preview")),
+    title: ( localize2(2140, "Refactor Preview")),
     hideIfEmpty: true,
     ctorDescriptor: ( (new SyncDescriptor(
         ViewPaneContainer,
@@ -298,10 +296,10 @@ const container = ( (Registry.as(Extensions.ViewContainersRegistry))).registerVi
     ))),
     icon: refactorPreviewViewIcon,
     storageId: BulkEditPane.ID
-}, ViewContainerLocation.Panel);
+}, 1 );
 ( (Registry.as(Extensions.ViewsRegistry))).registerViews([{
         id: BulkEditPane.ID,
-        name: ( localize2(2129, "Refactor Preview")),
+        name: ( localize2(2140, "Refactor Preview")),
         when: BulkEditPreviewContribution.ctxEnabled,
         ctorDescriptor: ( (new SyncDescriptor(BulkEditPane))),
         containerIcon: refactorPreviewViewIcon,

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.js

@@ -18,7 +18,6 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { defaultButtonStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
@@ -26,17 +25,12 @@ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeServi
 import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
-import { BulkFileOperationType, BulkEditPreviewProvider, BulkFileOperations } from './bulkEditPreview.js';
+import { BulkEditPreviewProvider, BulkFileOperations } from './bulkEditPreview.js';
 import { compareBulkFileOperations, BulkEditDataSource, BulkEditDelegate, TextEditElementRenderer, FileElementRenderer, CategoryElementRenderer, BulkEditAccessibilityProvider, BulkEditIdentityProvider, BulkEditNaviLabelProvider, BulkEditSorter, FileElement, CategoryElement, TextEditElement } from './bulkEditTree.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 var BulkEditPane_1;
-var State;
-( ((function(State) {
-    State["Data"] = "data";
-    State["Message"] = "message";
-})(State || (State = {}))));
 let BulkEditPane = class BulkEditPane extends ViewPane {
     static { BulkEditPane_1 = this; }
     static { this.ID = 'refactorPreview'; }
@@ -61,7 +55,7 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
             const computeDiffEditorInput = ( (new CachedFunction(async (fileOperation) => {
                 const fileOperationUri = fileOperation.uri;
                 const previewUri = this._currentProvider.asPreviewUri(fileOperationUri);
-                if (fileOperation.type & BulkFileOperationType.Delete) {
+                if (fileOperation.type & 4 ) {
                     return {
                         original: { resource: URI.revive(previewUri) },
                         modified: { resource: undefined },
@@ -119,7 +113,7 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         const treeContainer = document.createElement('div');
         contentContainer.appendChild(treeContainer);
         this._treeDataSource = this._instaService.createInstance(BulkEditDataSource);
-        this._treeDataSource.groupByFile = this._storageService.getBoolean(BulkEditPane_1._memGroupByFile, StorageScope.PROFILE, true);
+        this._treeDataSource.groupByFile = this._storageService.getBoolean(BulkEditPane_1._memGroupByFile, 0 , true);
         this._ctxGroupByFile.set(this._treeDataSource.groupByFile);
         this._tree = this._instaService.createInstance(WorkbenchAsyncDataTree, this.id, treeContainer, ( (new BulkEditDelegate())), [this._instaService.createInstance(TextEditElementRenderer), this._instaService.createInstance(FileElementRenderer, resourceLabels), this._instaService.createInstance(CategoryElementRenderer)], this._treeDataSource, {
             accessibilityProvider: this._instaService.createInstance(BulkEditAccessibilityProvider),
@@ -138,19 +132,19 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         const buttonBar = ( (new ButtonBar(buttonsContainer)));
         this._disposables.add(buttonBar);
         const btnConfirm = buttonBar.addButton({ supportIcons: true, ...defaultButtonStyles });
-        btnConfirm.label = ( localize(5266, 'Apply'));
+        btnConfirm.label = ( localize(5301, 'Apply'));
         btnConfirm.onDidClick(() => this.accept(), this, this._disposables);
         const btnCancel = buttonBar.addButton({ ...defaultButtonStyles, secondary: true });
-        btnCancel.label = ( localize(5267, 'Discard'));
+        btnCancel.label = ( localize(5302, 'Discard'));
         btnCancel.onDidClick(() => this.discard(), this, this._disposables);
         this._message = document.createElement('span');
         this._message.className = 'message';
         this._message.innerText = ( localize(
-            5268,
+            5303,
             "Invoke a code action, like rename, to see a preview of its changes here."
         ));
         parent.appendChild(this._message);
-        this._setState(State.Message);
+        this._setState("message" );
     }
     layoutBody(height, width) {
         super.layoutBody(height, width);
@@ -162,7 +156,7 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         this.element.dataset['state'] = state;
     }
     async setInput(edit, token) {
-        this._setState(State.Data);
+        this._setState("data" );
         this._sessionDisposables.clear();
         this._treeViewStates.clear();
         if (this._currentResolve) {
@@ -221,14 +215,14 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         let message;
         if (conflicts.length === 1) {
             message = ( localize(
-                5269,
+                5304,
                 "Cannot apply refactoring because '{0}' has changed in the meantime.",
                 this._labelService.getUriLabel(conflicts[0], { relative: true })
             ));
         }
         else {
             message = ( localize(
-                5270,
+                5305,
                 "Cannot apply refactoring because {0} other files have changed in the meantime.",
                 conflicts.length
             ));
@@ -241,7 +235,7 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
     _done(accept) {
         this._currentResolve?.(accept ? this._currentInput?.getWorkspaceEdit() : undefined);
         this._currentInput = undefined;
-        this._setState(State.Message);
+        this._setState("message" );
         this._sessionDisposables.clear();
     }
     toggleChecked() {
@@ -270,7 +264,7 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
             this._treeViewStates.set(this._treeDataSource.groupByFile, oldViewState);
             this._treeDataSource.groupByFile = !this._treeDataSource.groupByFile;
             this._setTreeInput(input);
-            this._storageService.store(BulkEditPane_1._memGroupByFile, this._treeDataSource.groupByFile, StorageScope.PROFILE, StorageTarget.USER);
+            this._storageService.store(BulkEditPane_1._memGroupByFile, this._treeDataSource.groupByFile, 0 , 0 );
             this._ctxGroupByFile.set(this._treeDataSource.groupByFile);
         }
     }

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.js

@@ -66,13 +66,6 @@ class BulkTextEdit {
         this.textEdit = textEdit;
     }
 }
-var BulkFileOperationType;
-( ((function(BulkFileOperationType) {
-    BulkFileOperationType[BulkFileOperationType["TextEdit"] = 1] = "TextEdit";
-    BulkFileOperationType[BulkFileOperationType["Create"] = 2] = "Create";
-    BulkFileOperationType[BulkFileOperationType["Delete"] = 4] = "Delete";
-    BulkFileOperationType[BulkFileOperationType["Rename"] = 8] = "Rename";
-})(BulkFileOperationType || (BulkFileOperationType = {}))));
 class BulkFileOperation {
     constructor(uri, parent) {
         this.uri = uri;
@@ -87,7 +80,7 @@ class BulkFileOperation {
         if (edit instanceof ResourceTextEdit) {
             this.textEdits.push(( (new BulkTextEdit(this, edit))));
         }
-        else if (type === BulkFileOperationType.Rename) {
+        else if (type === 8 ) {
             this.newUri = edit.newResource;
         }
     }
@@ -102,7 +95,7 @@ class BulkFileOperation {
 }
 class BulkCategory {
     static { this._defaultMetadata = ( (Object.freeze({
-        label: ( localize(10007, "Other")),
+        label: ( localize(10093, "Other")),
         icon: Codicon.symbolFile,
         needsConfirmation: false
     }))); }
@@ -146,12 +139,12 @@ let BulkFileOperations = BulkFileOperations_1 = class BulkFileOperations {
             let type;
             this.checked.updateChecked(edit, !edit.metadata?.needsConfirmation);
             if (edit instanceof ResourceTextEdit) {
-                type = BulkFileOperationType.TextEdit;
+                type = 1 ;
                 uri = edit.resource;
             }
             else if (edit instanceof ResourceFileEdit) {
                 if (edit.newResource && edit.oldResource) {
-                    type = BulkFileOperationType.Rename;
+                    type = 8 ;
                     uri = edit.oldResource;
                     if (edit.options?.overwrite === undefined && edit.options?.ignoreIfExists && (await this._fileService.exists(uri))) {
                         continue;
@@ -159,14 +152,14 @@ let BulkFileOperations = BulkFileOperations_1 = class BulkFileOperations {
                     newToOldUri.set(edit.newResource, uri);
                 }
                 else if (edit.oldResource) {
-                    type = BulkFileOperationType.Delete;
+                    type = 4 ;
                     uri = edit.oldResource;
                     if (edit.options?.ignoreIfNotExists && !(await this._fileService.exists(uri))) {
                         continue;
                     }
                 }
                 else if (edit.newResource) {
-                    type = BulkFileOperationType.Create;
+                    type = 2 ;
                     uri = edit.newResource;
                     if (edit.options?.overwrite === undefined && edit.options?.ignoreIfExists && (await this._fileService.exists(uri))) {
                         continue;
@@ -205,7 +198,7 @@ let BulkFileOperations = BulkFileOperations_1 = class BulkFileOperations {
         operationByResource.forEach(value => this.fileOperations.push(value));
         operationByCategory.forEach(value => this.categories.push(value));
         for (const file of this.fileOperations) {
-            if (file.type !== BulkFileOperationType.TextEdit) {
+            if (file.type !== 1 ) {
                 let checked = true;
                 for (const edit of ( (file.originalEdits.values()))) {
                     if (edit instanceof ResourceFileEdit) {
@@ -249,15 +242,25 @@ let BulkFileOperations = BulkFileOperations_1 = class BulkFileOperations {
         coalesceInPlace(result);
         return result;
     }
-    getFileEdits(uri) {
+    async getFileEditOperation(edit) {
+        const content = await edit.options.contents;
+        if (!content) {
+            return undefined;
+        }
+        return EditOperation.replaceMove(Range.lift({ startLineNumber: 0, startColumn: 0, endLineNumber: Number.MAX_VALUE, endColumn: 0 }), ( (content.toString())));
+    }
+    async getFileEdits(uri) {
         for (const file of this.fileOperations) {
             if (( (file.uri.toString())) === ( (uri.toString()))) {
                 const result = [];
                 let ignoreAll = false;
                 for (const edit of ( (file.originalEdits.values()))) {
-                    if (edit instanceof ResourceTextEdit) {
+                    if (edit instanceof ResourceFileEdit) {
+                        result.push(this.getFileEditOperation(edit));
+                    }
+                    else if (edit instanceof ResourceTextEdit) {
                         if (this.checked.isChecked(edit)) {
-                            result.push(EditOperation.replaceMove(Range.lift(edit.textEdit.range), !edit.textEdit.insertAsSnippet ? edit.textEdit.text : SnippetParser.asInsertText(edit.textEdit.text)));
+                            result.push(Promise.resolve(EditOperation.replaceMove(Range.lift(edit.textEdit.range), !edit.textEdit.insertAsSnippet ? edit.textEdit.text : SnippetParser.asInsertText(edit.textEdit.text))));
                         }
                     }
                     else if (!this.checked.isChecked(edit)) {
@@ -267,7 +270,7 @@ let BulkFileOperations = BulkFileOperations_1 = class BulkFileOperations {
                 if (ignoreAll) {
                     return [];
                 }
-                return result.sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
+                return (await Promise.all(result)).filter(r => r !== undefined).sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
             }
         }
         return [];
@@ -332,7 +335,7 @@ let BulkEditPreviewProvider = class BulkEditPreviewProvider {
         if (undoEdits) {
             model.applyEdits(undoEdits);
         }
-        const newEdits = this._operations.getFileEdits(uri);
+        const newEdits = await this._operations.getFileEdits(uri);
         const newUndoEdits = model.applyEdits(newEdits, true);
         this._modelPreviewEdits.set(model.id, newUndoEdits);
     }
@@ -369,4 +372,4 @@ BulkEditPreviewProvider = BulkEditPreviewProvider_1 = ( (__decorate([
     ( (__param(3, ITextModelService)))
 ], BulkEditPreviewProvider)));
 
-export { BulkCategory, BulkEditPreviewProvider, BulkFileOperation, BulkFileOperationType, BulkFileOperations, BulkTextEdit, CheckedStates };
+export { BulkCategory, BulkEditPreviewProvider, BulkFileOperation, BulkFileOperations, BulkTextEdit, CheckedStates };

package/vscode/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.js

@@ -6,7 +6,7 @@ import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { asCSSUrl, addDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { TextModel } from 'vscode/vscode/vs/editor/common/model/textModel';
-import { BulkFileOperationType, BulkFileOperations } from './bulkEditPreview.js';
+import { BulkFileOperations } from './bulkEditPreview.js';
 import { FileKind } from 'vscode/vscode/vs/platform/files/common/files';
 import { localize } from 'vscode/vscode/vs/nls';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
@@ -54,7 +54,7 @@ class FileElement {
     isChecked() {
         const model = this.parent instanceof CategoryElement ? this.parent.parent : this.parent;
         let checked = true;
-        if (this.edit.type === BulkFileOperationType.TextEdit) {
+        if (this.edit.type === 1 ) {
             checked = !this.edit.textEdits.every(edit => !model.checked.isChecked(edit.textEdit));
         }
         for (const edit of ( (this.edit.originalEdits.values()))) {
@@ -62,7 +62,7 @@ class FileElement {
                 checked = checked && model.checked.isChecked(edit);
             }
         }
-        if (this.parent instanceof CategoryElement && this.edit.type === BulkFileOperationType.TextEdit) {
+        if (this.parent instanceof CategoryElement && this.edit.type === 1 ) {
             for (const category of model.categories) {
                 for (const file of category.fileOperations) {
                     if (( (file.uri.toString())) === ( (this.edit.uri.toString()))) {
@@ -82,7 +82,7 @@ class FileElement {
         for (const edit of ( (this.edit.originalEdits.values()))) {
             model.checked.updateChecked(edit, value);
         }
-        if (this.parent instanceof CategoryElement && this.edit.type !== BulkFileOperationType.TextEdit) {
+        if (this.parent instanceof CategoryElement && this.edit.type !== 1 ) {
             for (const category of model.categories) {
                 for (const file of category.fileOperations) {
                     if (( (file.uri.toString())) === ( (this.edit.uri.toString()))) {
@@ -95,7 +95,7 @@ class FileElement {
         }
     }
     isDisabled() {
-        if (this.parent instanceof CategoryElement && this.edit.type === BulkFileOperationType.TextEdit) {
+        if (this.parent instanceof CategoryElement && this.edit.type === 1 ) {
             const model = this.parent.parent;
             let checked = true;
             for (const category of model.categories) {
@@ -240,7 +240,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
         this._labelService = _labelService;
     }
     getWidgetAriaLabel() {
-        return ( localize(10008, "Bulk Edit"));
+        return ( localize(10094, "Bulk Edit"));
     }
     getRole(_element) {
         return 'checkbox';
@@ -248,55 +248,55 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
     getAriaLabel(element) {
         if (element instanceof FileElement) {
             if (element.edit.textEdits.length > 0) {
-                if (element.edit.type & BulkFileOperationType.Rename && element.edit.newUri) {
+                if (element.edit.type & 8  && element.edit.newUri) {
                     return ( localize(
-                        10009,
+                        10095,
                         "Renaming {0} to {1}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true }),
                         this._labelService.getUriLabel(element.edit.newUri, { relative: true })
                     ));
                 }
-                else if (element.edit.type & BulkFileOperationType.Create) {
+                else if (element.edit.type & 2 ) {
                     return ( localize(
-                        10010,
+                        10096,
                         "Creating {0}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
                 }
-                else if (element.edit.type & BulkFileOperationType.Delete) {
+                else if (element.edit.type & 4 ) {
                     return ( localize(
-                        10011,
+                        10097,
                         "Deleting {0}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
                 }
                 else {
                     return ( localize(
-                        10012,
+                        10098,
                         "{0}, making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
                 }
             }
             else {
-                if (element.edit.type & BulkFileOperationType.Rename && element.edit.newUri) {
+                if (element.edit.type & 8  && element.edit.newUri) {
                     return ( localize(
-                        10013,
+                        10099,
                         "Renaming {0} to {1}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true }),
                         this._labelService.getUriLabel(element.edit.newUri, { relative: true })
                     ));
                 }
-                else if (element.edit.type & BulkFileOperationType.Create) {
+                else if (element.edit.type & 2 ) {
                     return ( localize(
-                        10014,
+                        10100,
                         "Creating {0}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
                 }
-                else if (element.edit.type & BulkFileOperationType.Delete) {
+                else if (element.edit.type & 4 ) {
                     return ( localize(
-                        10015,
+                        10101,
                         "Deleting {0}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
@@ -306,7 +306,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
         if (element instanceof TextEditElement) {
             if (element.selecting.length > 0 && element.inserting.length > 0) {
                 return ( localize(
-                    10016,
+                    10102,
                     "line {0}, replacing {1} with {2}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting,
@@ -315,7 +315,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             }
             else if (element.selecting.length > 0 && element.inserting.length === 0) {
                 return ( localize(
-                    10017,
+                    10103,
                     "line {0}, removing {1}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting
@@ -323,7 +323,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             }
             else if (element.selecting.length === 0 && element.inserting.length > 0) {
                 return ( localize(
-                    10018,
+                    10104,
                     "line {0}, inserting {1}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting
@@ -427,11 +427,11 @@ let FileElementTemplate = class FileElementTemplate {
         this._localDisposables.add(addDisposableListener(this._checkbox, 'change', () => {
             element.setChecked(this._checkbox.checked);
         }));
-        if (element.edit.type & BulkFileOperationType.Rename && element.edit.newUri) {
+        if (element.edit.type & 8  && element.edit.newUri) {
             this._label.setResource({
                 resource: element.edit.uri,
                 name: ( localize(
-                    10019,
+                    10105,
                     "{0} → {1}",
                     this._labelService.getUriLabel(element.edit.uri, { relative: true }),
                     this._labelService.getUriLabel(element.edit.newUri, { relative: true })
@@ -439,7 +439,7 @@ let FileElementTemplate = class FileElementTemplate {
             }, {
                 fileDecorations: { colors: true, badges: false }
             });
-            this._details.innerText = ( localize(10020, "(renaming)"));
+            this._details.innerText = ( localize(10106, "(renaming)"));
         }
         else {
             const options = {
@@ -448,11 +448,11 @@ let FileElementTemplate = class FileElementTemplate {
                 fileDecorations: { colors: true, badges: false },
                 extraClasses: []
             };
-            if (element.edit.type & BulkFileOperationType.Create) {
-                this._details.innerText = ( localize(10021, "(creating)"));
+            if (element.edit.type & 2 ) {
+                this._details.innerText = ( localize(10107, "(creating)"));
             }
-            else if (element.edit.type & BulkFileOperationType.Delete) {
-                this._details.innerText = ( localize(10022, "(deleting)"));
+            else if (element.edit.type & 4 ) {
+                this._details.innerText = ( localize(10108, "(deleting)"));
                 options.extraClasses.push('delete');
             }
             else {
@@ -531,7 +531,7 @@ let TextEditElementTemplate = class TextEditElementTemplate {
         let title;
         const { metadata } = element.edit.textEdit;
         if (metadata && metadata.description) {
-            title = ( localize(10023, "{0} - {1}", metadata.label, metadata.description));
+            title = ( localize(10109, "{0} - {1}", metadata.label, metadata.description));
         }
         else if (metadata) {
             title = metadata.label;