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

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
@@ -13,8 +13,7 @@ import { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverCon
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 
-const _moduleId = "vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution";
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localizeWithPath(_moduleId, 0, "Merge Editor"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(4356, "Merge Editor"))), [
     ( (new SyncDescriptor(MergeEditorInput)))
 ]);
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
@@ -25,8 +24,8 @@ const _moduleId = "vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribu
             enum: ['legacy', 'advanced'],
             default: 'advanced',
             markdownEnumDescriptions: [
-                ( localizeWithPath(_moduleId, 1, "Uses the legacy diffing algorithm.")),
-                ( localizeWithPath(_moduleId, 2, "Uses the advanced diffing algorithm.")),
+                ( localize(4357, "Uses the legacy diffing algorithm.")),
+                ( localize(4358, "Uses the advanced diffing algorithm.")),
             ]
         },
         'mergeEditor.showDeletionMarkers': {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { registerColor, transparent } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
@@ -11,20 +11,19 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 
-const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/colors";
-registerColor('mergeEditor.change.background', '#9bb95533', ( localizeWithPath(_moduleId, 0, 'The background color for changes.')));
-registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localizeWithPath(_moduleId, 1, 'The background color for word changes.')));
-registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localizeWithPath(_moduleId, 2, 'The background color for changes in base.')));
-registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localizeWithPath(_moduleId, 3, 'The background color for word changes in base.')));
-registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localizeWithPath(_moduleId, 4, 'The border color of unhandled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localizeWithPath(_moduleId, 5, 'The border color of unhandled focused conflicts.')));
-registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localizeWithPath(_moduleId, 6, 'The border color of handled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localizeWithPath(_moduleId, 7, 'The border color of handled focused conflicts.')));
-const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localizeWithPath(_moduleId, 8, 'The foreground color for changes in input 1.')));
-const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localizeWithPath(_moduleId, 9, 'The foreground color for changes in input 1.')));
-registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localizeWithPath(_moduleId, 10, 'The background of the "Conflicting Lines" text.')));
+registerColor('mergeEditor.change.background', '#9bb95533', ( localize(11201, 'The background color for changes.')));
+registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(11202, 'The background color for word changes.')));
+registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(11203, 'The background color for changes in base.')));
+registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(11204, 'The background color for word changes in base.')));
+registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(11205, 'The border color of unhandled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(11206, 'The border color of unhandled focused conflicts.')));
+registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(11207, 'The border color of handled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(11208, 'The border color of handled focused conflicts.')));
+const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(11209, 'The foreground color for changes in input 1.')));
+const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(11210, 'The foreground color for changes in input 1.')));
+registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(11211, 'The background of the "Conflicting Lines" text.')));
 const contentTransparency = 0.4;
-registerColor('mergeEditor.conflict.input1.background', ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), ( localizeWithPath(_moduleId, 11, 'The background color of decorations in input 1.')));
-registerColor('mergeEditor.conflict.input2.background', ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), ( localizeWithPath(_moduleId, 12, 'The background color of decorations in input 2.')));
+registerColor('mergeEditor.conflict.input1.background', ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), ( localize(11212, 'The background color of decorations in input 1.')));
+registerColor('mergeEditor.conflict.input2.background', ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), ( localize(11213, 'The background color of decorations in input 2.')));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js

@@ -9,11 +9,10 @@ import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
 import 'vscode/vscode/vs/base/common/arrays';
 import { EditorOption, EDITOR_FONT_DEFAULTS } from 'vscode/vscode/vs/editor/common/config/editorOptions';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ModifiedBaseRangeStateKind, ModifiedBaseRangeState } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
 import { FixedZoneWidget } from './fixedZoneWidget.js';
 
-const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/conflictActions";
 class ConflictActionsFactory extends Disposable {
     constructor(_editor) {
         super();
@@ -86,16 +85,15 @@ class ActionsSource {
             const result = [];
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
                 result.push({
-                    text: ( localizeWithPath(_moduleId, 0, "Manual Resolution")),
-                    tooltip: ( localizeWithPath(_moduleId, 1, "This conflict has been resolved manually.")),
+                    text: ( localize(11483, "Manual Resolution")),
+                    tooltip: ( localize(11484, "This conflict has been resolved manually.")),
                 });
             }
             else if (state.kind === ModifiedBaseRangeStateKind.base) {
                 result.push({
-                    text: ( localizeWithPath(_moduleId, 2, 'No Changes Accepted')),
-                    tooltip: ( localizeWithPath(
-                        _moduleId,
-                        3,
+                    text: ( localize(11485, 'No Changes Accepted')),
+                    tooltip: ( localize(
+                        11486,
                         'The current resolution of this conflict equals the common ancestor of both the right and left changes.'
                     )),
                 });
@@ -117,20 +115,20 @@ class ActionsSource {
             }
             const stateToggles = [];
             if (state.includesInput1) {
-                stateToggles.push(command(( localizeWithPath(_moduleId, 4, 'Remove {0}', model.input1.title)), async () => {
+                stateToggles.push(command(( localize(11487, 'Remove {0}', model.input1.title)), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, state.withInputValue(1, false), true, tx);
                         model.telemetry.reportRemoveInvoked(1, state.includesInput(2));
                     });
-                }, ( localizeWithPath(_moduleId, 5, 'Remove {0} from the result document.', model.input1.title))));
+                }, ( localize(11488, 'Remove {0} from the result document.', model.input1.title))));
             }
             if (state.includesInput2) {
-                stateToggles.push(command(( localizeWithPath(_moduleId, 4, 'Remove {0}', model.input2.title)), async () => {
+                stateToggles.push(command(( localize(11488, 'Remove {0}', model.input2.title)), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, state.withInputValue(2, false), true, tx);
                         model.telemetry.reportRemoveInvoked(2, state.includesInput(1));
                     });
-                }, ( localizeWithPath(_moduleId, 5, 'Remove {0} from the result document.', model.input2.title))));
+                }, ( localize(11488, 'Remove {0} from the result document.', model.input2.title))));
             }
             if (state.kind === ModifiedBaseRangeStateKind.both &&
                 state.firstInput === 2) {
@@ -138,14 +136,13 @@ class ActionsSource {
             }
             result.push(...stateToggles);
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
-                result.push(command(( localizeWithPath(_moduleId, 6, 'Reset to base')), async () => {
+                result.push(command(( localize(11489, 'Reset to base')), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, ModifiedBaseRangeState.base, true, tx);
                         model.telemetry.reportResetToBaseInvoked();
                     });
-                }, ( localizeWithPath(
-                    _moduleId,
-                    7,
+                }, ( localize(
+                    11490,
                     'Reset this conflict to the common ancestor of both the right and left changes.'
                 ))));
             }
@@ -177,16 +174,16 @@ class ActionsSource {
             const otherInputNumber = inputNumber === 1 ? 2 : 1;
             if (state.kind !== ModifiedBaseRangeStateKind.unrecognized && !state.isInputIncluded(inputNumber)) {
                 if (!state.isInputIncluded(otherInputNumber) || !this.viewModel.shouldUseAppendInsteadOfAccept.read(reader)) {
-                    result.push(command(( localizeWithPath(_moduleId, 8, "Accept {0}", inputData.title)), async () => {
+                    result.push(command(( localize(11491, "Accept {0}", inputData.title)), async () => {
                         transaction((tx) => {
                             model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, false), inputNumber, tx);
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localizeWithPath(_moduleId, 9, "Accept {0} in the result document.", inputData.title))));
+                    }, ( localize(11492, "Accept {0} in the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
                         const commandName = modifiedBaseRange.isOrderRelevant
-                            ? ( localizeWithPath(_moduleId, 10, "Accept Combination ({0} First)", inputData.title))
-                            : ( localizeWithPath(_moduleId, 11, "Accept Combination"));
+                            ? ( localize(11493, "Accept Combination ({0} First)", inputData.title))
+                            : ( localize(11494, "Accept Combination"));
                         result.push(command(commandName, async () => {
                             transaction((tx) => {
                                 model.setState(modifiedBaseRange, ModifiedBaseRangeState.base
@@ -194,39 +191,37 @@ class ActionsSource {
                                     .withInputValue(otherInputNumber, true, true), true, tx);
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
-                        }, ( localizeWithPath(
-                            _moduleId,
-                            12,
+                        }, ( localize(
+                            11495,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 else {
-                    result.push(command(( localizeWithPath(_moduleId, 13, "Append {0}", inputData.title)), async () => {
+                    result.push(command(( localize(11496, "Append {0}", inputData.title)), async () => {
                         transaction((tx) => {
                             model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, false), inputNumber, tx);
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localizeWithPath(_moduleId, 14, "Append {0} to the result document.", inputData.title))));
+                    }, ( localize(11497, "Append {0} to the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        result.push(command(( localizeWithPath(_moduleId, 15, "Accept Combination", inputData.title)), async () => {
+                        result.push(command(( localize(11498, "Accept Combination", inputData.title)), async () => {
                             transaction((tx) => {
                                 model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, true), inputNumber, tx);
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
-                        }, ( localizeWithPath(
-                            _moduleId,
-                            12,
+                        }, ( localize(
+                            11498,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 if (!model.isInputHandled(modifiedBaseRange, inputNumber).read(reader)) {
-                    result.push(command(( localizeWithPath(_moduleId, 16, 'Ignore')), async () => {
+                    result.push(command(( localize(11499, 'Ignore')), async () => {
                         transaction((tx) => {
                             model.setInputHandled(modifiedBaseRange, inputNumber, true, tx);
                         });
-                    }, ( localizeWithPath(_moduleId, 17, "Don't take this side of the conflict."))));
+                    }, ( localize(11500, "Don't take this side of the conflict."))));
                 }
             }
             return result;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js

@@ -8,7 +8,7 @@ import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observab
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
 import { MinimapPosition, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+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 { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -17,7 +17,6 @@ import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverV
 import { EditorGutter } from '../editorGutter.js';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
 
-const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView";
 let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
     constructor(viewModel, instantiationService, configurationService) {
         super(instantiationService, viewModel, configurationService);
@@ -116,17 +115,16 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.base);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localizeWithPath(_moduleId, 0, 'Base'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11197, 'Base'))));
             const baseShowDiffAgainst = vm.baseShowDiffAgainst.read(reader);
             let node = undefined;
             if (baseShowDiffAgainst) {
-                const label = ( localizeWithPath(
-                    _moduleId,
-                    1,
+                const label = ( localize(
+                    11198,
                     'Comparing with {0}',
                     baseShowDiffAgainst === 1 ? vm.model.input1.title : vm.model.input2.title
                 ));
-                const tooltip = ( localizeWithPath(_moduleId, 2, 'Differences are highlighted with a background color.'));
+                const tooltip = ( localize(11199, 'Differences are highlighted with a background color.'));
                 node = h('span', { title: tooltip }, [label]).root;
             }
             reset(this.htmlElements.description, ...(node ? [node] : []));

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js

@@ -15,7 +15,7 @@ import 'vscode/vscode/vs/base/common/arrays';
 import { noBreakWhitespace } from 'vscode/vscode/vs/base/common/strings';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { MinimapPosition, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+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 { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
@@ -27,7 +27,6 @@ import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverV
 import { EditorGutter } from '../editorGutter.js';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
 
-const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView";
 let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
     constructor(inputNumber, viewModel, instantiationService, contextMenuService, configurationService) {
         super(instantiationService, viewModel, configurationService);
@@ -160,8 +159,8 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
             }
             this.editor.setModel(this.inputNumber === 1 ? vm.model.input1.textModel : vm.model.input2.textModel);
             const title = this.inputNumber === 1
-                ? vm.model.input1.title || ( localizeWithPath(_moduleId, 0, 'Input 1'))
-                : vm.model.input2.title || ( localizeWithPath(_moduleId, 1, 'Input 2'));
+                ? vm.model.input1.title || ( localize(11214, 'Input 1'))
+                : vm.model.input2.title || ( localize(11215, 'Input 2'));
             const description = this.inputNumber === 1
                 ? vm.model.input1.description
                 : vm.model.input2.description;
@@ -243,19 +242,19 @@ class ModifiedBaseRangeGutterItemModel {
         const both = state.includesInput1 && state.includesInput2;
         return [
             this.baseRange.input1Diffs.length > 0
-                ? action('mergeEditor.acceptInput1', ( localizeWithPath(_moduleId, 2, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
+                ? action('mergeEditor.acceptInput1', ( localize(11216, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
                 : undefined,
             this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localizeWithPath(_moduleId, 2, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
+                ? action('mergeEditor.acceptInput2', ( localize(11216, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
                 : undefined,
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localizeWithPath(_moduleId, 3, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
+                ? setFields(action('mergeEditor.acceptBoth', ( localize(11217, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
                 : undefined,
             ( (new Separator())),
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.swap', ( localizeWithPath(_moduleId, 4, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
+                ? setFields(action('mergeEditor.swap', ( localize(11218, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
                 : undefined,
-            setFields(( (new Action('mergeEditor.markAsHandled', ( localizeWithPath(_moduleId, 5, 'Mark as Handled')), undefined, true, () => {
+            setFields(( (new Action('mergeEditor.markAsHandled', ( localize(11219, 'Mark as Handled')), undefined, true, () => {
                 transaction((tx) => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
@@ -298,10 +297,10 @@ class MergeConflictGutterItemView extends Disposable {
             const item = this.item.read(reader);
             const value = item.toggleState.read(reader);
             const iconMap = {
-                [InputState.excluded]: { icon: undefined, checked: false, title: ( localizeWithPath(_moduleId, 6, "Accept")) },
-                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localizeWithPath(_moduleId, 7, "Accept (result is dirty)")) },
-                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localizeWithPath(_moduleId, 8, "Undo accept")) },
-                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localizeWithPath(_moduleId, 9, "Undo accept (currently second)")) },
+                [InputState.excluded]: { icon: undefined, checked: false, title: ( localize(11220, "Accept")) },
+                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(11221, "Accept (result is dirty)")) },
+                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(11222, "Undo accept")) },
+                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(11223, "Undo accept (currently second)")) },
             };
             const state = iconMap[value];
             checkBox.setIcon(state.icon);

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js

@@ -10,7 +10,7 @@ import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observab
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
 import { MinimapPosition, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+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 { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -23,7 +23,6 @@ import { EditorGutter } from '../editorGutter.js';
 import { ctxIsMergeResultEditor } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
 
-const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView";
 let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
     constructor(viewModel, instantiationService, _labelService, configurationService) {
         super(instantiationService, viewModel, configurationService);
@@ -132,7 +131,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localizeWithPath(_moduleId, 0, 'Result'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11224, 'Result'))));
             reset(this.htmlElements.description, ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, { relative: true })));
         }));
         const remainingConflictsActionBar = this._register(( (new ActionBar(this.htmlElements.detail))));
@@ -147,8 +146,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
             }
             const count = model.unhandledConflictsCount.read(reader);
             const text = count === 1
-                ? ( localizeWithPath(_moduleId, 1, '{0} Conflict Remaining', count))
-                : ( localizeWithPath(_moduleId, 2, '{0} Conflicts Remaining ', count));
+                ? ( localize(11225, '{0} Conflict Remaining', count))
+                : ( localize(11226, '{0} Conflicts Remaining ', count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -160,8 +159,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).get());
                 },
                 tooltip: count > 0
-                    ? ( localizeWithPath(_moduleId, 3, 'Go to next conflict'))
-                    : ( localizeWithPath(_moduleId, 4, 'All conflicts handled, the merge can be completed now.')),
+                    ? ( localize(11227, 'Go to next conflict'))
+                    : ( localize(11228, 'All conflicts handled, the merge can be completed now.')),
             });
         }));
         this._register(applyObservableDecorations(this.editor, this.decorations));

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

@@ -18,7 +18,7 @@ import './media/mergeEditor.css.js';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
-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 { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
@@ -51,7 +51,6 @@ import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 import { AbstractTextEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/textEditor';
 
 var MergeEditor_1, MergeEditorLayoutStore_1;
-const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/mergeEditor";
 let MergeEditor = class MergeEditor extends AbstractTextEditor {
     static { MergeEditor_1 = this; }
     static { this.ID = 'mergeEditor'; }
@@ -127,7 +126,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localizeWithPath(_moduleId, 0, "Text Merge Editor"));
+        return ( localize(9776, "Text Merge Editor"));
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js

@@ -9,13 +9,12 @@ import 'vscode/vscode/vs/base/common/cancellation';
 import 'vscode/vscode/vs/base/common/arrays';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
-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 { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { LineRange } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
 
-const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/viewModel";
 let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     constructor(model, inputCodeEditorView1, inputCodeEditorView2, resultCodeEditorView, baseCodeEditorView, showNonConflictingChanges, configurationService, notificationService) {
         super();
@@ -206,11 +205,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     toggleActiveConflict(inputNumber) {
         const activeModifiedBaseRange = this.activeModifiedBaseRange.get();
         if (!activeModifiedBaseRange) {
-            this.notificationService.error(( localizeWithPath(
-                _moduleId,
-                0,
-                "There is currently no conflict focused that can be toggled."
-            )));
+            this.notificationService.error(( localize(11200, "There is currently no conflict focused that can be toggled.")));
             return;
         }
         transaction(tx => {

package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -16,7 +16,6 @@ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.servi
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 
-const _moduleId = "vs/workbench/contrib/preferences/browser/keyboardLayoutPicker";
 let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution extends Disposable {
     static { this.ID = 'workbench.contrib.keyboardLayoutPicker'; }
     constructor(keyboardLayoutService, statusbarService) {
@@ -24,11 +23,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( (new MutableDisposable())));
-        const name = ( localizeWithPath(_moduleId, 0, "Keyboard Layout"));
+        const name = ( localize(4372, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localizeWithPath(_moduleId, 1, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(4373, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
@@ -40,7 +39,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localizeWithPath(_moduleId, 1, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(4373, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -49,7 +48,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localizeWithPath(_moduleId, 1, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(4373, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -66,14 +65,12 @@ KeyboardLayoutPickerContribution = ( (__decorate([
 ], KeyboardLayoutPickerContribution)));
 registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, WorkbenchPhase.BlockStartup);
 const DEFAULT_CONTENT = [
-    `// ${( localizeWithPath(
-        _moduleId,
-        2,
+    `// ${( localize(
+        4374,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
-    `// ${( localizeWithPath(
-        _moduleId,
-        3,
+    `// ${( localize(
+        4375,
         'Open VS Code and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.'
     ))}`,
     ``,
@@ -84,7 +81,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2WithPath(_moduleId, 4, "Change Keyboard Layout")),
+            title: ( localize2(4376, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -114,17 +111,17 @@ registerAction2(class extends Action2 {
         });
         if (picks.length > 0) {
             const platform = isMacintosh ? 'Mac' : isWindows ? 'Win' : 'Linux';
-            picks.unshift({ type: 'separator', label: ( localizeWithPath(_moduleId, 5, "Keyboard Layouts ({0})", platform)) });
+            picks.unshift({ type: 'separator', label: ( localize(4377, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localizeWithPath(_moduleId, 6, "Configure Keyboard Layout")) };
+        const configureKeyboardLayout = { label: ( localize(4378, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localizeWithPath(_moduleId, 7, "Auto Detect")),
+            label: ( localize(4379, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localizeWithPath(_moduleId, 8, "Select Keyboard Layout")), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(4380, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -147,7 +144,7 @@ registerAction2(class extends Action2 {
                 });
             }, (error) => {
                 throw ( (new Error(
-                    localizeWithPath(_moduleId, 9, "Unable to create '{0}' ({1}).", ( (file.toString())), error)
+                    localize(4381, "Unable to create '{0}' ({1}).", ( (file.toString())), error)
                 )));
             });
             return Promise.resolve();

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
@@ -7,7 +7,6 @@ import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { SashSettingsController } from './sash.js';
 import { isIOS } from 'vscode/vscode/vs/base/common/platform';
 
-const _moduleId = "vs/workbench/contrib/sash/browser/sash.contribution";
 ( (Registry.as(Extensions.Workbench)))
     .registerWorkbenchContribution(SashSettingsController, LifecyclePhase.Restored);
 ( (Registry.as(Extensions$1.Configuration)))
@@ -19,9 +18,8 @@ const _moduleId = "vs/workbench/contrib/sash/browser/sash.contribution";
             default: isIOS ? 20 : 4,
             minimum: 1,
             maximum: 20,
-            description: ( localizeWithPath(
-                _moduleId,
-                0,
+            description: ( localize(
+                4370,
                 "Controls the feedback area size in pixels of the dragging area in between views/editors. Set it to a larger value if you feel it's hard to resize views using the mouse."
             ))
         },
@@ -30,9 +28,8 @@ const _moduleId = "vs/workbench/contrib/sash/browser/sash.contribution";
             default: 300,
             minimum: 0,
             maximum: 2000,
-            description: ( localizeWithPath(
-                _moduleId,
-                1,
+            description: ( localize(
+                4371,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         },