@codingame/monaco-vscode-bulk-edit-service-override 3.2.3 → 4.0.0

package/override/vs/platform/dialogs/common/dialogs.js

@@ -1,3 +1,5 @@
+export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+
 var ConfirmResult;
 ( (function(ConfirmResult) {
     ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";

package/package.json

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

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

@@ -16,7 +16,7 @@ import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/acti
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import '../../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
@@ -93,7 +93,7 @@ let BulkEditPreviewContribution = class BulkEditPreviewContribution {
         }
         if (view.hasInput()) {
             const { confirmed } = await this._dialogService.confirm({
-                type: Severity.Info,
+                type: Severity$1.Info,
                 message: ( localizeWithPath(
                     'vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution',
                     'overlap',
@@ -168,7 +168,7 @@ registerAction2(class ApplyAction extends Action2 {
             keybinding: {
                 weight: 100  - 10,
                 when: ( ContextKeyExpr.and(BulkEditPreviewContribution.ctxEnabled, ( FocusedViewContext.isEqualTo(BulkEditPane.ID)))),
-                primary: 1024  + 3 ,
+                primary: 2048  + 3 ,
             }
         });
     }

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

@@ -1,13 +1,13 @@
 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, compareBulkFileOperations } from './bulkEditTree.js';
+import { compareBulkFileOperations, BulkEditDataSource, BulkEditDelegate, TextEditElementRenderer, FileElementRenderer, CategoryElementRenderer, BulkEditAccessibilityProvider, BulkEditIdentityProvider, BulkEditNaviLabelProvider, BulkEditSorter, FileElement, CategoryElement, TextEditElement } 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';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { BulkFileOperations, BulkEditPreviewProvider } from './bulkEditPreview.js';
+import { BulkEditPreviewProvider, BulkFileOperations } 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';
@@ -25,6 +25,7 @@ import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { ButtonBar } from 'vscode/vscode/vs/base/browser/ui/button/button';
 import { defaultButtonStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
+import { LRUCachedFunction, CachedFunction } from 'vscode/vscode/vs/base/common/cache';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 var BulkEditPane_1;
@@ -48,10 +49,50 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         this._treeViewStates = ( new Map());
         this._disposables = ( new DisposableStore());
         this._sessionDisposables = ( new DisposableStore());
+        this._computeResourceDiffEditorInputs = ( new LRUCachedFunction(async (fileOperations) => {
+            const computeDiffEditorInput = ( new CachedFunction(async (fileOperation) => {
+                const fileOperationUri = fileOperation.uri;
+                const previewUri = this._currentProvider.asPreviewUri(fileOperationUri);
+                if (fileOperation.type & 4 ) {
+                    return {
+                        original: { resource: URI.revive(previewUri) },
+                        modified: { resource: undefined }
+                    };
+                }
+                else {
+                    let leftResource;
+                    try {
+                        (await this._textModelService.createModelReference(fileOperationUri)).dispose();
+                        leftResource = fileOperationUri;
+                    }
+                    catch {
+                        leftResource = BulkEditPreviewProvider.emptyPreview;
+                    }
+                    return {
+                        original: { resource: URI.revive(leftResource) },
+                        modified: { resource: URI.revive(previewUri) }
+                    };
+                }
+            }));
+            const sortedFileOperations = fileOperations.slice().sort(compareBulkFileOperations);
+            const resources = [];
+            for (const operation of sortedFileOperations) {
+                resources.push(await computeDiffEditorInput.get(operation));
+            }
+            const getResourceDiffEditorInputIdOfOperation = async (operation) => {
+                const resource = await computeDiffEditorInput.get(operation);
+                return { original: resource.original.resource, modified: resource.modified.resource };
+            };
+            return {
+                resources,
+                getResourceDiffEditorInputIdOfOperation
+            };
+        }, key => key));
         this.element.classList.add('bulk-edit-panel', 'show-file-icons');
         this._ctxHasCategories = BulkEditPane_1.ctxHasCategories.bindTo(contextKeyService);
         this._ctxGroupByFile = BulkEditPane_1.ctxGroupByFile.bindTo(contextKeyService);
         this._ctxHasCheckedChanges = BulkEditPane_1.ctxHasCheckedChanges.bindTo(contextKeyService);
+        this.telemetryService.publicLog2('views.bulkEditPane');
     }
     dispose() {
         this._tree.dispose();
@@ -250,12 +291,13 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         else {
             return;
         }
-        const resources = await this._resolveResources(fileOperations);
+        const result = await this._computeResourceDiffEditorInputs.get(fileOperations);
+        const resourceId = await result.getResourceDiffEditorInputIdOfOperation(fileElement.edit);
         const options = {
             ...e.editorOptions,
             viewState: {
                 revealData: {
-                    resource: { original: fileElement.edit.uri },
+                    resource: resourceId,
                     range: selection,
                 }
             }
@@ -264,47 +306,13 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         const label = 'Refactor Preview';
         this._editorService.openEditor({
             multiDiffSource,
-            resources,
             label,
             options,
             isTransient: true,
-            description: label
+            description: label,
+            resources: result.resources
         }, 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 {
-                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._fileOperations = fileOperations;
-        this._resources = resources;
-        return resources;
-    }
     _onContextMenu(e) {
         this._contextMenuService.showContextMenu({
             menuId: MenuId.BulkEditContext,

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

@@ -536,7 +536,7 @@ let TextEditElementTemplate = class TextEditElementTemplate {
         container.appendChild(this._checkbox);
         this._icon = document.createElement('div');
         container.appendChild(this._icon);
-        this._label = ( new HighlightedLabel(container));
+        this._label = this._disposables.add(( new HighlightedLabel(container)));
     }
     dispose() {
         this._localDisposables.dispose();