@codingame/monaco-vscode-view-common-service-override 4.5.0 → 4.5.2

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

@@ -12,6 +12,7 @@ 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);
@@ -54,11 +55,7 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: '_open.mergeEditor',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'title',
-                'Open Merge Editor'
-            )),
+            title: ( localize2WithPath(_moduleId, 0, 'Open Merge Editor')),
         });
     }
     run(accessor, ...args) {
@@ -74,10 +71,10 @@ class OpenMergeEditor extends Action2 {
     }
 }
 var IRelaxedOpenArgs;
-( (function(IRelaxedOpenArgs) {
+( ((function(IRelaxedOpenArgs) {
     function validate(obj) {
         if (!obj || typeof obj !== 'object') {
-            throw new TypeError('invalid argument');
+            throw ( (new TypeError('invalid argument')));
         }
         const o = obj;
         const base = toUri(o.base);
@@ -89,29 +86,37 @@ var IRelaxedOpenArgs;
     IRelaxedOpenArgs.validate = validate;
     function toInputData(obj) {
         if (typeof obj === 'string') {
-            return ( new MergeEditorInputData(( URI.parse(obj, true)), undefined, undefined, undefined));
+            return (
+                 (new MergeEditorInputData( (URI.parse(obj, true)), undefined, undefined, undefined))
+            );
         }
         if (!obj || typeof obj !== 'object') {
-            throw new TypeError('invalid argument');
+            throw ( (new TypeError('invalid argument')));
         }
         if (isUriComponents(obj)) {
-            return ( new MergeEditorInputData(URI.revive(obj), undefined, undefined, undefined));
+            return (
+                 (new MergeEditorInputData(URI.revive(obj), undefined, undefined, undefined))
+            );
         }
         const o = obj;
         const title = o.title;
         const uri = toUri(o.uri);
         const detail = o.detail;
         const description = o.description;
-        return ( new MergeEditorInputData(uri, title, detail, description));
+        return (
+             (new MergeEditorInputData(uri, title, detail, description))
+        );
     }
     function toUri(obj) {
         if (typeof obj === 'string') {
-            return ( URI.parse(obj, true));
+            return (
+                 (URI.parse(obj, true))
+            );
         }
         else if (obj && typeof obj === 'object') {
             return URI.revive(obj);
         }
-        throw new TypeError('invalid argument');
+        throw ( (new TypeError('invalid argument')));
     }
     function isUriComponents(obj) {
         if (!obj || typeof obj !== 'object') {
@@ -124,17 +129,13 @@ var IRelaxedOpenArgs;
             && typeof o.query === 'string'
             && typeof o.fragment === 'string';
     }
-})(IRelaxedOpenArgs || (IRelaxedOpenArgs = {})));
+})(IRelaxedOpenArgs || (IRelaxedOpenArgs = {}))));
 class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.mixedLayout',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'layout.mixed',
-                "Mixed Layout"
-            )),
-            toggled: ( ctxMergeEditorLayout.isEqualTo('mixed')),
+            title: ( localize2WithPath(_moduleId, 1, "Mixed Layout")),
+            toggled: ( (ctxMergeEditorLayout.isEqualTo('mixed'))),
             menu: [
                 {
                     id: MenuId.EditorTitle,
@@ -157,12 +158,8 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.columnLayout',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'layout.column',
-                'Column Layout'
-            )),
-            toggled: ( ctxMergeEditorLayout.isEqualTo('columns')),
+            title: ( localize2WithPath(_moduleId, 2, 'Column Layout')),
+            toggled: ( (ctxMergeEditorLayout.isEqualTo('columns'))),
             menu: [{
                     id: MenuId.EditorTitle,
                     when: ctxIsMergeEditor,
@@ -183,12 +180,8 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: 'merge.showNonConflictingChanges',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'showNonConflictingChanges',
-                "Show Non-Conflicting Changes"
-            )),
-            toggled: ( ctxMergeEditorShowNonConflictingChanges.isEqualTo(true)),
+            title: ( localize2WithPath(_moduleId, 3, "Show Non-Conflicting Changes")),
+            toggled: ( (ctxMergeEditorShowNonConflictingChanges.isEqualTo(true))),
             menu: [
                 {
                     id: MenuId.EditorTitle,
@@ -211,16 +204,15 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBase',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'layout.showBase',
-                "Show Base"
-            )),
-            toggled: ( ctxMergeEditorShowBase.isEqualTo(true)),
+            title: ( localize2WithPath(_moduleId, 4, "Show Base")),
+            toggled: ( (ctxMergeEditorShowBase.isEqualTo(true))),
             menu: [
                 {
                     id: MenuId.EditorTitle,
-                    when: ( ContextKeyExpr.and(ctxIsMergeEditor, ( ctxMergeEditorLayout.isEqualTo('columns')))),
+                    when: ( (ContextKeyExpr.and(
+                        ctxIsMergeEditor,
+                         (ctxMergeEditorLayout.isEqualTo('columns'))
+                    ))),
                     group: '2_merge',
                     order: 9,
                 },
@@ -238,16 +230,12 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseTop',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'layout.showBaseTop',
-                "Show Base Top"
-            )),
-            toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop)),
+            title: ( localize2WithPath(_moduleId, 5, "Show Base Top")),
+            toggled: ( (ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop))),
             menu: [
                 {
                     id: MenuId.EditorTitle,
-                    when: ( ContextKeyExpr.and(ctxIsMergeEditor, ( ctxMergeEditorLayout.isEqualTo('mixed')))),
+                    when: ( (ContextKeyExpr.and(ctxIsMergeEditor,  (ctxMergeEditorLayout.isEqualTo('mixed'))))),
                     group: '2_merge',
                     order: 10,
                 },
@@ -265,16 +253,15 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseCenter',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'layout.showBaseCenter',
-                "Show Base Center"
-            )),
-            toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
+            title: ( localize2WithPath(_moduleId, 6, "Show Base Center")),
+            toggled: ( (ContextKeyExpr.and(
+                ctxMergeEditorShowBase,
+                 (ctxMergeEditorShowBaseAtTop.negate())
+            ))),
             menu: [
                 {
                     id: MenuId.EditorTitle,
-                    when: ( ContextKeyExpr.and(ctxIsMergeEditor, ( ctxMergeEditorLayout.isEqualTo('mixed')))),
+                    when: ( (ContextKeyExpr.and(ctxIsMergeEditor,  (ctxMergeEditorLayout.isEqualTo('mixed'))))),
                     group: '2_merge',
                     order: 11,
                 },
@@ -288,21 +275,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2WithPath(
-    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-    'mergeEditor',
-    "Merge Editor"
-));
+const mergeEditorCategory = ( localize2WithPath(_moduleId, 7, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: 'merge.openResult',
             icon: Codicon.goToFile,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'openfile',
-                "Open File"
-            )),
+            title: ( localize2WithPath(_moduleId, 8, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                     id: MenuId.EditorTitle,
@@ -323,11 +302,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToNextUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'merge.goToNextUnhandledConflict',
-                "Go to Next Unhandled Conflict"
-            )),
+            title: ( localize2WithPath(_moduleId, 9, "Go to Next Unhandled Conflict")),
             icon: Codicon.arrowDown,
             menu: [
                 {
@@ -351,11 +326,7 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToPreviousUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'merge.goToPreviousUnhandledConflict',
-                "Go to Previous Unhandled Conflict"
-            )),
+            title: ( localize2WithPath(_moduleId, 10, "Go to Previous Unhandled Conflict")),
             icon: Codicon.arrowUp,
             menu: [
                 {
@@ -379,11 +350,7 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput1',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'merge.toggleCurrentConflictFromLeft',
-                "Toggle Current Conflict from Left"
-            )),
+            title: ( localize2WithPath(_moduleId, 11, "Toggle Current Conflict from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -397,11 +364,7 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput2',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'merge.toggleCurrentConflictFromRight',
-                "Toggle Current Conflict from Right"
-            )),
+            title: ( localize2WithPath(_moduleId, 12, "Toggle Current Conflict from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -415,16 +378,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput1WithBase',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'mergeEditor.compareInput1WithBase',
-                "Compare Input 1 With Base"
-            )),
-            shortTitle: ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'mergeEditor.compareWithBase',
-                'Compare With Base'
-            )),
+            title: ( localize2WithPath(_moduleId, 13, "Compare Input 1 With Base")),
+            shortTitle: ( localizeWithPath(_moduleId, 14, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -441,16 +396,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput2WithBase',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'mergeEditor.compareInput2WithBase',
-                "Compare Input 2 With Base"
-            )),
-            shortTitle: ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'mergeEditor.compareWithBase',
-                'Compare With Base'
-            )),
+            title: ( localize2WithPath(_moduleId, 15, "Compare Input 2 With Base")),
+            shortTitle: ( localizeWithPath(_moduleId, 14, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -486,11 +433,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: 'merge.openBaseEditor',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'merge.openBaseEditor',
-                "Open Base File"
-            )),
+            title: ( localize2WithPath(_moduleId, 16, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -505,11 +448,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput1',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'merge.acceptAllInput1',
-                "Accept All Changes from Left"
-            )),
+            title: ( localize2WithPath(_moduleId, 17, "Accept All Changes from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -525,11 +464,7 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput2',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'merge.acceptAllInput2',
-                "Accept All Changes from Right"
-            )),
+            title: ( localize2WithPath(_moduleId, 18, "Accept All Changes from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -545,16 +480,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.resetResultToBaseAndAutoMerge',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'mergeEditor.resetResultToBaseAndAutoMerge',
-                "Reset Result"
-            )),
-            shortTitle: ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'mergeEditor.resetResultToBaseAndAutoMerge.short',
-                'Reset'
-            )),
+            title: ( localize2WithPath(_moduleId, 19, "Reset Result")),
+            shortTitle: ( localizeWithPath(_moduleId, 20, 'Reset')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInputResultToolbar, group: 'primary' },
@@ -570,11 +497,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: 'mergeEditor.resetCloseWithConflictsChoice',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'mergeEditor.resetChoice',
-                "Reset Choice for \'Close with Conflicts\'"
-            )),
+            title: ( localize2WithPath(_moduleId, 21, "Reset Choice for \'Close with Conflicts\'")),
             f1: true,
         });
     }
@@ -587,11 +510,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptMerge',
             category: mergeEditorCategory,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                'mergeEditor.acceptMerge',
-                "Complete Merge"
-            )),
+            title: ( localize2WithPath(_moduleId, 22, "Complete Merge")),
             f1: false,
             precondition: ctxIsMergeEditor
         });
@@ -602,21 +521,13 @@ class AcceptMerge extends MergeEditorAction2 {
         if (viewModel.model.unhandledConflictsCount.get() > 0) {
             const { confirmed } = await dialogService.confirm({
                 message: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'mergeEditor.acceptMerge.unhandledConflicts.message',
+                    _moduleId,
+                    23,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    'mergeEditor.acceptMerge.unhandledConflicts.detail',
-                    "The file contains unhandled conflicts."
-                )),
-                primaryButton: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
-                    { key: 'mergeEditor.acceptMerge.unhandledConflicts.accept', comment: ['&& denotes a mnemonic'] },
-                    "&&Complete with Conflicts"
-                ))
+                detail: ( localizeWithPath(_moduleId, 24, "The file contains unhandled conflicts.")),
+                primaryButton: ( localizeWithPath(_moduleId, 25, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {

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

@@ -13,21 +13,14 @@ 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 MERGE_EDITOR_CATEGORY = ( localize2WithPath(
-    'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-    'mergeEditor',
-    'Merge Editor (Dev)'
-));
+const _moduleId = "vs/workbench/contrib/mergeEditor/browser/commands/devCommands";
+const MERGE_EDITOR_CATEGORY = ( localize2WithPath(_moduleId, 0, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                'merge.dev.copyState',
-                "Copy Merge Editor State as JSON"
-            )),
+            title: ( localize2WithPath(_moduleId, 1, "Copy Merge Editor State as JSON")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -39,16 +32,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                    'mergeEditor.name',
-                    'Merge Editor'
-                )),
-                message: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                    'mergeEditor.noActiveMergeEditor',
-                    "No active merge editor"
-                ))
+                name: ( localizeWithPath(_moduleId, 2, 'Merge Editor')),
+                message: ( localizeWithPath(_moduleId, 3, "No active merge editor"))
             });
             return;
         }
@@ -67,16 +52,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const jsonStr = JSON.stringify(contents, undefined, 4);
         clipboardService.writeText(jsonStr);
         notificationService.info({
-            name: ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                'mergeEditor.name',
-                'Merge Editor'
-            )),
-            message: ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                'mergeEditor.successfullyCopiedMergeEditorContents',
-                "Successfully copied merge editor state"
-            )),
+            name: ( localizeWithPath(_moduleId, 2, 'Merge Editor')),
+            message: ( localizeWithPath(_moduleId, 4, "Successfully copied merge editor state")),
         });
     }
 }
@@ -85,11 +62,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                'merge.dev.saveContentsToFolder',
-                "Save Merge Editor State to Folder"
-            )),
+            title: ( localize2WithPath(_moduleId, 5, "Save Merge Editor State to Folder")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -103,16 +76,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         const languageService = accessor.get(ILanguageService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                    'mergeEditor.name',
-                    'Merge Editor'
-                )),
-                message: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                    'mergeEditor.noActiveMergeEditor',
-                    "No active merge editor"
-                ))
+                name: ( localizeWithPath(_moduleId, 2, 'Merge Editor')),
+                message: ( localizeWithPath(_moduleId, 3, "No active merge editor"))
             });
             return;
         }
@@ -124,11 +89,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                'mergeEditor.selectFolderToSaveTo',
-                'Select folder to save to'
-            ))
+            title: ( localizeWithPath(_moduleId, 6, 'Select folder to save to'))
         });
         if (!result) {
             return;
@@ -146,16 +107,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write('initialResult', model.getInitialResultValue()),
         ]);
         notificationService.info({
-            name: ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                'mergeEditor.name',
-                'Merge Editor'
-            )),
-            message: ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                'mergeEditor.successfullySavedMergeEditorContentsToFolder',
-                "Successfully saved merge editor state to folder"
-            )),
+            name: ( localizeWithPath(_moduleId, 2, 'Merge Editor')),
+            message: ( localizeWithPath(_moduleId, 7, "Successfully saved merge editor state to folder")),
         });
     }
 }
@@ -164,11 +117,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: 'merge.dev.loadContentsFromFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                'merge.dev.loadContentsFromFolder',
-                "Load Merge Editor State from Folder"
-            )),
+            title: ( localize2WithPath(_moduleId, 8, "Load Merge Editor State from Folder")),
             icon: Codicon.layoutCentered,
             f1: true
         });
@@ -187,11 +136,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
-                title: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                    'mergeEditor.selectFolderToSaveTo',
-                    'Select folder to save to'
-                ))
+                title: ( localizeWithPath(_moduleId, 6, 'Select folder to save to'))
             });
             if (!result) {
                 return;

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

@@ -12,31 +12,20 @@ import { MergeEditorInput } from 'vscode/vscode/vs/workbench/contrib/mergeEditor
 import { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverContribution } from './view/mergeEditor.js';
 import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localizeWithPath(
-    'vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution',
-    'name',
-    "Merge Editor"
-))), [
-    ( new SyncDescriptor(MergeEditorInput))
+const _moduleId = "vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution";
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localizeWithPath(_moduleId, 0, "Merge Editor"))), [
+    ( (new SyncDescriptor(MergeEditorInput)))
 ]);
-( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
-( Registry.as(Extensions.Configuration)).registerConfiguration({
+( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
+( (Registry.as(Extensions.Configuration))).registerConfiguration({
     properties: {
         'mergeEditor.diffAlgorithm': {
             type: 'string',
             enum: ['legacy', 'advanced'],
             default: 'advanced',
             markdownEnumDescriptions: [
-                ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution',
-                    'diffAlgorithm.legacy',
-                    "Uses the legacy diffing algorithm."
-                )),
-                ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution',
-                    'diffAlgorithm.advanced',
-                    "Uses the advanced diffing algorithm."
-                )),
+                ( localizeWithPath(_moduleId, 1, "Uses the legacy diffing algorithm.")),
+                ( localizeWithPath(_moduleId, 2, "Uses the advanced diffing algorithm.")),
             ]
         },
         'mergeEditor.showDeletionMarkers': {
@@ -69,7 +58,7 @@ registerAction2(ResetCloseWithConflictsChoice);
 registerAction2(MergeEditorCopyContentsToJSON);
 registerAction2(MergeEditorSaveContentsToFolder);
 registerAction2(MergeEditorLoadContentsFromFolder);
-( Registry
-    .as(Extensions$1.Workbench))
+( (Registry
+    .as(Extensions$1.Workbench)))
     .registerWorkbenchContribution(MergeEditorOpenHandlerContribution, 3 );
 registerWorkbenchContribution2(MergeEditorResolverContribution.ID, MergeEditorResolverContribution, 1 );