@codingame/monaco-vscode-bulk-edit-service-override 8.0.3 → 9.0.0

package/package.json

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

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

@@ -68,24 +68,24 @@ let BulkEdit = class BulkEdit {
             }
         }
         if (this._edits.length === 0) {
-            return ( localize(2089, "Made no edits"));
+            return ( localize(1620, "Made no edits"));
         }
         else if (otherResources.size === 0) {
             if (textEditCount > 1 && textEditResources.size > 1) {
                 return ( localize(
-                    2090,
+                    1621,
                     "Made {0} text edits in {1} files",
                     textEditCount,
                     textEditResources.size
                 ));
             }
             else {
-                return ( localize(2091, "Made {0} text edits in one file", textEditCount));
+                return ( localize(1622, "Made {0} text edits in one file", textEditCount));
             }
         }
         else {
             return ( localize(
-                2092,
+                1623,
                 "Made {0} text edits in {1} files, also created or deleted {2} files",
                 textEditCount,
                 textEditResources.size,
@@ -134,12 +134,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(2093, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress, this._token, edits);
+        const model = this._instaService.createInstance(BulkFileEdits, this._label || ( localize(1624, "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(2093, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', this._editor, undoRedoGroup, undoRedoSource, progress, this._token, edits);
+        const model = this._instaService.createInstance(BulkTextEdits, this._label || ( localize(1624, "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 +177,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(2094, "Made no edits")), isApplied: false };
+            return { ariaSummary: ( localize(1625, "Made no edits")), isApplied: false };
         }
         if (this._previewHandler && (options?.showPreview || ( (edits.some(value => value.metadata?.needsConfirmation))))) {
             edits = await this._previewHandler(edits, options);
@@ -248,25 +248,25 @@ let BulkEditService = class BulkEditService {
         let primaryButton;
         switch (reason) {
             case ShutdownReason.CLOSE:
-                message = ( localize(2095, "Are you sure you want to close the window?"));
-                primaryButton = ( localize(2096, "&&Close Window"));
+                message = ( localize(1626, "Are you sure you want to close the window?"));
+                primaryButton = ( localize(1627, "&&Close Window"));
                 break;
             case ShutdownReason.LOAD:
-                message = ( localize(2097, "Are you sure you want to change the workspace?"));
-                primaryButton = ( localize(2098, "Change &&Workspace"));
+                message = ( localize(1628, "Are you sure you want to change the workspace?"));
+                primaryButton = ( localize(1629, "Change &&Workspace"));
                 break;
             case ShutdownReason.RELOAD:
-                message = ( localize(2099, "Are you sure you want to reload the window?"));
-                primaryButton = ( localize(2100, "&&Reload Window"));
+                message = ( localize(1630, "Are you sure you want to reload the window?"));
+                primaryButton = ( localize(1631, "&&Reload Window"));
                 break;
             default:
-                message = ( localize(2101, "Are you sure you want to quit?"));
-                primaryButton = ( localize(2102, "&&Quit"));
+                message = ( localize(1632, "Are you sure you want to quit?"));
+                primaryButton = ( localize(1633, "&&Quit"));
                 break;
         }
         const result = await this._dialogService.confirm({
             message,
-            detail: ( localize(2103, "'{0}' is in progress.", label || ( localize(2104, "File operation")))),
+            detail: ( localize(1634, "'{0}' is in progress.", label || ( localize(1635, "File operation")))),
             primaryButton
         });
         return !result.confirmed;
@@ -287,7 +287,7 @@ const autoSaveSetting = 'files.refactoring.autoSave';
     properties: {
         [autoSaveSetting]: {
             description: ( localize(
-                2105,
+                1636,
                 "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

@@ -96,12 +96,12 @@ let BulkEditPreviewContribution = class BulkEditPreviewContribution {
         if (view.hasInput()) {
             const { confirmed } = await this._dialogService.confirm({
                 type: Severity$1.Info,
-                message: ( localize(2106, "Another refactoring is being previewed.")),
+                message: ( localize(1637, "Another refactoring is being previewed.")),
                 detail: ( localize(
-                    2107,
+                    1638,
                     "Press 'Continue' to discard the previous refactoring and continue with the current refactoring."
                 )),
-                primaryButton: ( localize(2108, "&&Continue"))
+                primaryButton: ( localize(1639, "&&Continue"))
             });
             if (!confirmed) {
                 return [];
@@ -142,8 +142,8 @@ registerAction2(class ApplyAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.apply',
-            title: ( localize2(2109, "Apply Refactoring")),
-            category: ( localize2(2110, "Refactor Preview")),
+            title: ( localize2(1640, "Apply Refactoring")),
+            category: ( localize2(1641, "Refactor Preview")),
             icon: Codicon.check,
             precondition: ( (ContextKeyExpr.and(BulkEditPreviewContribution.ctxEnabled, BulkEditPane.ctxHasCheckedChanges))),
             menu: [{
@@ -170,8 +170,8 @@ registerAction2(class DiscardAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.discard',
-            title: ( localize2(2111, "Discard Refactoring")),
-            category: ( localize2(2110, "Refactor Preview")),
+            title: ( localize2(1642, "Discard Refactoring")),
+            category: ( localize2(1641, "Refactor Preview")),
             icon: Codicon.clearAll,
             precondition: BulkEditPreviewContribution.ctxEnabled,
             menu: [{
@@ -190,8 +190,8 @@ registerAction2(class ToggleAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.toggleCheckedState',
-            title: ( localize2(2112, "Toggle Change")),
-            category: ( localize2(2110, "Refactor Preview")),
+            title: ( localize2(1643, "Toggle Change")),
+            category: ( localize2(1641, "Refactor Preview")),
             precondition: BulkEditPreviewContribution.ctxEnabled,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -214,8 +214,8 @@ registerAction2(class GroupByFile extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.groupByFile',
-            title: ( localize2(2113, "Group Changes By File")),
-            category: ( localize2(2110, "Refactor Preview")),
+            title: ( localize2(1644, "Group Changes By File")),
+            category: ( localize2(1641, "Refactor Preview")),
             icon: Codicon.ungroupByRefType,
             precondition: ( (ContextKeyExpr.and(
                 BulkEditPane.ctxHasCategories,
@@ -243,8 +243,8 @@ registerAction2(class GroupByType extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.groupByType',
-            title: ( localize2(2114, "Group Changes By Type")),
-            category: ( localize2(2110, "Refactor Preview")),
+            title: ( localize2(1645, "Group Changes By Type")),
+            category: ( localize2(1641, "Refactor Preview")),
             icon: Codicon.groupByRefType,
             precondition: ( (ContextKeyExpr.and(
                 BulkEditPane.ctxHasCategories,
@@ -269,8 +269,8 @@ registerAction2(class ToggleGrouping extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.toggleGrouping',
-            title: ( localize2(2114, "Group Changes By Type")),
-            category: ( localize2(2110, "Refactor Preview")),
+            title: ( localize2(1645, "Group Changes By Type")),
+            category: ( localize2(1641, "Refactor Preview")),
             icon: Codicon.listTree,
             toggled: ( (BulkEditPane.ctxGroupByFile.negate())),
             precondition: ( (ContextKeyExpr.and(BulkEditPane.ctxHasCategories, BulkEditPreviewContribution.ctxEnabled))),
@@ -287,10 +287,10 @@ registerAction2(class ToggleGrouping extends Action2 {
     }
 });
 registerWorkbenchContribution2(BulkEditPreviewContribution.ID, BulkEditPreviewContribution, WorkbenchPhase.BlockRestore);
-const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codicon.lightbulb, ( localize(2115, 'View icon of the refactor preview view.')));
+const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codicon.lightbulb, ( localize(1646, 'View icon of the refactor preview view.')));
 const container = ( (Registry.as(Extensions.ViewContainersRegistry))).registerViewContainer({
     id: BulkEditPane.ID,
-    title: ( localize2(2116, "Refactor Preview")),
+    title: ( localize2(1647, "Refactor Preview")),
     hideIfEmpty: true,
     ctorDescriptor: ( (new SyncDescriptor(
         ViewPaneContainer,
@@ -301,7 +301,7 @@ const container = ( (Registry.as(Extensions.ViewContainersRegistry))).registerVi
 }, ViewContainerLocation.Panel);
 ( (Registry.as(Extensions.ViewsRegistry))).registerViews([{
         id: BulkEditPane.ID,
-        name: ( localize2(2116, "Refactor Preview")),
+        name: ( localize2(1647, "Refactor Preview")),
         when: BulkEditPreviewContribution.ctxEnabled,
         ctorDescriptor: ( (new SyncDescriptor(BulkEditPane))),
         containerIcon: refactorPreviewViewIcon,

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

@@ -138,15 +138,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(5286, 'Apply'));
+        btnConfirm.label = ( localize(5234, 'Apply'));
         btnConfirm.onDidClick(() => this.accept(), this, this._disposables);
         const btnCancel = buttonBar.addButton({ ...defaultButtonStyles, secondary: true });
-        btnCancel.label = ( localize(5287, 'Discard'));
+        btnCancel.label = ( localize(5235, 'Discard'));
         btnCancel.onDidClick(() => this.discard(), this, this._disposables);
         this._message = document.createElement('span');
         this._message.className = 'message';
         this._message.innerText = ( localize(
-            5288,
+            5236,
             "Invoke a code action, like rename, to see a preview of its changes here."
         ));
         parent.appendChild(this._message);
@@ -221,14 +221,14 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         let message;
         if (conflicts.length === 1) {
             message = ( localize(
-                5289,
+                5237,
                 "Cannot apply refactoring because '{0}' has changed in the meantime.",
                 this._labelService.getUriLabel(conflicts[0], { relative: true })
             ));
         }
         else {
             message = ( localize(
-                5290,
+                5238,
                 "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

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

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

@@ -16,12 +16,10 @@ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeServi
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { compare } from 'vscode/vscode/vs/base/common/strings';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { ResourceFileEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
-import { ILanguageConfigurationService } from 'vscode/vscode/vs/editor/common/languages/languageConfigurationRegistry';
-import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 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';
 
 var CategoryElementRenderer_1, FileElementRenderer_1, TextEditElementRenderer_1;
 class CategoryElement {
@@ -152,11 +150,9 @@ class TextEditElement {
     }
 }
 let BulkEditDataSource = class BulkEditDataSource {
-    constructor(_textModelService, _undoRedoService, _languageService, _languageConfigurationService) {
+    constructor(_textModelService, _instantiationService) {
         this._textModelService = _textModelService;
-        this._undoRedoService = _undoRedoService;
-        this._languageService = _languageService;
-        this._languageConfigurationService = _languageConfigurationService;
+        this._instantiationService = _instantiationService;
         this.groupByFile = true;
     }
     hasChildren(element) {
@@ -186,15 +182,7 @@ let BulkEditDataSource = class BulkEditDataSource {
                 textModelDisposable = ref;
             }
             catch {
-                textModel = ( (new TextModel(
-                    '',
-                    PLAINTEXT_LANGUAGE_ID,
-                    TextModel.DEFAULT_CREATION_OPTIONS,
-                    null,
-                    this._undoRedoService,
-                    this._languageService,
-                    this._languageConfigurationService
-                )));
+                textModel = this._instantiationService.createInstance(TextModel, '', PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null);
                 textModelDisposable = textModel;
             }
             const result = ( (element.edit.textEdits.map((edit, idx) => {
@@ -231,9 +219,7 @@ let BulkEditDataSource = class BulkEditDataSource {
 };
 BulkEditDataSource = ( (__decorate([
     ( (__param(0, ITextModelService))),
-    ( (__param(1, IUndoRedoService))),
-    ( (__param(2, ILanguageService))),
-    ( (__param(3, ILanguageConfigurationService)))
+    ( (__param(1, IInstantiationService)))
 ], BulkEditDataSource)));
 class BulkEditSorter {
     compare(a, b) {
@@ -254,7 +240,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
         this._labelService = _labelService;
     }
     getWidgetAriaLabel() {
-        return ( localize(9970, "Bulk Edit"));
+        return ( localize(9996, "Bulk Edit"));
     }
     getRole(_element) {
         return 'checkbox';
@@ -264,7 +250,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             if (element.edit.textEdits.length > 0) {
                 if (element.edit.type & BulkFileOperationType.Rename && element.edit.newUri) {
                     return ( localize(
-                        9971,
+                        9997,
                         "Renaming {0} to {1}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true }),
                         this._labelService.getUriLabel(element.edit.newUri, { relative: true })
@@ -272,21 +258,21 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
                 }
                 else if (element.edit.type & BulkFileOperationType.Create) {
                     return ( localize(
-                        9972,
+                        9998,
                         "Creating {0}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
                 }
                 else if (element.edit.type & BulkFileOperationType.Delete) {
                     return ( localize(
-                        9973,
+                        9999,
                         "Deleting {0}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
                 }
                 else {
                     return ( localize(
-                        9974,
+                        10000,
                         "{0}, making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
@@ -295,7 +281,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             else {
                 if (element.edit.type & BulkFileOperationType.Rename && element.edit.newUri) {
                     return ( localize(
-                        9975,
+                        10001,
                         "Renaming {0} to {1}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true }),
                         this._labelService.getUriLabel(element.edit.newUri, { relative: true })
@@ -303,14 +289,14 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
                 }
                 else if (element.edit.type & BulkFileOperationType.Create) {
                     return ( localize(
-                        9976,
+                        10002,
                         "Creating {0}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
                 }
                 else if (element.edit.type & BulkFileOperationType.Delete) {
                     return ( localize(
-                        9977,
+                        10003,
                         "Deleting {0}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
@@ -320,7 +306,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
         if (element instanceof TextEditElement) {
             if (element.selecting.length > 0 && element.inserting.length > 0) {
                 return ( localize(
-                    9978,
+                    10004,
                     "line {0}, replacing {1} with {2}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting,
@@ -329,7 +315,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             }
             else if (element.selecting.length > 0 && element.inserting.length === 0) {
                 return ( localize(
-                    9979,
+                    10005,
                     "line {0}, removing {1}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting
@@ -337,7 +323,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             }
             else if (element.selecting.length === 0 && element.inserting.length > 0) {
                 return ( localize(
-                    9980,
+                    10006,
                     "line {0}, inserting {1}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting
@@ -445,7 +431,7 @@ let FileElementTemplate = class FileElementTemplate {
             this._label.setResource({
                 resource: element.edit.uri,
                 name: ( localize(
-                    9981,
+                    10007,
                     "{0} → {1}",
                     this._labelService.getUriLabel(element.edit.uri, { relative: true }),
                     this._labelService.getUriLabel(element.edit.newUri, { relative: true })
@@ -453,7 +439,7 @@ let FileElementTemplate = class FileElementTemplate {
             }, {
                 fileDecorations: { colors: true, badges: false }
             });
-            this._details.innerText = ( localize(9982, "(renaming)"));
+            this._details.innerText = ( localize(10008, "(renaming)"));
         }
         else {
             const options = {
@@ -463,10 +449,10 @@ let FileElementTemplate = class FileElementTemplate {
                 extraClasses: []
             };
             if (element.edit.type & BulkFileOperationType.Create) {
-                this._details.innerText = ( localize(9983, "(creating)"));
+                this._details.innerText = ( localize(10009, "(creating)"));
             }
             else if (element.edit.type & BulkFileOperationType.Delete) {
-                this._details.innerText = ( localize(9984, "(deleting)"));
+                this._details.innerText = ( localize(10010, "(deleting)"));
                 options.extraClasses.push('delete');
             }
             else {
@@ -545,7 +531,7 @@ let TextEditElementTemplate = class TextEditElementTemplate {
         let title;
         const { metadata } = element.edit.textEdit;
         if (metadata && metadata.description) {
-            title = ( localize(9985, "{0} - {1}", metadata.label, metadata.description));
+            title = ( localize(10011, "{0} - {1}", metadata.label, metadata.description));
         }
         else if (metadata) {
             title = metadata.label;