@codingame/monaco-vscode-view-common-service-override 4.5.1 → 5.0.0

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

@@ -11,71 +11,20 @@ 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';
 
-registerColor('mergeEditor.change.background', { dark: '#9bb95533', light: '#9bb95533', hcDark: '#9bb95533', hcLight: '#9bb95533', }, ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/browser/view/colors',
- 'mergeEditor.change.background',
- 'The background color for changes.'
-)));
-registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/browser/view/colors',
- 'mergeEditor.change.word.background',
- 'The background color for word changes.'
-)));
-registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/browser/view/colors',
- 'mergeEditor.changeBase.background',
- 'The background color for changes in base.'
-)));
-registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/browser/view/colors',
- 'mergeEditor.changeBase.word.background',
- 'The background color for word changes in base.'
-)));
-registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/browser/view/colors',
- 'mergeEditor.conflict.unhandledUnfocused.border',
- 'The border color of unhandled unfocused conflicts.'
-)));
-registerColor('mergeEditor.conflict.unhandledFocused.border', { dark: '#ffa600', light: '#ffa600', hcDark: '#ffa600', hcLight: '#ffa600', }, ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/browser/view/colors',
- 'mergeEditor.conflict.unhandledFocused.border',
- 'The border color of unhandled focused conflicts.'
-)));
-registerColor('mergeEditor.conflict.handledUnfocused.border', { dark: '#86868649', light: '#86868649', hcDark: '#86868649', hcLight: '#86868649', }, ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/browser/view/colors',
- 'mergeEditor.conflict.handledUnfocused.border',
- 'The border color of handled unfocused conflicts.'
-)));
-registerColor('mergeEditor.conflict.handledFocused.border', { dark: '#c1c1c1cc', light: '#c1c1c1cc', hcDark: '#c1c1c1cc', hcLight: '#c1c1c1cc', }, ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/browser/view/colors',
- 'mergeEditor.conflict.handledFocused.border',
- 'The border color of handled focused conflicts.'
-)));
-const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', { dark: '#adaca8ee', light: '#adaca8ee', hcDark: '#adaca8ee', hcLight: '#adaca8ee', }, ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/browser/view/colors',
- 'mergeEditor.conflict.handled.minimapOverViewRuler',
- 'The foreground color for changes in input 1.'
-)));
-const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', { dark: '#fcba03FF', light: '#fcba03FF', hcDark: '#fcba03FF', hcLight: '#fcba03FF', }, ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/browser/view/colors',
- 'mergeEditor.conflict.unhandled.minimapOverViewRuler',
- 'The foreground color for changes in input 1.'
-)));
-registerColor('mergeEditor.conflictingLines.background', { dark: '#ffea0047', light: '#ffea0047', hcDark: '#ffea0047', hcLight: '#ffea0047', }, ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/browser/view/colors',
- 'mergeEditor.conflictingLines.background',
- 'The background of the "Conflicting Lines" text.'
-)));
+const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/colors";
+registerColor('mergeEditor.change.background', { dark: '#9bb95533', light: '#9bb95533', hcDark: '#9bb95533', hcLight: '#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', { dark: '#ffa600', light: '#ffa600', hcDark: '#ffa600', hcLight: '#ffa600', }, ( localizeWithPath(_moduleId, 5, 'The border color of unhandled focused conflicts.')));
+registerColor('mergeEditor.conflict.handledUnfocused.border', { dark: '#86868649', light: '#86868649', hcDark: '#86868649', hcLight: '#86868649', }, ( localizeWithPath(_moduleId, 6, 'The border color of handled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.handledFocused.border', { dark: '#c1c1c1cc', light: '#c1c1c1cc', hcDark: '#c1c1c1cc', hcLight: '#c1c1c1cc', }, ( localizeWithPath(_moduleId, 7, 'The border color of handled focused conflicts.')));
+const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', { dark: '#adaca8ee', light: '#adaca8ee', hcDark: '#adaca8ee', hcLight: '#adaca8ee', }, ( localizeWithPath(_moduleId, 8, 'The foreground color for changes in input 1.')));
+const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', { dark: '#fcba03FF', light: '#fcba03FF', hcDark: '#fcba03FF', hcLight: '#fcba03FF', }, ( localizeWithPath(_moduleId, 9, 'The foreground color for changes in input 1.')));
+registerColor('mergeEditor.conflictingLines.background', { dark: '#ffea0047', light: '#ffea0047', hcDark: '#ffea0047', hcLight: '#ffea0047', }, ( localizeWithPath(_moduleId, 10, 'The background of the "Conflicting Lines" text.')));
 const contentTransparency = 0.4;
-registerColor('mergeEditor.conflict.input1.background', { dark: ( transparent(mergeCurrentHeaderBackground, contentTransparency)), light: ( transparent(mergeCurrentHeaderBackground, contentTransparency)), hcDark: ( transparent(mergeCurrentHeaderBackground, contentTransparency)), hcLight: ( transparent(mergeCurrentHeaderBackground, contentTransparency)) }, ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/browser/view/colors',
- 'mergeEditor.conflict.input1.background',
- 'The background color of decorations in input 1.'
-)));
-registerColor('mergeEditor.conflict.input2.background', { dark: ( transparent(mergeIncomingHeaderBackground, contentTransparency)), light: ( transparent(mergeIncomingHeaderBackground, contentTransparency)), hcDark: ( transparent(mergeIncomingHeaderBackground, contentTransparency)), hcLight: ( transparent(mergeIncomingHeaderBackground, contentTransparency)) }, ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/browser/view/colors',
- 'mergeEditor.conflict.input2.background',
- 'The background color of decorations in input 2.'
-)));
+registerColor('mergeEditor.conflict.input1.background', { dark: ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), light: ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), hcDark: ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), hcLight: ( (transparent(mergeCurrentHeaderBackground, contentTransparency))) }, ( localizeWithPath(_moduleId, 11, 'The background color of decorations in input 1.')));
+registerColor('mergeEditor.conflict.input2.background', { dark: ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), light: ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), hcDark: ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), hcLight: ( (transparent(mergeIncomingHeaderBackground, contentTransparency))) }, ( localizeWithPath(_moduleId, 12, 'The background color of decorations in input 2.')));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };

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

@@ -7,11 +7,13 @@ import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/arrays';
 import { EDITOR_FONT_DEFAULTS } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { localizeWithPath } 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();
@@ -21,7 +23,7 @@ class ConflictActionsFactory extends Disposable {
                 this._updateLensStyle();
             }
         }));
-        this._styleClassName = '_conflictActionsFactory_' + ( hash(this._editor.getId()).toString(16));
+        this._styleClassName = '_conflictActionsFactory_' + ( (hash(this._editor.getId()).toString(16)));
         this._styleElement = createStyleSheet(isInShadowDOM(this._editor.getContainerDomNode())
             ? this._editor.getContainerDomNode()
             : undefined, undefined, this._store);
@@ -57,15 +59,17 @@ class ConflictActionsFactory extends Disposable {
     }
     createWidget(viewZoneChangeAccessor, lineNumber, items, viewZoneIdsToCleanUp) {
         const layoutInfo = this._getLayoutInfo();
-        return ( new ActionsContentWidget(
-            this._editor,
-            viewZoneChangeAccessor,
-            lineNumber,
-            layoutInfo.codeLensHeight + 2,
-            this._styleClassName,
-            items,
-            viewZoneIdsToCleanUp
-        ));
+        return (
+             (new ActionsContentWidget(
+                this._editor,
+                viewZoneChangeAccessor,
+                lineNumber,
+                layoutInfo.codeLensHeight + 2,
+                this._styleClassName,
+                items,
+                viewZoneIdsToCleanUp
+            ))
+        );
     }
 }
 class ActionsSource {
@@ -82,28 +86,16 @@ class ActionsSource {
             const result = [];
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
                 result.push({
-                    text: ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                        'manualResolution',
-                        "Manual Resolution"
-                    )),
-                    tooltip: ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                        'manualResolutionTooltip',
-                        "This conflict has been resolved manually."
-                    )),
+                    text: ( localizeWithPath(_moduleId, 0, "Manual Resolution")),
+                    tooltip: ( localizeWithPath(_moduleId, 1, "This conflict has been resolved manually.")),
                 });
             }
             else if (state.kind === ModifiedBaseRangeStateKind.base) {
                 result.push({
-                    text: ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                        'noChangesAccepted',
-                        'No Changes Accepted'
-                    )),
+                    text: ( localizeWithPath(_moduleId, 2, 'No Changes Accepted')),
                     tooltip: ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                        'noChangesAcceptedTooltip',
+                        _moduleId,
+                        3,
                         'The current resolution of this conflict equals the common ancestor of both the right and left changes.'
                     )),
                 });
@@ -125,40 +117,20 @@ class ActionsSource {
             }
             const stateToggles = [];
             if (state.includesInput1) {
-                stateToggles.push(command(( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                    'remove',
-                    'Remove {0}',
-                    model.input1.title
-                )), async () => {
+                stateToggles.push(command(( localizeWithPath(_moduleId, 4, '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(
-                    'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                    'removeTooltip',
-                    'Remove {0} from the result document.',
-                    model.input1.title
-                ))));
+                }, ( localizeWithPath(_moduleId, 5, 'Remove {0} from the result document.', model.input1.title))));
             }
             if (state.includesInput2) {
-                stateToggles.push(command(( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                    'remove',
-                    'Remove {0}',
-                    model.input2.title
-                )), async () => {
+                stateToggles.push(command(( localizeWithPath(_moduleId, 4, '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(
-                    'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                    'removeTooltip',
-                    'Remove {0} from the result document.',
-                    model.input2.title
-                ))));
+                }, ( localizeWithPath(_moduleId, 5, 'Remove {0} from the result document.', model.input2.title))));
             }
             if (state.kind === ModifiedBaseRangeStateKind.both &&
                 state.firstInput === 2) {
@@ -166,18 +138,14 @@ class ActionsSource {
             }
             result.push(...stateToggles);
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
-                result.push(command(( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                    'resetToBase',
-                    'Reset to base'
-                )), async () => {
+                result.push(command(( localizeWithPath(_moduleId, 6, 'Reset to base')), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, ModifiedBaseRangeState.base, true, tx);
                         model.telemetry.reportResetToBaseInvoked();
                     });
                 }, ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                    'resetToBaseTooltip',
+                    _moduleId,
+                    7,
                     'Reset this conflict to the common ancestor of both the right and left changes.'
                 ))));
             }
@@ -209,35 +177,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(
-                        'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                        'accept',
-                        "Accept {0}",
-                        inputData.title
-                    )), async () => {
+                    result.push(command(( localizeWithPath(_moduleId, 8, "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(
-                        'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                        'acceptTooltip',
-                        "Accept {0} in the result document.",
-                        inputData.title
-                    ))));
+                    }, ( localizeWithPath(_moduleId, 9, "Accept {0} in the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
                         const commandName = modifiedBaseRange.isOrderRelevant
-                            ? ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                            'acceptBoth0First',
-                            "Accept Combination ({0} First)",
-                            inputData.title
-                        ))
-                            : ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                            'acceptBoth',
-                            "Accept Combination"
-                        ));
+                            ? ( localizeWithPath(_moduleId, 10, "Accept Combination ({0} First)", inputData.title))
+                            : ( localizeWithPath(_moduleId, 11, "Accept Combination"));
                         result.push(command(commandName, async () => {
                             transaction((tx) => {
                                 model.setState(modifiedBaseRange, ModifiedBaseRangeState.base
@@ -246,61 +195,38 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                            'acceptBothTooltip',
+                            _moduleId,
+                            12,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 else {
-                    result.push(command(( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                        'append',
-                        "Append {0}",
-                        inputData.title
-                    )), async () => {
+                    result.push(command(( localizeWithPath(_moduleId, 13, "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(
-                        'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                        'appendTooltip',
-                        "Append {0} to the result document.",
-                        inputData.title
-                    ))));
+                    }, ( localizeWithPath(_moduleId, 14, "Append {0} to the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        result.push(command(( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                            'combine',
-                            "Accept Combination",
-                            inputData.title
-                        )), async () => {
+                        result.push(command(( localizeWithPath(_moduleId, 15, "Accept Combination", inputData.title)), async () => {
                             transaction((tx) => {
                                 model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, true), inputNumber, tx);
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                            'acceptBothTooltip',
+                            _moduleId,
+                            12,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 if (!model.isInputHandled(modifiedBaseRange, inputNumber).read(reader)) {
-                    result.push(command(( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                        'ignore',
-                        'Ignore'
-                    )), async () => {
+                    result.push(command(( localizeWithPath(_moduleId, 16, 'Ignore')), async () => {
                         transaction((tx) => {
                             model.setInputHandled(modifiedBaseRange, inputNumber, true, tx);
                         });
-                    }, ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/view/conflictActions',
-                        'markAsHandledTooltip',
-                        "Don't take this side of the conflict."
-                    ))));
+                    }, ( localizeWithPath(_moduleId, 17, "Don't take this side of the conflict."))));
                 }
             }
             return result;

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

@@ -5,6 +5,7 @@ import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import { observableFromEvent, observableSignalFromEvent, observableSignal } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/arrays';
 import { LineRange } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 
 class EditorGutter extends Disposable {

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

@@ -2,6 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { reset, h } from 'vscode/vscode/vs/base/browser/dom';
 import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { BugIndicatingError } from 'vscode/vscode/vs/base/common/errors';
+import 'vscode/vscode/vs/base/common/arrays';
 import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
@@ -16,6 +17,7 @@ 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);
@@ -102,10 +104,10 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
         this._register(instantiationService.createInstance(TitleMenu, MenuId.MergeBaseToolbar, this.htmlElements.title));
         this._register(autorunWithStore((reader, store) => {
             if (this.checkboxesVisible.read(reader)) {
-                store.add(( new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
+                store.add(( (new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
                     getIntersectingGutterItems: (range, reader) => [],
-                    createView: (item, target) => { throw new BugIndicatingError(); },
-                })));
+                    createView: (item, target) => { throw ( (new BugIndicatingError())); },
+                }))));
             }
         }));
         this._register(autorun(reader => {
@@ -114,25 +116,17 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.base);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView',
-                'base',
-                'Base'
-            ))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localizeWithPath(_moduleId, 0, 'Base'))));
             const baseShowDiffAgainst = vm.baseShowDiffAgainst.read(reader);
             let node = undefined;
             if (baseShowDiffAgainst) {
                 const label = ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView',
-                    'compareWith',
+                    _moduleId,
+                    1,
                     'Comparing with {0}',
                     baseShowDiffAgainst === 1 ? vm.model.input1.title : vm.model.input2.title
                 ));
-                const tooltip = ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView',
-                    'compareWithTooltip',
-                    'Differences are highlighted with a background color.'
-                ));
+                const tooltip = ( localizeWithPath(_moduleId, 2, 'Differences are highlighted with a background color.'));
                 node = h('span', { title: tooltip }, [label]).root;
             }
             reset(this.htmlElements.description, ...(node ? [node] : []));
@@ -140,9 +134,9 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
         this._register(applyObservableDecorations(this.editor, this.decorations));
     }
 };
-BaseCodeEditorView = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IConfigurationService))
-], BaseCodeEditorView));
+BaseCodeEditorView = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, IConfigurationService)))
+], BaseCodeEditorView)));
 
 export { BaseCodeEditorView };

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

@@ -2,6 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { h } from 'vscode/vscode/vs/base/browser/dom';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/base/common/arrays';
 import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import { observableFromEvent } from 'vscode/vscode/vs/base/common/observableInternal/utils';