@codingame/monaco-vscode-view-common-service-override 26.2.2 → 27.0.0

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

@@ -65,7 +65,7 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: "_open.mergeEditor",
-            title: ( localize2(9578, "Open Merge Editor"))
+            title: ( localize2(10281, "Open Merge Editor"))
         });
     }
     run(accessor, ...args) {
@@ -152,7 +152,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: "merge.mixedLayout",
-            title: ( localize2(9579, "Mixed Layout")),
+            title: ( localize2(10282, "Mixed Layout")),
             toggled: ( ctxMergeEditorLayout.isEqualTo("mixed")),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -176,7 +176,7 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: "merge.columnLayout",
-            title: ( localize2(9580, "Column Layout")),
+            title: ( localize2(10283, "Column Layout")),
             toggled: ( ctxMergeEditorLayout.isEqualTo("columns")),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -200,7 +200,7 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: "merge.showNonConflictingChanges",
-            title: ( localize2(9581, "Show Non-Conflicting Changes")),
+            title: ( localize2(10284, "Show Non-Conflicting Changes")),
             toggled: ( ctxMergeEditorShowNonConflictingChanges.isEqualTo(true)),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -224,7 +224,7 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: "merge.showBase",
-            title: ( localize2(9582, "Show Base")),
+            title: ( localize2(10285, "Show Base")),
             toggled: ( ctxMergeEditorShowBase.isEqualTo(true)),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -247,7 +247,7 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: "merge.showBaseTop",
-            title: ( localize2(9583, "Show Base Top")),
+            title: ( localize2(10286, "Show Base Top")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop)),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -270,7 +270,7 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: "merge.showBaseCenter",
-            title: ( localize2(9584, "Show Base Center")),
+            title: ( localize2(10287, "Show Base Center")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -289,13 +289,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(9585, "Merge Editor"));
+const mergeEditorCategory = ( localize2(10288, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: "merge.openResult",
             icon: Codicon.goToFile,
-            title: ( localize2(9586, "Open File")),
+            title: ( localize2(10289, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                 id: MenuId.EditorTitle,
@@ -318,7 +318,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: "merge.goToNextUnhandledConflict",
             category: mergeEditorCategory,
-            title: ( localize2(9587, "Go to Next Unhandled Conflict")),
+            title: ( localize2(10290, "Go to Next Unhandled Conflict")),
             icon: Codicon.arrowDown,
             menu: [{
                 id: MenuId.EditorTitle,
@@ -340,7 +340,7 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: "merge.goToPreviousUnhandledConflict",
             category: mergeEditorCategory,
-            title: ( localize2(9588, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(10291, "Go to Previous Unhandled Conflict")),
             icon: Codicon.arrowUp,
             menu: [{
                 id: MenuId.EditorTitle,
@@ -362,7 +362,7 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: "merge.toggleActiveConflictInput1",
             category: mergeEditorCategory,
-            title: ( localize2(9589, "Toggle Current Conflict from Left")),
+            title: ( localize2(10292, "Toggle Current Conflict from Left")),
             f1: true,
             precondition: ctxIsMergeEditor
         });
@@ -376,7 +376,7 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: "merge.toggleActiveConflictInput2",
             category: mergeEditorCategory,
-            title: ( localize2(9590, "Toggle Current Conflict from Right")),
+            title: ( localize2(10293, "Toggle Current Conflict from Right")),
             f1: true,
             precondition: ctxIsMergeEditor
         });
@@ -390,8 +390,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: "mergeEditor.compareInput1WithBase",
             category: mergeEditorCategory,
-            title: ( localize2(9591, "Compare Input 1 With Base")),
-            shortTitle: ( localize(9592, "Compare With Base")),
+            title: ( localize2(10294, "Compare Input 1 With Base")),
+            shortTitle: ( localize(10295, "Compare With Base")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -411,8 +411,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: "mergeEditor.compareInput2WithBase",
             category: mergeEditorCategory,
-            title: ( localize2(9593, "Compare Input 2 With Base")),
-            shortTitle: ( localize(9592, "Compare With Base")),
+            title: ( localize2(10296, "Compare Input 2 With Base")),
+            shortTitle: ( localize(10295, "Compare With Base")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -457,7 +457,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: "merge.openBaseEditor",
             category: mergeEditorCategory,
-            title: ( localize2(9594, "Open Base File")),
+            title: ( localize2(10297, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor
         });
@@ -472,7 +472,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: "merge.acceptAllInput1",
             category: mergeEditorCategory,
-            title: ( localize2(9595, "Accept All Incoming Changes from Left")),
+            title: ( localize2(10298, "Accept All Incoming Changes from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -491,7 +491,7 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: "merge.acceptAllInput2",
             category: mergeEditorCategory,
-            title: ( localize2(9596, "Accept All Current Changes from Right")),
+            title: ( localize2(10299, "Accept All Current Changes from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -510,8 +510,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: "mergeEditor.resetResultToBaseAndAutoMerge",
             category: mergeEditorCategory,
-            title: ( localize2(9597, "Reset Result")),
-            shortTitle: ( localize(9598, "Reset")),
+            title: ( localize2(10300, "Reset Result")),
+            shortTitle: ( localize(10301, "Reset")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -530,7 +530,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: "mergeEditor.resetCloseWithConflictsChoice",
             category: mergeEditorCategory,
-            title: ( localize2(9599, "Reset Choice for 'Close with Conflicts'")),
+            title: ( localize2(10302, "Reset Choice for 'Close with Conflicts'")),
             f1: true
         });
     }
@@ -543,7 +543,7 @@ class AcceptAllCombination extends MergeEditorAction2 {
         super({
             id: "mergeEditor.acceptAllCombination",
             category: mergeEditorCategory,
-            title: ( localize2(9600, "Accept All Combination")),
+            title: ( localize2(10303, "Accept All Combination")),
             f1: true
         });
     }
@@ -572,7 +572,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: "mergeEditor.acceptMerge",
             category: mergeEditorCategory,
-            title: ( localize2(9601, "Complete Merge")),
+            title: ( localize2(10304, "Complete Merge")),
             f1: true,
             precondition: ctxIsMergeEditor,
             keybinding: [{
@@ -597,12 +597,12 @@ class AcceptMerge extends MergeEditorAction2 {
                 confirmed
             } = await dialogService.confirm({
                 message: ( localize(
-                    9602,
+                    10305,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(9603, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(9604, "&&Complete with Conflicts"))
+                detail: ( localize(10306, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(10307, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {
@@ -622,7 +622,7 @@ class ToggleBetweenInputs extends MergeEditorAction2 {
         super({
             id: "mergeEditor.toggleBetweenInputs",
             category: mergeEditorCategory,
-            title: ( localize2(9605, "Toggle Between Merge Editor Inputs")),
+            title: ( localize2(10308, "Toggle Between Merge Editor Inputs")),
             f1: true,
             precondition: ctxIsMergeEditor,
             keybinding: [{

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

@@ -14,13 +14,13 @@ import { MergeEditor } from '../view/mergeEditor.js';
 import { ctxIsMergeEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const MERGE_EDITOR_CATEGORY = ( localize2(9606, "Merge Editor (Dev)"));
+const MERGE_EDITOR_CATEGORY = ( localize2(10309, "Merge Editor (Dev)"));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: "merge.dev.copyContentsJson",
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9607, "Copy Merge Editor State as JSON")),
+            title: ( localize2(10310, "Copy Merge Editor State as JSON")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor
@@ -34,8 +34,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(9608, "Merge Editor")),
-                message: ( localize(9609, "No active merge editor"))
+                name: ( localize(10311, "Merge Editor")),
+                message: ( localize(10312, "No active merge editor"))
             });
             return;
         }
@@ -54,8 +54,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const jsonStr = JSON.stringify(contents, undefined, 4);
         clipboardService.writeText(jsonStr);
         notificationService.info({
-            name: ( localize(9608, "Merge Editor")),
-            message: ( localize(9610, "Successfully copied merge editor state"))
+            name: ( localize(10311, "Merge Editor")),
+            message: ( localize(10313, "Successfully copied merge editor state"))
         });
     }
 }
@@ -64,7 +64,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: "merge.dev.saveContentsToFolder",
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9611, "Save Merge Editor State to Folder")),
+            title: ( localize2(10314, "Save Merge Editor State to Folder")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor
@@ -80,8 +80,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         const languageService = accessor.get(ILanguageService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(9608, "Merge Editor")),
-                message: ( localize(9609, "No active merge editor"))
+                name: ( localize(10311, "Merge Editor")),
+                message: ( localize(10312, "No active merge editor"))
             });
             return;
         }
@@ -93,7 +93,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(9612, "Select folder to save to"))
+            title: ( localize(10315, "Select folder to save to"))
         });
         if (!result) {
             return;
@@ -115,8 +115,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write("initialResult", model.getInitialResultValue())
         ]);
         notificationService.info({
-            name: ( localize(9608, "Merge Editor")),
-            message: ( localize(9613, "Successfully saved merge editor state to folder"))
+            name: ( localize(10311, "Merge Editor")),
+            message: ( localize(10316, "Successfully saved merge editor state to folder"))
         });
     }
 }
@@ -125,7 +125,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: "merge.dev.loadContentsFromFolder",
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9614, "Load Merge Editor State from Folder")),
+            title: ( localize2(10317, "Load Merge Editor State from Folder")),
             icon: Codicon.layoutCentered,
             f1: true
         });
@@ -144,7 +144,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
-                title: ( localize(9612, "Select folder to save to"))
+                title: ( localize(10315, "Select folder to save to"))
             });
             if (!result) {
                 return;

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

@@ -16,7 +16,7 @@ import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { MergeEditorAccessibilityHelpProvider } from './mergeEditorAccessibilityHelp.js';
 
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(9615, "Merge Editor"))), [( new SyncDescriptor(MergeEditorInput))]);
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(10318, "Merge Editor"))), [( new SyncDescriptor(MergeEditorInput))]);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     properties: {
@@ -24,7 +24,7 @@ import { MergeEditorAccessibilityHelpProvider } from './mergeEditorAccessibility
             type: "string",
             enum: ["legacy", "advanced"],
             default: "advanced",
-            markdownEnumDescriptions: [( localize(9616, "Uses the legacy diffing algorithm.")), ( localize(9617, "Uses the advanced diffing algorithm."))]
+            markdownEnumDescriptions: [( localize(10319, "Uses the legacy diffing algorithm.")), ( localize(10320, "Uses the advanced diffing algorithm."))]
         },
         "mergeEditor.showDeletionMarkers": {
             type: "boolean",

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

@@ -18,18 +18,18 @@ class MergeEditorAccessibilityHelpProvider {
         if (!codeEditor) {
             return;
         }
-        const content = [( localize(9618, "You are in a merge editor.")), ( localize(
-            9619,
+        const content = [( localize(10321, "You are in a merge editor.")), ( localize(
+            10322,
             "Navigate between merge conflicts using the commands Go to Next Unhandled Conflict{0} and Go to Previous Unhandled Conflict{1}.",
             "<keybinding:merge.goToNextUnhandledConflict>",
             "<keybinding:merge.goToPreviousUnhandledConflict>"
         )), ( localize(
-            9620,
+            10323,
             "Run the command Merge Editor: Accept All Incoming Changes from the Left{0} and Merge Editor: Accept All Current Changes from the Right{1}",
             "<keybinding:merge.acceptAllInput1>",
             "<keybinding:merge.acceptAllInput2>"
-        )), ( localize(9621, "Complete the Merge{0}.", "<keybinding:mergeEditor.acceptMerge>")), ( localize(
-            9622,
+        )), ( localize(10324, "Complete the Merge{0}.", "<keybinding:mergeEditor.acceptMerge>")), ( localize(
+            10325,
             "Toggle between merge editor inputs, incoming and current changes {0}.",
             "<keybinding:mergeEditor.toggleBetweenInputs>"
         ))];

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

@@ -12,51 +12,51 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 
-registerColor("mergeEditor.change.background", "#9bb95533", ( localize(9658, "The background color for changes.")));
+registerColor("mergeEditor.change.background", "#9bb95533", ( localize(10361, "The background color for changes.")));
 registerColor("mergeEditor.change.word.background", {
     dark: "#9ccc2c33",
     light: "#9ccc2c66",
     hcDark: "#9ccc2c33",
     hcLight: "#9ccc2c66"
-}, ( localize(9659, "The background color for word changes.")));
+}, ( localize(10362, "The background color for word changes.")));
 registerColor("mergeEditor.changeBase.background", {
     dark: "#4B1818FF",
     light: "#FFCCCCFF",
     hcDark: "#4B1818FF",
     hcLight: "#FFCCCCFF"
-}, ( localize(9660, "The background color for changes in base.")));
+}, ( localize(10363, "The background color for changes in base.")));
 registerColor("mergeEditor.changeBase.word.background", {
     dark: "#6F1313FF",
     light: "#FFA3A3FF",
     hcDark: "#6F1313FF",
     hcLight: "#FFA3A3FF"
-}, ( localize(9661, "The background color for word changes in base.")));
+}, ( localize(10364, "The background color for word changes in base.")));
 registerColor("mergeEditor.conflict.unhandledUnfocused.border", {
     dark: "#ffa6007a",
     light: "#ffa600FF",
     hcDark: "#ffa6007a",
     hcLight: "#ffa6007a"
-}, ( localize(9662, "The border color of unhandled unfocused conflicts.")));
-registerColor("mergeEditor.conflict.unhandledFocused.border", "#ffa600", ( localize(9663, "The border color of unhandled focused conflicts.")));
+}, ( localize(10365, "The border color of unhandled unfocused conflicts.")));
+registerColor("mergeEditor.conflict.unhandledFocused.border", "#ffa600", ( localize(10366, "The border color of unhandled focused conflicts.")));
 registerColor(
     "mergeEditor.conflict.handledUnfocused.border",
     "#86868649",
-    ( localize(9664, "The border color of handled unfocused conflicts."))
+    ( localize(10367, "The border color of handled unfocused conflicts."))
 );
-registerColor("mergeEditor.conflict.handledFocused.border", "#c1c1c1cc", ( localize(9665, "The border color of handled focused conflicts.")));
+registerColor("mergeEditor.conflict.handledFocused.border", "#c1c1c1cc", ( localize(10368, "The border color of handled focused conflicts.")));
 const handledConflictMinimapOverViewRulerColor = registerColor(
     "mergeEditor.conflict.handled.minimapOverViewRuler",
     "#adaca8ee",
-    ( localize(9666, "The foreground color for changes in input 1."))
+    ( localize(10369, "The foreground color for changes in input 1."))
 );
 const unhandledConflictMinimapOverViewRulerColor = registerColor(
     "mergeEditor.conflict.unhandled.minimapOverViewRuler",
     "#fcba03FF",
-    ( localize(9667, "The foreground color for changes in input 1."))
+    ( localize(10370, "The foreground color for changes in input 1."))
 );
-registerColor("mergeEditor.conflictingLines.background", "#ffea0047", ( localize(9668, "The background of the \"Conflicting Lines\" text.")));
+registerColor("mergeEditor.conflictingLines.background", "#ffea0047", ( localize(10371, "The background of the \"Conflicting Lines\" text.")));
 const contentTransparency = 0.4;
-registerColor("mergeEditor.conflict.input1.background", ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(9669, "The background color of decorations in input 1.")));
-registerColor("mergeEditor.conflict.input2.background", ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(9670, "The background color of decorations in input 2.")));
+registerColor("mergeEditor.conflict.input1.background", ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(10372, "The background color of decorations in input 1.")));
+registerColor("mergeEditor.conflict.input2.background", ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(10373, "The background color of decorations in input 2.")));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };

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

@@ -92,14 +92,14 @@ class ActionsSource {
             const result = [];
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
                 result.push({
-                    text: ( localize(9671, "Manual Resolution")),
-                    tooltip: ( localize(9672, "This conflict has been resolved manually."))
+                    text: ( localize(10374, "Manual Resolution")),
+                    tooltip: ( localize(10375, "This conflict has been resolved manually."))
                 });
             } else if (state.kind === ModifiedBaseRangeStateKind.base) {
                 result.push({
-                    text: ( localize(9673, "No Changes Accepted")),
+                    text: ( localize(10376, "No Changes Accepted")),
                     tooltip: ( localize(
-                        9674,
+                        10377,
                         "The current resolution of this conflict equals the common ancestor of both the right and left changes."
                     ))
                 });
@@ -120,33 +120,33 @@ class ActionsSource {
             }
             const stateToggles = [];
             if (state.includesInput1) {
-                stateToggles.push(command(( localize(9675, "Remove {0}", model.input1.title)), async () => {
+                stateToggles.push(command(( localize(10378, "Remove {0}", model.input1.title)), async () => {
                     transaction(tx => {
                         model.setState(modifiedBaseRange, state.withInputValue(1, false), true, tx);
                         model.telemetry.reportRemoveInvoked(1, state.includesInput(2));
                     });
-                }, ( localize(9676, "Remove {0} from the result document.", model.input1.title))));
+                }, ( localize(10379, "Remove {0} from the result document.", model.input1.title))));
             }
             if (state.includesInput2) {
-                stateToggles.push(command(( localize(9675, "Remove {0}", model.input2.title)), async () => {
+                stateToggles.push(command(( localize(10378, "Remove {0}", model.input2.title)), async () => {
                     transaction(tx => {
                         model.setState(modifiedBaseRange, state.withInputValue(2, false), true, tx);
                         model.telemetry.reportRemoveInvoked(2, state.includesInput(1));
                     });
-                }, ( localize(9676, "Remove {0} from the result document.", model.input2.title))));
+                }, ( localize(10379, "Remove {0} from the result document.", model.input2.title))));
             }
             if (state.kind === ModifiedBaseRangeStateKind.both && state.firstInput === 2) {
                 stateToggles.reverse();
             }
             result.push(...stateToggles);
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
-                result.push(command(( localize(9677, "Reset to base")), async () => {
+                result.push(command(( localize(10380, "Reset to base")), async () => {
                     transaction(tx => {
                         model.setState(modifiedBaseRange, ModifiedBaseRangeState.base, true, tx);
                         model.telemetry.reportResetToBaseInvoked();
                     });
                 }, ( localize(
-                    9678,
+                    10381,
                     "Reset this conflict to the common ancestor of both the right and left changes."
                 ))));
             }
@@ -178,7 +178,7 @@ 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(( localize(9679, "Accept {0}", inputData.title)), async () => {
+                    result.push(command(( localize(10382, "Accept {0}", inputData.title)), async () => {
                         transaction(tx => {
                             model.setState(
                                 modifiedBaseRange,
@@ -188,9 +188,9 @@ class ActionsSource {
                             );
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(9680, "Accept {0} in the result document.", inputData.title))));
+                    }, ( localize(10383, "Accept {0} in the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        const commandName = modifiedBaseRange.isOrderRelevant ? ( localize(9681, "Accept Combination ({0} First)", inputData.title)) : ( localize(9682, "Accept Combination"));
+                        const commandName = modifiedBaseRange.isOrderRelevant ? ( localize(10384, "Accept Combination ({0} First)", inputData.title)) : ( localize(10385, "Accept Combination"));
                         result.push(command(commandName, async () => {
                             transaction(tx => {
                                 model.setState(
@@ -202,12 +202,12 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            9683,
+                            10386,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 } else {
-                    result.push(command(( localize(9684, "Append {0}", inputData.title)), async () => {
+                    result.push(command(( localize(10387, "Append {0}", inputData.title)), async () => {
                         transaction(tx => {
                             model.setState(
                                 modifiedBaseRange,
@@ -217,9 +217,9 @@ class ActionsSource {
                             );
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(9685, "Append {0} to the result document.", inputData.title))));
+                    }, ( localize(10388, "Append {0} to the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        result.push(command(( localize(9686, "Accept Combination", inputData.title)), async () => {
+                        result.push(command(( localize(10389, "Accept Combination", inputData.title)), async () => {
                             transaction(tx => {
                                 model.setState(
                                     modifiedBaseRange,
@@ -230,17 +230,17 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            9683,
+                            10386,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 if (!model.isInputHandled(modifiedBaseRange, inputNumber).read(reader)) {
-                    result.push(command(( localize(9687, "Ignore")), async () => {
+                    result.push(command(( localize(10390, "Ignore")), async () => {
                         transaction(tx => {
                             model.setInputHandled(modifiedBaseRange, inputNumber, true, tx);
                         });
-                    }, ( localize(9688, "Don't take this side of the conflict."))));
+                    }, ( localize(10391, "Don't take this side of the conflict."))));
                 }
             }
             return result;

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

@@ -122,16 +122,16 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.base);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9689, "Base"))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(10392, "Base"))));
             const baseShowDiffAgainst = vm.baseShowDiffAgainst.read(reader);
             let node = undefined;
             if (baseShowDiffAgainst) {
                 const label = ( localize(
-                    9690,
+                    10393,
                     "Comparing with {0}",
                     baseShowDiffAgainst === 1 ? vm.model.input1.title : vm.model.input2.title
                 ));
-                const tooltip = ( localize(9691, "Differences are highlighted with a background color."));
+                const tooltip = ( localize(10394, "Differences are highlighted with a background color."));
                 node = h("span", {
                     title: tooltip
                 }, [label]).root;

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

@@ -34,7 +34,7 @@ class CodeEditorView extends Disposable {
             h("span.detail@detail"),
             h("span.toolbar@toolbar")
         ]), h("div.container", [h("div.gutter@gutterDiv"), h("div@editor")])]);
-        this._onDidViewChange = ( new Emitter());
+        this._onDidViewChange = this._register(( new Emitter()));
         this.view = {
             element: this.htmlElements.root,
             minimumWidth: DEFAULT_EDITOR_MIN_DIMENSIONS.width,

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

@@ -178,7 +178,7 @@ 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 || ( localize(9692, "Input 1")) : vm.model.input2.title || ( localize(9693, "Input 2"));
+            const title = this.inputNumber === 1 ? vm.model.input1.title || ( localize(10395, "Input 1")) : vm.model.input2.title || ( localize(10396, "Input 2"));
             const description = this.inputNumber === 1 ? vm.model.input1.description : vm.model.input2.description;
             const detail = this.inputNumber === 1 ? vm.model.input1.detail : vm.model.input2.detail;
             reset(this.htmlElements.title, ...renderLabelWithIcons(title));
@@ -255,16 +255,16 @@ class ModifiedBaseRangeGutterItemModel {
         }
         const both = state.includesInput1 && state.includesInput2;
         return [
-            this.baseRange.input1Diffs.length > 0 ? action("mergeEditor.acceptInput1", ( localize(9694, "Accept {0}", this.model.input1.title)), state.toggle(1), state.includesInput1) : undefined,
-            this.baseRange.input2Diffs.length > 0 ? action("mergeEditor.acceptInput2", ( localize(9694, "Accept {0}", this.model.input2.title)), state.toggle(2), state.includesInput2) : undefined,
-            this.baseRange.isConflicting ? setFields(action("mergeEditor.acceptBoth", ( localize(9695, "Accept Both")), state.withInputValue(1, !both).withInputValue(2, !both), both), {
+            this.baseRange.input1Diffs.length > 0 ? action("mergeEditor.acceptInput1", ( localize(10397, "Accept {0}", this.model.input1.title)), state.toggle(1), state.includesInput1) : undefined,
+            this.baseRange.input2Diffs.length > 0 ? action("mergeEditor.acceptInput2", ( localize(10397, "Accept {0}", this.model.input2.title)), state.toggle(2), state.includesInput2) : undefined,
+            this.baseRange.isConflicting ? setFields(action("mergeEditor.acceptBoth", ( localize(10398, "Accept Both")), state.withInputValue(1, !both).withInputValue(2, !both), both), {
                 enabled: this.baseRange.canBeCombined
             }) : undefined,
             ( new Separator()),
-            this.baseRange.isConflicting ? setFields(action("mergeEditor.swap", ( localize(9696, "Swap")), state.swap(), false), {
+            this.baseRange.isConflicting ? setFields(action("mergeEditor.swap", ( localize(10399, "Swap")), state.swap(), false), {
                 enabled: !state.kind && (!both || this.baseRange.isOrderRelevant)
             }) : undefined,
-            setFields(( new Action("mergeEditor.markAsHandled", ( localize(9697, "Mark as Handled")), undefined, true, () => {
+            setFields(( new Action("mergeEditor.markAsHandled", ( localize(10400, "Mark as Handled")), undefined, true, () => {
                 transaction(tx => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
@@ -311,22 +311,22 @@ class MergeConflictGutterItemView extends Disposable {
                 [InputState.excluded]: {
                     icon: undefined,
                     checked: false,
-                    title: ( localize(9698, "Accept"))
+                    title: ( localize(10401, "Accept"))
                 },
                 [InputState.unrecognized]: {
                     icon: Codicon.circleFilled,
                     checked: false,
-                    title: ( localize(9699, "Accept (result is dirty)"))
+                    title: ( localize(10402, "Accept (result is dirty)"))
                 },
                 [InputState.first]: {
                     icon: Codicon.check,
                     checked: true,
-                    title: ( localize(9700, "Undo accept"))
+                    title: ( localize(10403, "Undo accept"))
                 },
                 [InputState.second]: {
                     icon: Codicon.checkAll,
                     checked: true,
-                    title: ( localize(9701, "Undo accept (currently second)"))
+                    title: ( localize(10404, "Undo accept (currently second)"))
                 }
             };
             const state = iconMap[value];