@codingame/monaco-vscode-bulk-edit-service-override 7.0.11 → 7.1.1

package/package.json

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

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

@@ -6,7 +6,7 @@ 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 { localizeWithPath } from 'vscode/vscode/vs/nls';
+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';
@@ -24,7 +24,6 @@ import { ShutdownReason } from 'vscode/vscode/vs/workbench/services/lifecycle/co
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 
-const _moduleId = "vs/workbench/contrib/bulkEdit/browser/bulkEditService";
 function liftEdits(edits) {
     return (
          (edits.map(edit => {
@@ -69,26 +68,24 @@ let BulkEdit = class BulkEdit {
             }
         }
         if (this._edits.length === 0) {
-            return ( localizeWithPath(_moduleId, 0, "Made no edits"));
+            return ( localize(2089, "Made no edits"));
         }
         else if (otherResources.size === 0) {
             if (textEditCount > 1 && textEditResources.size > 1) {
-                return ( localizeWithPath(
-                    _moduleId,
-                    1,
+                return ( localize(
+                    2090,
                     "Made {0} text edits in {1} files",
                     textEditCount,
                     textEditResources.size
                 ));
             }
             else {
-                return ( localizeWithPath(_moduleId, 2, "Made {0} text edits in one file", textEditCount));
+                return ( localize(2091, "Made {0} text edits in one file", textEditCount));
             }
         }
         else {
-            return ( localizeWithPath(
-                _moduleId,
-                3,
+            return ( localize(
+                2092,
                 "Made {0} text edits in {1} files, also created or deleted {2} files",
                 textEditCount,
                 textEditResources.size,
@@ -137,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 || ( localizeWithPath(_moduleId, 4, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress, this._token, edits);
+        const model = this._instaService.createInstance(BulkFileEdits, this._label || ( localize(2093, "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 || ( localizeWithPath(_moduleId, 4, "Workspace Edit")), this._code || 'undoredo.workspaceEdit', this._editor, undoRedoGroup, undoRedoSource, progress, this._token, 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);
         return await model.apply();
     }
     async _performCellEdits(edits, undoRedoGroup, undoRedoSource, progress) {
@@ -180,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: ( localizeWithPath(_moduleId, 5, "Made no edits")), isApplied: false };
+            return { ariaSummary: ( localize(2094, "Made no edits")), isApplied: false };
         }
         if (this._previewHandler && (options?.showPreview || ( (edits.some(value => value.metadata?.needsConfirmation))))) {
             edits = await this._previewHandler(edits, options);
@@ -251,25 +248,25 @@ let BulkEditService = class BulkEditService {
         let primaryButton;
         switch (reason) {
             case ShutdownReason.CLOSE:
-                message = ( localizeWithPath(_moduleId, 6, "Are you sure you want to close the window?"));
-                primaryButton = ( localizeWithPath(_moduleId, 7, "&&Close Window"));
+                message = ( localize(2095, "Are you sure you want to close the window?"));
+                primaryButton = ( localize(2096, "&&Close Window"));
                 break;
             case ShutdownReason.LOAD:
-                message = ( localizeWithPath(_moduleId, 8, "Are you sure you want to change the workspace?"));
-                primaryButton = ( localizeWithPath(_moduleId, 9, "Change &&Workspace"));
+                message = ( localize(2097, "Are you sure you want to change the workspace?"));
+                primaryButton = ( localize(2098, "Change &&Workspace"));
                 break;
             case ShutdownReason.RELOAD:
-                message = ( localizeWithPath(_moduleId, 10, "Are you sure you want to reload the window?"));
-                primaryButton = ( localizeWithPath(_moduleId, 11, "&&Reload Window"));
+                message = ( localize(2099, "Are you sure you want to reload the window?"));
+                primaryButton = ( localize(2100, "&&Reload Window"));
                 break;
             default:
-                message = ( localizeWithPath(_moduleId, 12, "Are you sure you want to quit?"));
-                primaryButton = ( localizeWithPath(_moduleId, 13, "&&Quit"));
+                message = ( localize(2101, "Are you sure you want to quit?"));
+                primaryButton = ( localize(2102, "&&Quit"));
                 break;
         }
         const result = await this._dialogService.confirm({
             message,
-            detail: ( localizeWithPath(_moduleId, 14, "'{0}' is in progress.", label || ( localizeWithPath(_moduleId, 15, "File operation")))),
+            detail: ( localize(2103, "'{0}' is in progress.", label || ( localize(2104, "File operation")))),
             primaryButton
         });
         return !result.confirmed;
@@ -289,9 +286,8 @@ const autoSaveSetting = 'files.refactoring.autoSave';
     id: 'files',
     properties: {
         [autoSaveSetting]: {
-            description: ( localizeWithPath(
-                _moduleId,
-                16,
+            description: ( localize(
+                2105,
                 "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

@@ -6,7 +6,7 @@ import { BulkEditPane } from './bulkEditPane.js';
 import { ViewContainerLocation, 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 { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -25,7 +25,6 @@ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistr
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 
 var BulkEditPreviewContribution_1;
-const _moduleId = "vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution";
 async function getBulkEditPane(viewsService) {
     const view = await viewsService.openView(BulkEditPane.ID, true);
     if (view instanceof BulkEditPane) {
@@ -97,13 +96,12 @@ let BulkEditPreviewContribution = class BulkEditPreviewContribution {
         if (view.hasInput()) {
             const { confirmed } = await this._dialogService.confirm({
                 type: Severity$1.Info,
-                message: ( localizeWithPath(_moduleId, 0, "Another refactoring is being previewed.")),
-                detail: ( localizeWithPath(
-                    _moduleId,
-                    1,
+                message: ( localize(2106, "Another refactoring is being previewed.")),
+                detail: ( localize(
+                    2107,
                     "Press 'Continue' to discard the previous refactoring and continue with the current refactoring."
                 )),
-                primaryButton: ( localizeWithPath(_moduleId, 2, "&&Continue"))
+                primaryButton: ( localize(2108, "&&Continue"))
             });
             if (!confirmed) {
                 return [];
@@ -144,8 +142,8 @@ registerAction2(class ApplyAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.apply',
-            title: ( localize2WithPath(_moduleId, 3, "Apply Refactoring")),
-            category: ( localize2WithPath(_moduleId, 4, "Refactor Preview")),
+            title: ( localize2(2109, "Apply Refactoring")),
+            category: ( localize2(2110, "Refactor Preview")),
             icon: Codicon.check,
             precondition: ( (ContextKeyExpr.and(BulkEditPreviewContribution.ctxEnabled, BulkEditPane.ctxHasCheckedChanges))),
             menu: [{
@@ -172,8 +170,8 @@ registerAction2(class DiscardAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.discard',
-            title: ( localize2WithPath(_moduleId, 5, "Discard Refactoring")),
-            category: ( localize2WithPath(_moduleId, 4, "Refactor Preview")),
+            title: ( localize2(2111, "Discard Refactoring")),
+            category: ( localize2(2111, "Refactor Preview")),
             icon: Codicon.clearAll,
             precondition: BulkEditPreviewContribution.ctxEnabled,
             menu: [{
@@ -192,8 +190,8 @@ registerAction2(class ToggleAction extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.toggleCheckedState',
-            title: ( localize2WithPath(_moduleId, 6, "Toggle Change")),
-            category: ( localize2WithPath(_moduleId, 4, "Refactor Preview")),
+            title: ( localize2(2112, "Toggle Change")),
+            category: ( localize2(2112, "Refactor Preview")),
             precondition: BulkEditPreviewContribution.ctxEnabled,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -216,8 +214,8 @@ registerAction2(class GroupByFile extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.groupByFile',
-            title: ( localize2WithPath(_moduleId, 7, "Group Changes By File")),
-            category: ( localize2WithPath(_moduleId, 4, "Refactor Preview")),
+            title: ( localize2(2113, "Group Changes By File")),
+            category: ( localize2(2113, "Refactor Preview")),
             icon: Codicon.ungroupByRefType,
             precondition: ( (ContextKeyExpr.and(
                 BulkEditPane.ctxHasCategories,
@@ -245,8 +243,8 @@ registerAction2(class GroupByType extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.groupByType',
-            title: ( localize2WithPath(_moduleId, 8, "Group Changes By Type")),
-            category: ( localize2WithPath(_moduleId, 4, "Refactor Preview")),
+            title: ( localize2(2114, "Group Changes By Type")),
+            category: ( localize2(2114, "Refactor Preview")),
             icon: Codicon.groupByRefType,
             precondition: ( (ContextKeyExpr.and(
                 BulkEditPane.ctxHasCategories,
@@ -271,8 +269,8 @@ registerAction2(class ToggleGrouping extends Action2 {
     constructor() {
         super({
             id: 'refactorPreview.toggleGrouping',
-            title: ( localize2WithPath(_moduleId, 8, "Group Changes By Type")),
-            category: ( localize2WithPath(_moduleId, 4, "Refactor Preview")),
+            title: ( localize2(2114, "Group Changes By Type")),
+            category: ( localize2(2114, "Refactor Preview")),
             icon: Codicon.listTree,
             toggled: ( (BulkEditPane.ctxGroupByFile.negate())),
             precondition: ( (ContextKeyExpr.and(BulkEditPane.ctxHasCategories, BulkEditPreviewContribution.ctxEnabled))),
@@ -289,10 +287,10 @@ registerAction2(class ToggleGrouping extends Action2 {
     }
 });
 registerWorkbenchContribution2(BulkEditPreviewContribution.ID, BulkEditPreviewContribution, WorkbenchPhase.BlockRestore);
-const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codicon.lightbulb, ( localizeWithPath(_moduleId, 9, 'View icon of the refactor preview view.')));
+const refactorPreviewViewIcon = registerIcon('refactor-preview-view-icon', Codicon.lightbulb, ( localize(2115, 'View icon of the refactor preview view.')));
 const container = ( (Registry.as(Extensions.ViewContainersRegistry))).registerViewContainer({
     id: BulkEditPane.ID,
-    title: ( localize2WithPath(_moduleId, 10, "Refactor Preview")),
+    title: ( localize2(2116, "Refactor Preview")),
     hideIfEmpty: true,
     ctorDescriptor: ( (new SyncDescriptor(
         ViewPaneContainer,
@@ -303,7 +301,7 @@ const container = ( (Registry.as(Extensions.ViewContainersRegistry))).registerVi
 }, ViewContainerLocation.Panel);
 ( (Registry.as(Extensions.ViewsRegistry))).registerViews([{
         id: BulkEditPane.ID,
-        name: ( localize2WithPath(_moduleId, 10, "Refactor Preview")),
+        name: ( localize2(2116, "Refactor Preview")),
         when: BulkEditPreviewContribution.ctxEnabled,
         ctorDescriptor: ( (new SyncDescriptor(BulkEditPane))),
         containerIcon: refactorPreviewViewIcon,

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

@@ -1,38 +1,37 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import './bulkEdit.css.js';
-import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
-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.service';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { ButtonBar } from 'vscode/vscode/vs/base/browser/ui/button/button';
+import { LRUCachedFunction, CachedFunction } from 'vscode/vscode/vs/base/common/cache';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-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';
-import { BulkFileOperationType, BulkEditPreviewProvider, BulkFileOperations } from './bulkEditPreview.js';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
-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.service';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import './bulkEdit.css.js';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { localize } from 'vscode/vscode/vs/nls';
+import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
-import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
-import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+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 { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
-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 { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
+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 { 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;
-const _moduleId = "vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane";
 var State;
 ( ((function(State) {
     State["Data"] = "data";
@@ -45,7 +44,7 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
     static { this.ctxHasCategories = ( (new RawContextKey('refactorPreview.hasCategories', false))); }
     static { this.ctxGroupByFile = ( (new RawContextKey('refactorPreview.groupByFile', true))); }
     static { this.ctxHasCheckedChanges = ( (new RawContextKey('refactorPreview.hasCheckedChanges', true))); }
-    static { this._memGroupByFile = `${BulkEditPane_1.ID}.groupByFile`; }
+    static { this._memGroupByFile = `${this.ID}.groupByFile`; }
     constructor(options, _instaService, _editorService, _labelService, _textModelService, _dialogService, _contextMenuService, _storageService, contextKeyService, viewDescriptorService, keybindingService, contextMenuService, configurationService, openerService, themeService, telemetryService, hoverService) {
         super({ ...options, titleMenuId: MenuId.BulkEditTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, _instaService, openerService, themeService, telemetryService, hoverService);
         this._instaService = _instaService;
@@ -65,7 +64,8 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
                 if (fileOperation.type & BulkFileOperationType.Delete) {
                     return {
                         original: { resource: URI.revive(previewUri) },
-                        modified: { resource: undefined }
+                        modified: { resource: undefined },
+                        goToFileResource: fileOperation.uri,
                     };
                 }
                 else {
@@ -79,7 +79,8 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
                     }
                     return {
                         original: { resource: URI.revive(leftResource) },
-                        modified: { resource: URI.revive(previewUri) }
+                        modified: { resource: URI.revive(previewUri) },
+                        goToFileResource: leftResource,
                     };
                 }
             })));
@@ -137,16 +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 = ( localizeWithPath(_moduleId, 0, 'Apply'));
+        btnConfirm.label = ( localize(5286, 'Apply'));
         btnConfirm.onDidClick(() => this.accept(), this, this._disposables);
         const btnCancel = buttonBar.addButton({ ...defaultButtonStyles, secondary: true });
-        btnCancel.label = ( localizeWithPath(_moduleId, 1, 'Discard'));
+        btnCancel.label = ( localize(5287, 'Discard'));
         btnCancel.onDidClick(() => this.discard(), this, this._disposables);
         this._message = document.createElement('span');
         this._message.className = 'message';
-        this._message.innerText = ( localizeWithPath(
-            _moduleId,
-            2,
+        this._message.innerText = ( localize(
+            5288,
             "Invoke a code action, like rename, to see a preview of its changes here."
         ));
         parent.appendChild(this._message);
@@ -220,17 +220,15 @@ let BulkEditPane = class BulkEditPane extends ViewPane {
         }
         let message;
         if (conflicts.length === 1) {
-            message = ( localizeWithPath(
-                _moduleId,
-                3,
+            message = ( localize(
+                5289,
                 "Cannot apply refactoring because '{0}' has changed in the meantime.",
                 this._labelService.getUriLabel(conflicts[0], { relative: true })
             ));
         }
         else {
-            message = ( localizeWithPath(
-                _moduleId,
-                4,
+            message = ( localize(
+                5290,
                 "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

@@ -13,7 +13,7 @@ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.servi
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { ConflictDetector } from '../conflicts.js';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { extUri } from 'vscode/vscode/vs/base/common/resources';
 import { ResourceTextEdit, ResourceFileEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
@@ -22,7 +22,6 @@ import { SnippetParser } from 'vscode/vscode/vs/editor/contrib/snippet/browser/s
 import { MicrotaskDelay } from 'vscode/vscode/vs/base/common/symbols';
 
 var BulkFileOperations_1, BulkEditPreviewProvider_1;
-const _moduleId = "vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview";
 class CheckedStates {
     constructor() {
         this._states = ( (new WeakMap()));
@@ -103,7 +102,7 @@ class BulkFileOperation {
 }
 class BulkCategory {
     static { this._defaultMetadata = ( (Object.freeze({
-        label: ( localizeWithPath(_moduleId, 0, "Other")),
+        label: ( localize(9969, "Other")),
         icon: Codicon.symbolFile,
         needsConfirmation: false
     }))); }
@@ -291,7 +290,7 @@ BulkFileOperations = BulkFileOperations_1 = ( (__decorate([
 let BulkEditPreviewProvider = class BulkEditPreviewProvider {
     static { BulkEditPreviewProvider_1 = this; }
     static { this.Schema = 'vscode-bulkeditpreview-editor'; }
-    static { this.emptyPreview = ( (URI.from({ scheme: BulkEditPreviewProvider_1.Schema, fragment: 'empty' }))); }
+    static { this.emptyPreview = ( (URI.from({ scheme: this.Schema, fragment: 'empty' }))); }
     static fromPreviewUri(uri) {
         return (
              (URI.parse(uri.query))

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

@@ -8,7 +8,7 @@ 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 { FileKind } from 'vscode/vscode/vs/platform/files/common/files';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { IconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
@@ -24,7 +24,6 @@ import { PLAINTEXT_LANGUAGE_ID } from 'vscode/vscode/vs/editor/common/languages/
 import { SnippetParser } from 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetParser';
 
 var CategoryElementRenderer_1, FileElementRenderer_1, TextEditElementRenderer_1;
-const _moduleId = "vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree";
 class CategoryElement {
     constructor(parent, category) {
         this.parent = parent;
@@ -255,7 +254,7 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
         this._labelService = _labelService;
     }
     getWidgetAriaLabel() {
-        return ( localizeWithPath(_moduleId, 0, "Bulk Edit"));
+        return ( localize(9970, "Bulk Edit"));
     }
     getRole(_element) {
         return 'checkbox';
@@ -264,34 +263,30 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
         if (element instanceof FileElement) {
             if (element.edit.textEdits.length > 0) {
                 if (element.edit.type & BulkFileOperationType.Rename && element.edit.newUri) {
-                    return ( localizeWithPath(
-                        _moduleId,
-                        1,
+                    return ( localize(
+                        9971,
                         "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) {
-                    return ( localizeWithPath(
-                        _moduleId,
-                        2,
+                    return ( localize(
+                        9972,
                         "Creating {0}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
                 }
                 else if (element.edit.type & BulkFileOperationType.Delete) {
-                    return ( localizeWithPath(
-                        _moduleId,
-                        3,
+                    return ( localize(
+                        9973,
                         "Deleting {0}, also making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
                 }
                 else {
-                    return ( localizeWithPath(
-                        _moduleId,
-                        4,
+                    return ( localize(
+                        9974,
                         "{0}, making text edits",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
@@ -299,26 +294,23 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
             }
             else {
                 if (element.edit.type & BulkFileOperationType.Rename && element.edit.newUri) {
-                    return ( localizeWithPath(
-                        _moduleId,
-                        5,
+                    return ( localize(
+                        9975,
                         "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) {
-                    return ( localizeWithPath(
-                        _moduleId,
-                        6,
+                    return ( localize(
+                        9976,
                         "Creating {0}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
                 }
                 else if (element.edit.type & BulkFileOperationType.Delete) {
-                    return ( localizeWithPath(
-                        _moduleId,
-                        7,
+                    return ( localize(
+                        9977,
                         "Deleting {0}",
                         this._labelService.getUriLabel(element.edit.uri, { relative: true })
                     ));
@@ -327,9 +319,8 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
         }
         if (element instanceof TextEditElement) {
             if (element.selecting.length > 0 && element.inserting.length > 0) {
-                return ( localizeWithPath(
-                    _moduleId,
-                    8,
+                return ( localize(
+                    9978,
                     "line {0}, replacing {1} with {2}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting,
@@ -337,18 +328,16 @@ let BulkEditAccessibilityProvider = class BulkEditAccessibilityProvider {
                 ));
             }
             else if (element.selecting.length > 0 && element.inserting.length === 0) {
-                return ( localizeWithPath(
-                    _moduleId,
-                    9,
+                return ( localize(
+                    9979,
                     "line {0}, removing {1}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting
                 ));
             }
             else if (element.selecting.length === 0 && element.inserting.length > 0) {
-                return ( localizeWithPath(
-                    _moduleId,
-                    10,
+                return ( localize(
+                    9980,
                     "line {0}, inserting {1}",
                     element.edit.textEdit.textEdit.range.startLineNumber,
                     element.selecting
@@ -455,9 +444,8 @@ let FileElementTemplate = class FileElementTemplate {
         if (element.edit.type & BulkFileOperationType.Rename && element.edit.newUri) {
             this._label.setResource({
                 resource: element.edit.uri,
-                name: ( localizeWithPath(
-                    _moduleId,
-                    11,
+                name: ( localize(
+                    9981,
                     "{0} → {1}",
                     this._labelService.getUriLabel(element.edit.uri, { relative: true }),
                     this._labelService.getUriLabel(element.edit.newUri, { relative: true })
@@ -465,7 +453,7 @@ let FileElementTemplate = class FileElementTemplate {
             }, {
                 fileDecorations: { colors: true, badges: false }
             });
-            this._details.innerText = ( localizeWithPath(_moduleId, 12, "(renaming)"));
+            this._details.innerText = ( localize(9982, "(renaming)"));
         }
         else {
             const options = {
@@ -475,10 +463,10 @@ let FileElementTemplate = class FileElementTemplate {
                 extraClasses: []
             };
             if (element.edit.type & BulkFileOperationType.Create) {
-                this._details.innerText = ( localizeWithPath(_moduleId, 13, "(creating)"));
+                this._details.innerText = ( localize(9983, "(creating)"));
             }
             else if (element.edit.type & BulkFileOperationType.Delete) {
-                this._details.innerText = ( localizeWithPath(_moduleId, 14, "(deleting)"));
+                this._details.innerText = ( localize(9984, "(deleting)"));
                 options.extraClasses.push('delete');
             }
             else {
@@ -557,7 +545,7 @@ let TextEditElementTemplate = class TextEditElementTemplate {
         let title;
         const { metadata } = element.edit.textEdit;
         if (metadata && metadata.description) {
-            title = ( localizeWithPath(_moduleId, 15, "{0} - {1}", metadata.label, metadata.description));
+            title = ( localize(9985, "{0} - {1}", metadata.label, metadata.description));
         }
         else if (metadata) {
             title = metadata.label;