@codingame/monaco-vscode-view-common-service-override 7.1.0 → 8.0.0

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js

@@ -5,10 +5,9 @@ import { IconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel'
 import { SymbolTag, SymbolKinds } from 'vscode/vscode/vs/editor/common/languages';
 import { compare } from 'vscode/vscode/vs/base/common/strings';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 
-const _moduleId = "vs/workbench/contrib/callHierarchy/browser/callHierarchyTree";
 class Call {
     constructor(item, locations, model, parent) {
         this.item = item;
@@ -129,14 +128,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return ( localizeWithPath(_moduleId, 0, "Call Hierarchy"));
+        return ( localize(11188, "Call Hierarchy"));
     }
     getAriaLabel(element) {
         if (this.getDirection() === CallHierarchyDirection.CallsFrom) {
-            return ( localizeWithPath(_moduleId, 1, "calls from {0}", element.item.name));
+            return ( localize(11189, "calls from {0}", element.item.name));
         }
         else {
-            return ( localizeWithPath(_moduleId, 2, "callers of {0}", element.item.name));
+            return ( localize(11190, "callers of {0}", element.item.name));
         }
     }
 }

package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js

@@ -1,13 +1,12 @@
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { CustomEditorInfo } from './customEditor.js';
 import { customEditorsExtensionPoint } from './extensionPoint.js';
 import { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 
-const _moduleId = "vs/workbench/contrib/customEditor/common/contributedCustomEditors";
 class ContributedCustomEditors extends Disposable {
     static { this.CUSTOM_EDITORS_STORAGE_ID = 'customEditors'; }
     static { this.CUSTOM_EDITORS_ENTRY_ID = 'editors'; }
@@ -32,7 +31,7 @@ class ContributedCustomEditors extends Disposable {
                 this.add(( (new CustomEditorInfo({
                     id: webviewEditorContribution.viewType,
                     displayName: webviewEditorContribution.displayName,
-                    providerDisplayName: extension.description.isBuiltin ? ( localizeWithPath(_moduleId, 0, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? ( localize(9513, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
                     selector: webviewEditorContribution.selector || [],
                     priority: getPriorityFromContribution(webviewEditorContribution, extension.description),
                 }))));

package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js

@@ -1,12 +1,11 @@
 import { distinct } from 'vscode/vscode/vs/base/common/arrays';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { globMatchesResource, RegisteredEditorPriority, priorityToRank } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 
-const _moduleId = "vs/workbench/contrib/customEditor/common/customEditor";
 const CONTEXT_ACTIVE_CUSTOM_EDITOR_ID = ( (new RawContextKey('activeCustomEditorId', '', {
     type: 'string',
-    description: ( localizeWithPath(_moduleId, 0, "The viewType of the currently active custom editor.")),
+    description: ( localize(9512, "The viewType of the currently active custom editor.")),
 })));
 const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = ( (new RawContextKey('focusedCustomEditorIsEditable', false)));
 var CustomEditorPriority;

package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js

@@ -1,6 +1,6 @@
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { CustomEditorPriority } from './customEditor.js';
@@ -8,7 +8,6 @@ import { Extensions } from 'vscode/vscode/vs/workbench/services/extensionManagem
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { languagesExtPoint } from 'vscode/vscode/vs/workbench/services/language/common/languageService';
 
-const _moduleId = "vs/workbench/contrib/customEditor/common/extensionPoint";
 const Fields = ( (Object.freeze({
     viewType: 'viewType',
     displayName: 'displayName',
@@ -16,7 +15,7 @@ const Fields = ( (Object.freeze({
     priority: 'priority',
 })));
 const CustomEditorsContribution = {
-    description: ( localizeWithPath(_moduleId, 0, 'Contributed custom editors.')),
+    description: ( localize(11176, 'Contributed custom editors.')),
     type: 'array',
     defaultSnippets: [{
             body: [{
@@ -37,23 +36,21 @@ const CustomEditorsContribution = {
         properties: {
             [Fields.viewType]: {
                 type: 'string',
-                markdownDescription: ( localizeWithPath(
-                    _moduleId,
-                    1,
+                markdownDescription: ( localize(
+                    11177,
                     'Identifier for the custom editor. This must be unique across all custom editors, so we recommend including your extension id as part of `viewType`. The `viewType` is used when registering custom editors with `vscode.registerCustomEditorProvider` and in the `onCustomEditor:${id}` [activation event](https://code.visualstudio.com/api/references/activation-events).'
                 )),
             },
             [Fields.displayName]: {
                 type: 'string',
-                description: ( localizeWithPath(
-                    _moduleId,
-                    2,
+                description: ( localize(
+                    11178,
                     'Human readable name of the custom editor. This is displayed to users when selecting which editor to use.'
                 )),
             },
             [Fields.selector]: {
                 type: 'array',
-                description: ( localizeWithPath(_moduleId, 3, 'Set of globs that the custom editor is enabled for.')),
+                description: ( localize(11179, 'Set of globs that the custom editor is enabled for.')),
                 items: {
                     type: 'object',
                     defaultSnippets: [{
@@ -64,16 +61,15 @@ const CustomEditorsContribution = {
                     properties: {
                         filenamePattern: {
                             type: 'string',
-                            description: ( localizeWithPath(_moduleId, 4, 'Glob that the custom editor is enabled for.')),
+                            description: ( localize(11180, 'Glob that the custom editor is enabled for.')),
                         },
                     }
                 }
             },
             [Fields.priority]: {
                 type: 'string',
-                markdownDeprecationMessage: ( localizeWithPath(
-                    _moduleId,
-                    5,
+                markdownDeprecationMessage: ( localize(
+                    11181,
                     'Controls if the custom editor is enabled automatically when the user opens a file. This may be overridden by users using the `workbench.editorAssociations` setting.'
                 )),
                 enum: [
@@ -81,14 +77,12 @@ const CustomEditorsContribution = {
                     CustomEditorPriority.option,
                 ],
                 markdownEnumDescriptions: [
-                    ( localizeWithPath(
-                        _moduleId,
-                        6,
+                    ( localize(
+                        11182,
                         'The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource.'
                     )),
-                    ( localizeWithPath(
-                        _moduleId,
-                        7,
+                    ( localize(
+                        11183,
                         'The editor is not automatically used when the user opens a resource, but a user can switch to the editor using the `Reopen With` command.'
                     )),
                 ],
@@ -124,9 +118,9 @@ class CustomEditorsDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localizeWithPath(_moduleId, 8, "View Type")),
-            ( localizeWithPath(_moduleId, 9, "Priority")),
-            ( localizeWithPath(_moduleId, 10, "Filename Pattern")),
+            ( localize(11184, "View Type")),
+            ( localize(11185, "Priority")),
+            ( localize(11186, "Filename Pattern")),
         ];
         const rows = ( (customEditors
             .map(customEditor => {
@@ -147,7 +141,7 @@ class CustomEditorsDataRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'customEditors',
-    label: ( localizeWithPath(_moduleId, 11, "Custom Editors")),
+    label: ( localize(11187, "Custom Editors")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js

@@ -5,7 +5,7 @@ import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel
 import { Disposable, DisposableStore, dispose, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { getCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
@@ -34,7 +34,6 @@ import { nativeHoverDelegate } from 'vscode/vscode/vs/platform/hover/browser/hov
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var LanguageStatus_1;
-const _moduleId = "vs/workbench/contrib/languageStatus/browser/languageStatus.contribution";
 class LanguageStatusViewModel {
     constructor(combined, dedicated) {
         this.combined = combined;
@@ -180,8 +179,8 @@ let LanguageStatus = class LanguageStatus {
                 isOneBusy = isOneBusy || (!isPinned && status.busy);
             }
             const props = {
-                name: ( localizeWithPath(_moduleId, 0, "Editor Language Status")),
-                ariaLabel: ( localizeWithPath(_moduleId, 1, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
+                name: ( localize(4348, "Editor Language Status")),
+                ariaLabel: ( localize(4349, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
                 tooltip: element,
                 command: ShowTooltipCommand,
                 text: isOneBusy ? `${text}\u00A0\u00A0$(sync~spin)` : text,
@@ -281,7 +280,7 @@ let LanguageStatus = class LanguageStatus {
         store.add(actionBar);
         let action;
         if (!isPinned) {
-            action = ( (new Action('pin', ( localizeWithPath(_moduleId, 2, "Add to Status Bar")), ThemeIcon.asClassName(Codicon.pin), true, () => {
+            action = ( (new Action('pin', ( localize(4350, "Add to Status Bar")), ThemeIcon.asClassName(Codicon.pin), true, () => {
                 this._dedicated.add(status.id);
                 this._statusBarService.updateEntryVisibility(status.id, true);
                 this._update();
@@ -289,7 +288,7 @@ let LanguageStatus = class LanguageStatus {
             })));
         }
         else {
-            action = ( (new Action('unpin', ( localizeWithPath(_moduleId, 3, "Remove from Status Bar")), ThemeIcon.asClassName(Codicon.pinned), true, () => {
+            action = ( (new Action('unpin', ( localize(4351, "Remove from Status Bar")), ThemeIcon.asClassName(Codicon.pinned), true, () => {
                 this._dedicated.delete(status.id);
                 this._statusBarService.updateEntryVisibility(status.id, false);
                 this._update();
@@ -331,10 +330,10 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof status.label === 'string' ? status.label : status.label.value;
         if (status.detail) {
-            return { label: ( localizeWithPath(_moduleId, 4, '{0}, {1}', textValue, status.detail)) };
+            return { label: ( localize(4352, '{0}, {1}', textValue, status.detail)) };
         }
         else {
-            return { label: ( localizeWithPath(_moduleId, 5, '{0}', textValue)) };
+            return { label: ( localize(4353, '{0}', textValue)) };
         }
     }
     static _asStatusbarEntry(item) {
@@ -347,7 +346,7 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof item.label === 'string' ? item.label : item.label.shortValue;
         return {
-            name: ( localizeWithPath(_moduleId, 6, '{0} (Language Status)', item.name)),
+            name: ( localize(4354, '{0} (Language Status)', item.name)),
             text: item.busy ? `${textValue}\u00A0\u00A0$(sync~spin)` : textValue,
             ariaLabel: LanguageStatus_1._accessibilityInformation(item).label,
             role: item.accessibilityInfo?.role,
@@ -370,7 +369,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'editor.inlayHints.Reset',
-            title: ( localize2WithPath(_moduleId, 7, "Reset Language Status Interaction Counter")),
+            title: ( localize2(4355, "Reset Language Status Interaction Counter")),
             category: Categories.View,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js

@@ -7,13 +7,12 @@ import { ILanguageStatusService } from 'vscode/vscode/vs/workbench/services/lang
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { FoldingController } from 'vscode/vscode/vs/editor/contrib/folding/browser/folding';
 import { ColorDetector } from 'vscode/vscode/vs/editor/contrib/colorPicker/browser/colorDetector';
 
-const _moduleId = "vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution";
 const openSettingsCommand = 'workbench.action.openSettings';
-const configureSettingsLabel = ( localizeWithPath(_moduleId, 0, "Configure"));
+const configureSettingsLabel = ( localize(4362, "Configure"));
 let LimitIndicatorContribution = class LimitIndicatorContribution extends Disposable {
     constructor(editorService, languageStatusService) {
         super();
@@ -43,9 +42,9 @@ LimitIndicatorContribution = ( (__decorate([
 class ColorDecorationAccessor {
     constructor() {
         this.id = 'decoratorsLimitInfo';
-        this.name = ( localizeWithPath(_moduleId, 1, 'Color Decorator Status'));
-        this.label = ( localizeWithPath(_moduleId, 2, 'Color Decorators'));
-        this.source = ( localizeWithPath(_moduleId, 3, 'Color Decorators'));
+        this.name = ( localize(4363, 'Color Decorator Status'));
+        this.label = ( localize(4364, 'Color Decorators'));
+        this.source = ( localize(4365, 'Color Decorators'));
         this.settingsId = 'editor.colorDecoratorsLimit';
     }
     getLimitReporter(editor) {
@@ -55,9 +54,9 @@ class ColorDecorationAccessor {
 class FoldingRangeAccessor {
     constructor() {
         this.id = 'foldingLimitInfo';
-        this.name = ( localizeWithPath(_moduleId, 4, 'Folding Status'));
-        this.label = ( localizeWithPath(_moduleId, 5, 'Folding Ranges'));
-        this.source = ( localizeWithPath(_moduleId, 6, 'Folding'));
+        this.name = ( localize(4366, 'Folding Status'));
+        this.label = ( localize(4367, 'Folding Ranges'));
+        this.source = ( localize(4368, 'Folding'));
         this.settingsId = 'editor.foldingMaximumRegions';
     }
     getLimitReporter(editor) {
@@ -99,7 +98,7 @@ class LanguageStatusEntry {
                 name: this.accessor.name,
                 severity: Severity$1.Warning,
                 label: this.accessor.label,
-                detail: ( localizeWithPath(_moduleId, 7, 'only {0} shown for performance reasons', info.limited)),
+                detail: ( localize(4369, 'only {0} shown for performance reasons', info.limited)),
                 command: { id: openSettingsCommand, arguments: [this.accessor.settingsId], title: configureSettingsLabel },
                 accessibilityInfo: undefined,
                 source: this.accessor.source,

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js

@@ -1,7 +1,7 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
@@ -13,7 +13,6 @@ import { MergeEditor } from '../view/mergeEditor.js';
 import { ctxMergeEditorLayout, ctxIsMergeEditor, ctxMergeEditorShowNonConflictingChanges, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, StorageCloseWithConflicts } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const _moduleId = "vs/workbench/contrib/mergeEditor/browser/commands/commands";
 class MergeEditorAction extends Action2 {
     constructor(desc) {
         super(desc);
@@ -56,7 +55,7 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: '_open.mergeEditor',
-            title: ( localize2WithPath(_moduleId, 0, 'Open Merge Editor')),
+            title: ( localize2(9741, 'Open Merge Editor')),
         });
     }
     run(accessor, ...args) {
@@ -135,7 +134,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.mixedLayout',
-            title: ( localize2WithPath(_moduleId, 1, "Mixed Layout")),
+            title: ( localize2(9742, "Mixed Layout")),
             toggled: ( (ctxMergeEditorLayout.isEqualTo('mixed'))),
             menu: [
                 {
@@ -159,7 +158,7 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.columnLayout',
-            title: ( localize2WithPath(_moduleId, 2, 'Column Layout')),
+            title: ( localize2(9743, 'Column Layout')),
             toggled: ( (ctxMergeEditorLayout.isEqualTo('columns'))),
             menu: [{
                     id: MenuId.EditorTitle,
@@ -181,7 +180,7 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: 'merge.showNonConflictingChanges',
-            title: ( localize2WithPath(_moduleId, 3, "Show Non-Conflicting Changes")),
+            title: ( localize2(9744, "Show Non-Conflicting Changes")),
             toggled: ( (ctxMergeEditorShowNonConflictingChanges.isEqualTo(true))),
             menu: [
                 {
@@ -205,7 +204,7 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBase',
-            title: ( localize2WithPath(_moduleId, 4, "Show Base")),
+            title: ( localize2(9745, "Show Base")),
             toggled: ( (ctxMergeEditorShowBase.isEqualTo(true))),
             menu: [
                 {
@@ -231,7 +230,7 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseTop',
-            title: ( localize2WithPath(_moduleId, 5, "Show Base Top")),
+            title: ( localize2(9746, "Show Base Top")),
             toggled: ( (ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop))),
             menu: [
                 {
@@ -254,7 +253,7 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseCenter',
-            title: ( localize2WithPath(_moduleId, 6, "Show Base Center")),
+            title: ( localize2(9747, "Show Base Center")),
             toggled: ( (ContextKeyExpr.and(
                 ctxMergeEditorShowBase,
                  (ctxMergeEditorShowBaseAtTop.negate())
@@ -276,13 +275,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2WithPath(_moduleId, 7, "Merge Editor"));
+const mergeEditorCategory = ( localize2(9748, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: 'merge.openResult',
             icon: Codicon.goToFile,
-            title: ( localize2WithPath(_moduleId, 8, "Open File")),
+            title: ( localize2(9749, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                     id: MenuId.EditorTitle,
@@ -303,7 +302,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToNextUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(_moduleId, 9, "Go to Next Unhandled Conflict")),
+            title: ( localize2(9750, "Go to Next Unhandled Conflict")),
             icon: Codicon.arrowDown,
             menu: [
                 {
@@ -327,7 +326,7 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToPreviousUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(_moduleId, 10, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(9751, "Go to Previous Unhandled Conflict")),
             icon: Codicon.arrowUp,
             menu: [
                 {
@@ -351,7 +350,7 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput1',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(_moduleId, 11, "Toggle Current Conflict from Left")),
+            title: ( localize2(9752, "Toggle Current Conflict from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -365,7 +364,7 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput2',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(_moduleId, 12, "Toggle Current Conflict from Right")),
+            title: ( localize2(9753, "Toggle Current Conflict from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -379,8 +378,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput1WithBase',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(_moduleId, 13, "Compare Input 1 With Base")),
-            shortTitle: ( localizeWithPath(_moduleId, 14, 'Compare With Base')),
+            title: ( localize2(9754, "Compare Input 1 With Base")),
+            shortTitle: ( localize(9755, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -397,8 +396,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput2WithBase',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(_moduleId, 15, "Compare Input 2 With Base")),
-            shortTitle: ( localizeWithPath(_moduleId, 14, 'Compare With Base')),
+            title: ( localize2(9756, "Compare Input 2 With Base")),
+            shortTitle: ( localize(9756, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -434,7 +433,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: 'merge.openBaseEditor',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(_moduleId, 16, "Open Base File")),
+            title: ( localize2(9757, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -449,7 +448,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput1',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(_moduleId, 17, "Accept All Changes from Left")),
+            title: ( localize2(9758, "Accept All Changes from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -465,7 +464,7 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput2',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(_moduleId, 18, "Accept All Changes from Right")),
+            title: ( localize2(9759, "Accept All Changes from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -481,8 +480,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.resetResultToBaseAndAutoMerge',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(_moduleId, 19, "Reset Result")),
-            shortTitle: ( localizeWithPath(_moduleId, 20, 'Reset')),
+            title: ( localize2(9760, "Reset Result")),
+            shortTitle: ( localize(9761, 'Reset')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInputResultToolbar, group: 'primary' },
@@ -498,7 +497,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: 'mergeEditor.resetCloseWithConflictsChoice',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(_moduleId, 21, "Reset Choice for \'Close with Conflicts\'")),
+            title: ( localize2(9762, "Reset Choice for \'Close with Conflicts\'")),
             f1: true,
         });
     }
@@ -511,7 +510,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptMerge',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(_moduleId, 22, "Complete Merge")),
+            title: ( localize2(9763, "Complete Merge")),
             f1: false,
             precondition: ctxIsMergeEditor
         });
@@ -521,14 +520,13 @@ class AcceptMerge extends MergeEditorAction2 {
         const editorService = accessor.get(IEditorService);
         if (viewModel.model.unhandledConflictsCount.get() > 0) {
             const { confirmed } = await dialogService.confirm({
-                message: ( localizeWithPath(
-                    _moduleId,
-                    23,
+                message: ( localize(
+                    9764,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localizeWithPath(_moduleId, 24, "The file contains unhandled conflicts.")),
-                primaryButton: ( localizeWithPath(_moduleId, 25, "&&Complete with Conflicts"))
+                detail: ( localize(9765, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(9766, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js

@@ -2,7 +2,7 @@ import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
@@ -13,14 +13,13 @@ import { MergeEditor } from '../view/mergeEditor.js';
 import { ctxIsMergeEditor } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const _moduleId = "vs/workbench/contrib/mergeEditor/browser/commands/devCommands";
-const MERGE_EDITOR_CATEGORY = ( localize2WithPath(_moduleId, 0, 'Merge Editor (Dev)'));
+const MERGE_EDITOR_CATEGORY = ( localize2(9767, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2WithPath(_moduleId, 1, "Copy Merge Editor State as JSON")),
+            title: ( localize2(9768, "Copy Merge Editor State as JSON")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -32,8 +31,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localizeWithPath(_moduleId, 2, 'Merge Editor')),
-                message: ( localizeWithPath(_moduleId, 3, "No active merge editor"))
+                name: ( localize(9769, 'Merge Editor')),
+                message: ( localize(9770, "No active merge editor"))
             });
             return;
         }
@@ -52,8 +51,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const jsonStr = JSON.stringify(contents, undefined, 4);
         clipboardService.writeText(jsonStr);
         notificationService.info({
-            name: ( localizeWithPath(_moduleId, 2, 'Merge Editor')),
-            message: ( localizeWithPath(_moduleId, 4, "Successfully copied merge editor state")),
+            name: ( localize(9770, 'Merge Editor')),
+            message: ( localize(9771, "Successfully copied merge editor state")),
         });
     }
 }
@@ -62,7 +61,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2WithPath(_moduleId, 5, "Save Merge Editor State to Folder")),
+            title: ( localize2(9772, "Save Merge Editor State to Folder")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -76,8 +75,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         const languageService = accessor.get(ILanguageService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localizeWithPath(_moduleId, 2, 'Merge Editor')),
-                message: ( localizeWithPath(_moduleId, 3, "No active merge editor"))
+                name: ( localize(9772, 'Merge Editor')),
+                message: ( localize(9772, "No active merge editor"))
             });
             return;
         }
@@ -89,7 +88,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localizeWithPath(_moduleId, 6, 'Select folder to save to'))
+            title: ( localize(9773, 'Select folder to save to'))
         });
         if (!result) {
             return;
@@ -107,8 +106,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write('initialResult', model.getInitialResultValue()),
         ]);
         notificationService.info({
-            name: ( localizeWithPath(_moduleId, 2, 'Merge Editor')),
-            message: ( localizeWithPath(_moduleId, 7, "Successfully saved merge editor state to folder")),
+            name: ( localize(9773, 'Merge Editor')),
+            message: ( localize(9774, "Successfully saved merge editor state to folder")),
         });
     }
 }
@@ -117,7 +116,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: 'merge.dev.loadContentsFromFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2WithPath(_moduleId, 8, "Load Merge Editor State from Folder")),
+            title: ( localize2(9775, "Load Merge Editor State from Folder")),
             icon: Codicon.layoutCentered,
             f1: true
         });
@@ -136,7 +135,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
-                title: ( localizeWithPath(_moduleId, 6, 'Select folder to save to'))
+                title: ( localize(9775, 'Select folder to save to'))
             });
             if (!result) {
                 return;