@codingame/monaco-vscode-bulk-edit-service-override 10.1.4 → 11.0.1

package/package.json

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

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

@@ -65,24 +65,24 @@ let BulkEdit = class BulkEdit {
             }
         }
         if (this._edits.length === 0) {
-            return ( localize(2113, "Made no edits"));
+            return ( localize(2110, "Made no edits"));
         }
         else if (otherResources.size === 0) {
             if (textEditCount > 1 && textEditResources.size > 1) {
                 return ( localize(
-                    2114,
+                    2111,
                     "Made {0} text edits in {1} files",
                     textEditCount,
                     textEditResources.size
                 ));
             }
             else {
-                return ( localize(2115, "Made {0} text edits in one file", textEditCount));
+                return ( localize(2112, "Made {0} text edits in one file", textEditCount));
             }
         }
         else {
             return ( localize(
-                2116,
+                2113,
                 "Made {0} text edits in {1} files, also created or deleted {2} files",
                 textEditCount,
                 textEditResources.size,
@@ -131,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(2117, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress, this._token, edits);
+        const model = this._instaService.createInstance(BulkFileEdits, this._label || ( localize(2114, "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(2117, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', this._editor, undoRedoGroup, undoRedoSource, progress, this._token, 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);
         return await model.apply();
     }
     async _performCellEdits(edits, undoRedoGroup, undoRedoSource, progress) {
@@ -174,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(2118, "Made no edits")), isApplied: false };
+            return { ariaSummary: ( localize(2115, "Made no edits")), isApplied: false };
         }
         if (this._previewHandler && (options?.showPreview || ( (edits.some(value => value.metadata?.needsConfirmation))))) {
             edits = await this._previewHandler(edits, options);
@@ -245,25 +245,25 @@ let BulkEditService = class BulkEditService {
         let primaryButton;
         switch (reason) {
             case 1 :
-                message = ( localize(2119, "Are you sure you want to close the window?"));
-                primaryButton = ( localize(2120, "&&Close Window"));
+                message = ( localize(2116, "Are you sure you want to close the window?"));
+                primaryButton = ( localize(2117, "&&Close Window"));
                 break;
             case 4 :
-                message = ( localize(2121, "Are you sure you want to change the workspace?"));
-                primaryButton = ( localize(2122, "Change &&Workspace"));
+                message = ( localize(2118, "Are you sure you want to change the workspace?"));
+                primaryButton = ( localize(2119, "Change &&Workspace"));
                 break;
             case 3 :
-                message = ( localize(2123, "Are you sure you want to reload the window?"));
-                primaryButton = ( localize(2124, "&&Reload Window"));
+                message = ( localize(2120, "Are you sure you want to reload the window?"));
+                primaryButton = ( localize(2121, "&&Reload Window"));
                 break;
             default:
-                message = ( localize(2125, "Are you sure you want to quit?"));
-                primaryButton = ( localize(2126, "&&Quit"));
+                message = ( localize(2122, "Are you sure you want to quit?"));
+                primaryButton = ( localize(2123, "&&Quit"));
                 break;
         }
         const result = await this._dialogService.confirm({
             message,
-            detail: ( localize(2127, "'{0}' is in progress.", label || ( localize(2128, "File operation")))),
+            detail: ( localize(2124, "'{0}' is in progress.", label || ( localize(2125, "File operation")))),
             primaryButton
         });
         return !result.confirmed;
@@ -284,7 +284,7 @@ const autoSaveSetting = 'files.refactoring.autoSave';
     properties: {
         [autoSaveSetting]: {
             description: ( localize(
-                2129,
+                2126,
                 "Controls if files that were part of a refactoring are saved automatically"
             )),
             default: true,

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

@@ -94,12 +94,12 @@ let BulkEditPreviewContribution = class BulkEditPreviewContribution {
         if (view.hasInput()) {
             const { confirmed } = await this._dialogService.confirm({
                 type: Severity$1.Info,
-                message: ( localize(2130, "Another refactoring is being previewed.")),
+                message: ( localize(2127, "Another refactoring is being previewed.")),
                 detail: ( localize(
-                    2131,
+                    2128,
                     "Press 'Continue' to discard the previous refactoring and continue with the current refactoring."
                 )),
-                primaryButton: ( localize(2132, "&&Continue"))
+                primaryButton: ( localize(2129, "&&Continue"))
             });
             if (!confirmed) {
                 return [];
@@ -140,8 +140,8 @@ registerAction2(class ApplyAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.apply',
-            title: ( localize2(2133, "Apply Refactoring")),
-            category: ( localize2(2134, "Refactor Preview")),
+            title: ( localize2(2130, "Apply Refactoring")),
+            category: ( localize2(2131, "Refactor Preview")),
             icon: Codicon.check,
             precondition: ( (ContextKeyExpr.and(BulkEditPreviewContribution.ctxEnabled, BulkEditPane.ctxHasCheckedChanges))),
             menu: [{
@@ -168,8 +168,8 @@ registerAction2(class DiscardAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.discard',
-            title: ( localize2(2135, "Discard Refactoring")),
-            category: ( localize2(2134, "Refactor Preview")),
+            title: ( localize2(2132, "Discard Refactoring")),
+            category: ( localize2(2131, "Refactor Preview")),
             icon: Codicon.clearAll,
             precondition: BulkEditPreviewContribution.ctxEnabled,
             menu: [{
@@ -188,8 +188,8 @@ registerAction2(class ToggleAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.toggleCheckedState',
-            title: ( localize2(2136, "Toggle Change")),
-            category: ( localize2(2134, "Refactor Preview")),
+            title: ( localize2(2133, "Toggle Change")),
+            category: ( localize2(2131, "Refactor Preview")),
             precondition: BulkEditPreviewContribution.ctxEnabled,
             keybinding: {
                 weight: 200 ,
@@ -212,8 +212,8 @@ registerAction2(class GroupByFile extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.groupByFile',
-            title: ( localize2(2137, "Group Changes By File")),
-            category: ( localize2(2134, "Refactor Preview")),
+            title: ( localize2(2134, "Group Changes By File")),
+            category: ( localize2(2131, "Refactor Preview")),
             icon: Codicon.ungroupByRefType,
             precondition: ( (ContextKeyExpr.and(
                 BulkEditPane.ctxHasCategories,
@@ -241,8 +241,8 @@ registerAction2(class GroupByType extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.groupByType',
-            title: ( localize2(2138, "Group Changes By Type")),
-            category: ( localize2(2134, "Refactor Preview")),
+            title: ( localize2(2135, "Group Changes By Type")),
+            category: ( localize2(2131, "Refactor Preview")),
             icon: Codicon.groupByRefType,
             precondition: ( (ContextKeyExpr.and(
                 BulkEditPane.ctxHasCategories,
@@ -267,8 +267,8 @@ registerAction2(class ToggleGrouping extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.toggleGrouping',
-            title: ( localize2(2138, "Group Changes By Type")),
-            category: ( localize2(2134, "Refactor Preview")),
+            title: ( localize2(2135, "Group Changes By Type")),
+            category: ( localize2(2131, "Refactor Preview")),
             icon: Codicon.listTree,
             toggled: ( (BulkEditPane.ctxGroupByFile.negate())),
             precondition: ( (ContextKeyExpr.and(BulkEditPane.ctxHasCategories, BulkEditPreviewContribution.ctxEnabled))),
@@ -285,10 +285,10 @@ registerAction2(class ToggleGrouping extends Action2 {
     }
 });
 registerWorkbenchContribution2(BulkEditPreviewContribution.ID, BulkEditPreviewContribution, 2 );
-const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codicon.lightbulb, ( localize(2139, 'View icon of the refactor preview view.')));
+const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codicon.lightbulb, ( localize(2136, 'View icon of the refactor preview view.')));
 const container = ( (Registry.as(Extensions.ViewContainersRegistry))).registerViewContainer({
     id: BulkEditPane.ID,
-    title: ( localize2(2140, "Refactor Preview")),
+    title: ( localize2(2137, "Refactor Preview")),
     hideIfEmpty: true,
     ctorDescriptor: ( (new SyncDescriptor(
         ViewPaneContainer,
@@ -299,7 +299,7 @@ const container = ( (Registry.as(Extensions.ViewContainersRegistry))).registerVi
 }, 1 );
 ( (Registry.as(Extensions.ViewsRegistry))).registerViews([{
         id: BulkEditPane.ID,
-        name: ( localize2(2140, "Refactor Preview")),
+        name: ( localize2(2137, "Refactor Preview")),
         when: BulkEditPreviewContribution.ctxEnabled,
         ctorDescriptor: ( (new SyncDescriptor(BulkEditPane))),
         containerIcon: refactorPreviewViewIcon,

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

@@ -132,15 +132,15 @@ 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(5277, 'Apply'));
+        btnConfirm.label = ( localize(5309, 'Apply'));
         btnConfirm.onDidClick(() => this.accept(), this, this._disposables);
         const btnCancel = buttonBar.addButton({ ...defaultButtonStyles, secondary: true });
-        btnCancel.label = ( localize(5278, 'Discard'));
+        btnCancel.label = ( localize(5310, 'Discard'));
         btnCancel.onDidClick(() => this.discard(), this, this._disposables);
         this._message = document.createElement('span');
         this._message.className = 'message';
         this._message.innerText = ( localize(
-            5279,
+            5311,
             "Invoke a code action, like rename, to see a preview of its changes here."
         ));
         parent.appendChild(this._message);
@@ -215,14 +215,14 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         let message;
         if (conflicts.length === 1) {
             message = ( localize(
-                5280,
+                5312,
                 "Cannot apply refactoring because '{0}' has changed in the meantime.",
                 this._labelService.getUriLabel(conflicts[0], { relative: true })
             ));
         }
         else {
             message = ( localize(
-                5281,
+                5313,
                 "Cannot apply refactoring because {0} other files have changed in the meantime.",
                 conflicts.length
             ));

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

@@ -95,7 +95,7 @@ class BulkFileOperation {
 }
 class BulkCategory {
     static { this._defaultMetadata = ( (Object.freeze({
-        label: ( localize(10093, "Other")),
+        label: ( localize(10174, "Other")),
         icon: Codicon.symbolFile,
         needsConfirmation: false
     }))); }

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

@@ -3,7 +3,7 @@ import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resol
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
 import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
-import { asCSSUrl, addDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
+import { 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 { BulkFileOperations } from './bulkEditPreview.js';
@@ -20,6 +20,7 @@ import { ResourceFileEdit } from 'vscode/vscode/vs/editor/browser/services/bulkE
 import { PLAINTEXT_LANGUAGE_ID } from 'vscode/vscode/vs/editor/common/languages/modesRegistry';
 import { SnippetParser } from 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetParser';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { asCSSUrl } from 'vscode/vscode/vs/base/browser/cssValue';
 
 var CategoryElementRenderer_1, FileElementRenderer_1, TextEditElementRenderer_1;
 class CategoryElement {
@@ -240,7 +241,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
         this._labelService = _labelService;
     }
     getWidgetAriaLabel() {
-        return ( localize(10094, "Bulk Edit"));
+        return ( localize(10175, "Bulk Edit"));
     }
     getRole(_element) {
         return 'checkbox';
@@ -250,7 +251,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             if (element.edit.textEdits.length > 0) {
                 if (element.edit.type & 8  && element.edit.newUri) {
                     return ( localize(
-                        10095,
+                        10176,
                         "Renaming {0} to {1}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true }),
                         this._labelService.getUriLabel(element.edit.newUri, { relative: true })
@@ -258,21 +259,21 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
                 }
                 else if (element.edit.type & 2 ) {
                     return ( localize(
-                        10096,
+                        10177,
                         "Creating {0}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
                 }
                 else if (element.edit.type & 4 ) {
                     return ( localize(
-                        10097,
+                        10178,
                         "Deleting {0}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
                 }
                 else {
                     return ( localize(
-                        10098,
+                        10179,
                         "{0}, making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
@@ -281,7 +282,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             else {
                 if (element.edit.type & 8  && element.edit.newUri) {
                     return ( localize(
-                        10099,
+                        10180,
                         "Renaming {0} to {1}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true }),
                         this._labelService.getUriLabel(element.edit.newUri, { relative: true })
@@ -289,14 +290,14 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
                 }
                 else if (element.edit.type & 2 ) {
                     return ( localize(
-                        10100,
+                        10181,
                         "Creating {0}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
                 }
                 else if (element.edit.type & 4 ) {
                     return ( localize(
-                        10101,
+                        10182,
                         "Deleting {0}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
@@ -306,7 +307,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
         if (element instanceof TextEditElement) {
             if (element.selecting.length > 0 && element.inserting.length > 0) {
                 return ( localize(
-                    10102,
+                    10183,
                     "line {0}, replacing {1} with {2}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting,
@@ -315,7 +316,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             }
             else if (element.selecting.length > 0 && element.inserting.length === 0) {
                 return ( localize(
-                    10103,
+                    10184,
                     "line {0}, removing {1}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting
@@ -323,7 +324,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             }
             else if (element.selecting.length === 0 && element.inserting.length > 0) {
                 return ( localize(
-                    10104,
+                    10185,
                     "line {0}, inserting {1}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting
@@ -431,7 +432,7 @@ let FileElementTemplate = class FileElementTemplate {
             this._label.setResource({
                 resource: element.edit.uri,
                 name: ( localize(
-                    10105,
+                    10186,
                     "{0} → {1}",
                     this._labelService.getUriLabel(element.edit.uri, { relative: true }),
                     this._labelService.getUriLabel(element.edit.newUri, { relative: true })
@@ -439,7 +440,7 @@ let FileElementTemplate = class FileElementTemplate {
             }, {
                 fileDecorations: { colors: true, badges: false }
             });
-            this._details.innerText = ( localize(10106, "(renaming)"));
+            this._details.innerText = ( localize(10187, "(renaming)"));
         }
         else {
             const options = {
@@ -449,10 +450,10 @@ let FileElementTemplate = class FileElementTemplate {
                 extraClasses: []
             };
             if (element.edit.type & 2 ) {
-                this._details.innerText = ( localize(10107, "(creating)"));
+                this._details.innerText = ( localize(10188, "(creating)"));
             }
             else if (element.edit.type & 4 ) {
-                this._details.innerText = ( localize(10108, "(deleting)"));
+                this._details.innerText = ( localize(10189, "(deleting)"));
                 options.extraClasses.push('delete');
             }
             else {
@@ -531,7 +532,7 @@ let TextEditElementTemplate = class TextEditElementTemplate {
         let title;
         const { metadata } = element.edit.textEdit;
         if (metadata && metadata.description) {
-            title = ( localize(10109, "{0} - {1}", metadata.label, metadata.description));
+            title = ( localize(10190, "{0} - {1}", metadata.label, metadata.description));
         }
         else if (metadata) {
             title = metadata.label;