@codingame/monaco-vscode-bulk-edit-service-override 2.2.2 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-bulk-edit-service-override",
-  "version": "2.2.2",
+  "version": "3.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.1.0",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

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

@@ -211,7 +211,7 @@ let BulkEditService = class BulkEditService {
                 codeEditor = candidate.getModifiedEditor();
             }
         }
-        if (codeEditor && codeEditor.getOption(90 )) {
+        if (codeEditor && codeEditor.getOption(91 )) {
             codeEditor = undefined;
         }
         let undoRedoGroup;

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

@@ -1,16 +1,15 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions } 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 { Extensions as Extensions$1 } 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';
 import { FocusedViewContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-import { BulkEditPreviewProvider } from './bulkEditPreview.js';
 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';
@@ -51,7 +50,7 @@ let UXState = class UXState {
                 const previewEditors = [];
                 for (const input of group.editors) {
                     const resource = EditorResourceAccessor.getCanonicalUri(input, { supportSideBySide: SideBySideEditor.PRIMARY });
-                    if (resource?.scheme === BulkEditPreviewProvider.Schema) {
+                    if (resource?.scheme === BulkEditPane.Schema) {
                         previewEditors.push(input);
                     }
                 }
@@ -74,6 +73,7 @@ class PreviewSession {
 }
 let BulkEditPreviewContribution = class BulkEditPreviewContribution {
     static { BulkEditPreviewContribution_1 = this; }
+    static { this.ID = 'workbench.contrib.bulkEditPreview'; }
     static { this.ctxEnabled = ( new RawContextKey('refactorPreview.enabled', false)); }
     constructor(_paneCompositeService, _viewsService, _editorGroupsService, _dialogService, bulkEditService, contextKeyService) {
         this._paneCompositeService = _paneCompositeService;
@@ -331,13 +331,13 @@ registerAction2(class ToggleGrouping extends Action2 {
         view?.toggleGrouping();
     }
 });
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(BulkEditPreviewContribution, 2 );
+registerWorkbenchContribution2(BulkEditPreviewContribution.ID, BulkEditPreviewContribution, 2 );
 const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codicon.lightbulb, ( localizeWithPath(
     'vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution',
     'refactorPreviewViewIcon',
     'View icon of the refactor preview view.'
 )));
-const container = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
+const container = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
     id: BulkEditPane.ID,
     title: ( localize2WithPath(
         'vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution',
@@ -352,7 +352,7 @@ const container = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerVi
     icon: refactorPreviewViewIcon,
     storageId: BulkEditPane.ID
 }, 1 );
-( Registry.as(Extensions$1.ViewsRegistry)).registerViews([{
+( Registry.as(Extensions.ViewsRegistry)).registerViews([{
         id: BulkEditPane.ID,
         name: ( localize2WithPath(
             'vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution',

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import './bulkEdit.css.js';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { BulkEditDataSource, BulkEditDelegate, TextEditElementRenderer, FileElementRenderer, CategoryElementRenderer, BulkEditAccessibilityProvider, BulkEditIdentityProvider, BulkEditNaviLabelProvider, BulkEditSorter, FileElement, CategoryElement, TextEditElement } from './bulkEditTree.js';
+import { BulkEditDataSource, BulkEditDelegate, TextEditElementRenderer, FileElementRenderer, CategoryElementRenderer, BulkEditAccessibilityProvider, BulkEditIdentityProvider, BulkEditNaviLabelProvider, BulkEditSorter, FileElement, CategoryElement, TextEditElement, compareBulkFileOperations } from './bulkEditTree.js';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
@@ -10,6 +10,7 @@ import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workb
 import { BulkFileOperations, BulkEditPreviewProvider } from './bulkEditPreview.js';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
@@ -17,7 +18,6 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { RawContextKey, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
 import '../../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { basename, dirname } from 'vscode/vscode/vs/base/common/resources';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
@@ -31,6 +31,7 @@ var BulkEditPane_1;
 let BulkEditPane = class BulkEditPane extends ViewPane {
     static { BulkEditPane_1 = this; }
     static { this.ID = 'refactorPreview'; }
+    static { this.Schema = 'vscode-bulkeditpreview-multieditor'; }
     static { this.ctxHasCategories = ( new RawContextKey('refactorPreview.hasCategories', false)); }
     static { this.ctxGroupByFile = ( new RawContextKey('refactorPreview.groupByFile', true)); }
     static { this.ctxHasCheckedChanges = ( new RawContextKey('refactorPreview.hasCheckedChanges', true)); }
@@ -79,7 +80,7 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
             selectionNavigation: true
         });
         this._disposables.add(this._tree.onContextMenu(this._onContextMenu, this));
-        this._disposables.add(this._tree.onDidOpen(e => this._openElementAsEditor(e)));
+        this._disposables.add(this._tree.onDidOpen(e => this._openElementInMultiDiffEditor(e)));
         const buttonsContainer = document.createElement('div');
         buttonsContainer.className = 'buttons';
         contentContainer.appendChild(buttonsContainer);
@@ -231,83 +232,78 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
             this._ctxGroupByFile.set(this._treeDataSource.groupByFile);
         }
     }
-    async _openElementAsEditor(e) {
-        const options = { ...e.editorOptions };
+    async _openElementInMultiDiffEditor(e) {
+        const fileOperations = this._currentInput?.fileOperations;
+        if (!fileOperations) {
+            return;
+        }
+        let selection = undefined;
         let fileElement;
         if (e.element instanceof TextEditElement) {
             fileElement = e.element.parent;
-            options.selection = e.element.edit.textEdit.textEdit.range;
+            selection = e.element.edit.textEdit.textEdit.range;
         }
         else if (e.element instanceof FileElement) {
             fileElement = e.element;
-            options.selection = e.element.edit.textEdits[0]?.textEdit.textEdit.range;
+            selection = e.element.edit.textEdits[0]?.textEdit.textEdit.range;
         }
         else {
             return;
         }
-        const previewUri = this._currentProvider.asPreviewUri(fileElement.edit.uri);
-        if (fileElement.edit.type & 4 ) {
-            this._editorService.openEditor({
-                label: ( localizeWithPath(
-                    'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane',
-                    'edt.title.del',
-                    "{0} (delete, refactor preview)",
-                    basename(fileElement.edit.uri)
-                )),
-                resource: previewUri,
-                options
-            });
-        }
-        else {
-            let leftResource;
-            try {
-                (await this._textModelService.createModelReference(fileElement.edit.uri)).dispose();
-                leftResource = fileElement.edit.uri;
-            }
-            catch {
-                leftResource = BulkEditPreviewProvider.emptyPreview;
+        const resources = await this._resolveResources(fileOperations);
+        const options = {
+            ...e.editorOptions,
+            viewState: {
+                revealData: {
+                    resource: { original: fileElement.edit.uri },
+                    range: selection,
+                }
             }
-            let typeLabel;
-            if (fileElement.edit.type & 8 ) {
-                typeLabel = ( localizeWithPath(
-                    'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane',
-                    'rename',
-                    "rename"
-                ));
-            }
-            else if (fileElement.edit.type & 2 ) {
-                typeLabel = ( localizeWithPath(
-                    'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane',
-                    'create',
-                    "create"
-                ));
-            }
-            let label;
-            if (typeLabel) {
-                label = ( localizeWithPath(
-                    'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane',
-                    'edt.title.2',
-                    "{0} ({1}, refactor preview)",
-                    basename(fileElement.edit.uri),
-                    typeLabel
-                ));
+        };
+        const multiDiffSource = ( URI.from({ scheme: BulkEditPane_1.Schema }));
+        const label = 'Refactor Preview';
+        this._editorService.openEditor({
+            multiDiffSource,
+            resources,
+            label,
+            options,
+            isTransient: true,
+            description: label
+        }, e.sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
+    }
+    async _resolveResources(fileOperations) {
+        if (this._fileOperations === fileOperations && this._resources) {
+            return this._resources;
+        }
+        const sortedFileOperations = fileOperations.sort(compareBulkFileOperations);
+        const resources = [];
+        for (const operation of sortedFileOperations) {
+            const operationUri = operation.uri;
+            const previewUri = this._currentProvider.asPreviewUri(operationUri);
+            if (operation.type & 4 ) {
+                resources.push({
+                    original: { resource: undefined },
+                    modified: { resource: URI.revive(previewUri) }
+                });
             }
             else {
-                label = ( localizeWithPath(
-                    'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane',
-                    'edt.title.1',
-                    "{0} (refactor preview)",
-                    basename(fileElement.edit.uri)
-                ));
+                let leftResource;
+                try {
+                    (await this._textModelService.createModelReference(operationUri)).dispose();
+                    leftResource = operationUri;
+                }
+                catch {
+                    leftResource = BulkEditPreviewProvider.emptyPreview;
+                }
+                resources.push({
+                    original: { resource: URI.revive(leftResource) },
+                    modified: { resource: URI.revive(previewUri) }
+                });
             }
-            this._editorService.openEditor({
-                original: { resource: leftResource },
-                modified: { resource: previewUri },
-                label,
-                description: this._labelService.getUriLabel(dirname(leftResource), { relative: true }),
-                options
-            }, e.sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
         }
+        this._fileOperations = fileOperations;
+        this._resources = resources;
+        return resources;
     }
     _onContextMenu(e) {
         this._contextMenuService.showContextMenu({

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

@@ -284,7 +284,7 @@ BulkFileOperations = BulkFileOperations_1 = ( __decorate([
 ], BulkFileOperations));
 let BulkEditPreviewProvider = class BulkEditPreviewProvider {
     static { BulkEditPreviewProvider_1 = this; }
-    static { this.Schema = 'vscode-bulkeditpreview'; }
+    static { this.Schema = 'vscode-bulkeditpreview-editor'; }
     static { this.emptyPreview = ( URI.from({ scheme: BulkEditPreviewProvider_1.Schema, fragment: 'empty' })); }
     static fromPreviewUri(uri) {
         return ( URI.parse(uri.query));

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

@@ -236,7 +236,7 @@ BulkEditDataSource = ( __decorate([
 class BulkEditSorter {
     compare(a, b) {
         if (a instanceof FileElement && b instanceof FileElement) {
-            return compare(( a.edit.uri.toString()), ( b.edit.uri.toString()));
+            return compareBulkFileOperations(a.edit, b.edit);
         }
         if (a instanceof TextEditElement && b instanceof TextEditElement) {
             return Range.compareRangesUsingStarts(a.edit.textEdit.textEdit.range, b.edit.textEdit.textEdit.range);
@@ -244,6 +244,9 @@ class BulkEditSorter {
         return 0;
     }
 }
+function compareBulkFileOperations(a, b) {
+    return compare(( a.uri.toString()), ( b.uri.toString()));
+}
 let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
     constructor(_labelService) {
         this._labelService = _labelService;
@@ -651,4 +654,4 @@ class BulkEditNaviLabelProvider {
     }
 }
 
-export { BulkEditAccessibilityProvider, BulkEditDataSource, BulkEditDelegate, BulkEditIdentityProvider, BulkEditNaviLabelProvider, BulkEditSorter, CategoryElement, CategoryElementRenderer, FileElement, FileElementRenderer, TextEditElement, TextEditElementRenderer };
+export { BulkEditAccessibilityProvider, BulkEditDataSource, BulkEditDelegate, BulkEditIdentityProvider, BulkEditNaviLabelProvider, BulkEditSorter, CategoryElement, CategoryElementRenderer, FileElement, FileElementRenderer, TextEditElement, TextEditElementRenderer, compareBulkFileOperations };