@codingame/monaco-vscode-view-common-service-override 11.1.2 → 12.0.0

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

@@ -1,3 +1,4 @@
+
 import { h, reset } from 'vscode/vscode/vs/base/browser/dom';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { transaction } from 'vscode/vscode/vs/base/common/observableInternal/base';
@@ -7,7 +8,7 @@ import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun
 import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
 import { observableFromEvent, observableSignalFromEvent, observableSignal } from 'vscode/vscode/vs/base/common/observableInternal/utils';
-import { LineRange } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
+import { LineRange } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 
 class EditorGutter extends Disposable {
     constructor(_editor, _domNode, itemProvider) {

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

@@ -0,0 +1,9 @@
+import { IObservable } from "vscode/vscode/vs/base/common/observable";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { MergeEditorViewModel } from "../viewModel.js";
+import { CodeEditorView } from "./codeEditorView.js";
+export declare class BaseCodeEditorView extends CodeEditorView {
+    constructor(viewModel: IObservable<MergeEditorViewModel | undefined>, instantiationService: IInstantiationService, configurationService: IConfigurationService);
+    private readonly decorations;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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';
@@ -9,12 +10,12 @@ import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observab
 import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
-import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { MinimapPosition, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 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';
-import { applyObservableDecorations } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { applyObservableDecorations } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
 import { EditorGutter } from '../editorGutter.js';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
@@ -89,7 +90,7 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                         blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
                         description: 'Merge Editor',
                         minimap: {
-                            position: 2 ,
+                            position: MinimapPosition.Gutter,
                             color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
                         },
                         overviewRuler: modifiedBaseRange.isConflicting ? {
@@ -105,10 +106,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 => {
@@ -117,16 +118,16 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.base);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11483, 'Base'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(7243, 'Base'))));
             const baseShowDiffAgainst = vm.baseShowDiffAgainst.read(reader);
             let node = undefined;
             if (baseShowDiffAgainst) {
                 const label = ( localize(
-                    11484,
+                    7244,
                     'Comparing with {0}',
                     baseShowDiffAgainst === 1 ? vm.model.input1.title : vm.model.input2.title
                 ));
-                const tooltip = ( localize(11485, 'Differences are highlighted with a background color.'));
+                const tooltip = ( localize(7245, 'Differences are highlighted with a background color.'));
                 node = h('span', { title: tooltip }, [label]).root;
             }
             reset(this.htmlElements.description, ...(node ? [node] : []));
@@ -134,9 +135,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.d.ts

@@ -0,0 +1,45 @@
+import { IView } from "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/base/browser/ui/grid/grid";
+import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IObservable } from "vscode/vscode/vs/base/common/observable";
+import { IEditorContributionDescription } from "vscode/vscode/vs/editor/browser/editorExtensions";
+import { CodeEditorWidget } from "vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget";
+import { IEditorOptions } from "vscode/vscode/vs/editor/common/config/editorOptions";
+import { Range } from "vscode/vscode/vs/editor/common/core/range";
+import { Selection } from "vscode/vscode/vs/editor/common/core/selection";
+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";
+import { MergeEditorViewModel } from "../viewModel.js";
+export declare abstract class CodeEditorView extends Disposable {
+    private readonly instantiationService;
+    readonly viewModel: IObservable<undefined | MergeEditorViewModel>;
+    private readonly configurationService;
+    readonly model: IObservable<import("@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel").MergeEditorModel | undefined, unknown>;
+    protected readonly htmlElements: {
+        description: HTMLSpanElement;
+        root: HTMLSpanElement & HTMLDivElement;
+        title: HTMLSpanElement;
+        detail: HTMLSpanElement;
+        toolbar: HTMLSpanElement;
+        header: HTMLDivElement;
+        editor: HTMLDivElement;
+        gutterDiv: HTMLDivElement;
+    };
+    private readonly _onDidViewChange;
+    readonly view: IView;
+    protected readonly checkboxesVisible: IObservable<boolean, unknown>;
+    protected readonly showDeletionMarkers: IObservable<boolean, unknown>;
+    protected readonly useSimplifiedDecorations: IObservable<boolean, unknown>;
+    readonly editor: CodeEditorWidget;
+    updateOptions(newOptions: Readonly<IEditorOptions>): void;
+    readonly isFocused: IObservable<boolean, unknown>;
+    readonly cursorPosition: IObservable<import("vscode/vscode/vs/editor/common/core/position").Position | null, unknown>;
+    readonly selection: IObservable<Selection[] | null, unknown>;
+    readonly cursorLineNumber: IObservable<number | undefined, unknown>;
+    constructor(instantiationService: IInstantiationService, viewModel: IObservable<undefined | MergeEditorViewModel>, configurationService: IConfigurationService);
+    protected getEditorContributions(): IEditorContributionDescription[];
+}
+export declare function createSelectionsAutorun(codeEditorView: CodeEditorView, translateRange: (baseRange: Range, viewModel: MergeEditorViewModel) => Range): IDisposable;
+export declare class TitleMenu extends Disposable {
+    constructor(menuId: MenuId, targetHtmlElement: HTMLElement, instantiationService: IInstantiationService);
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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';
@@ -15,7 +16,7 @@ import { FoldingController } from 'vscode/vscode/vs/editor/contrib/folding/brows
 import { MenuWorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from 'vscode/vscode/vs/workbench/browser/parts/editor/editor';
-import { setStyle } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { setStyle } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
 
 class CodeEditorView extends Disposable {

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

@@ -0,0 +1,43 @@
+import { IAction } from "vscode/vscode/vs/base/common/actions";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IObservable, ITransaction } from "vscode/vscode/vs/base/common/observable";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextMenuService } from "vscode/vscode/vs/platform/contextview/browser/contextView.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { InputState, ModifiedBaseRange } from "@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange";
+import { MergeEditorViewModel } from "../viewModel.js";
+import { IGutterItemInfo, IGutterItemView } from "../editorGutter.js";
+import { CodeEditorView } from "./codeEditorView.js";
+export declare class InputCodeEditorView extends CodeEditorView {
+    readonly inputNumber: 1 | 2;
+    readonly otherInputNumber: number;
+    constructor(inputNumber: 1 | 2, viewModel: IObservable<MergeEditorViewModel | undefined>, instantiationService: IInstantiationService, contextMenuService: IContextMenuService, configurationService: IConfigurationService);
+    private readonly modifiedBaseRangeGutterItemInfos;
+    private readonly decorations;
+}
+export declare class ModifiedBaseRangeGutterItemModel implements IGutterItemInfo {
+    readonly id: string;
+    private readonly baseRange;
+    private readonly inputNumber;
+    private readonly viewModel;
+    private readonly model;
+    readonly range: import("@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange").LineRange;
+    constructor(id: string, baseRange: ModifiedBaseRange, inputNumber: 1 | 2, viewModel: MergeEditorViewModel);
+    readonly enabled: IObservable<boolean, unknown>;
+    readonly toggleState: IObservable<InputState>;
+    readonly state: IObservable<{
+        handled: boolean;
+        focused: boolean;
+    }>;
+    setState(value: boolean, tx: ITransaction): void;
+    toggleBothSides(): void;
+    getContextMenuActions(): readonly IAction[];
+}
+export declare class MergeConflictGutterItemView extends Disposable implements IGutterItemView<ModifiedBaseRangeGutterItemModel> {
+    private readonly item;
+    private readonly checkboxDiv;
+    private readonly isMultiLine;
+    constructor(item: ModifiedBaseRangeGutterItemModel, target: HTMLElement, contextMenuService: IContextMenuService);
+    layout(top: number, height: number, viewTop: number, viewHeight: number): void;
+    update(baseRange: ModifiedBaseRangeGutterItemModel): void;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { reset, addDisposableListener, EventType, h } from 'vscode/vscode/vs/base/browser/dom';
 import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { Toggle } from 'vscode/vscode/vs/base/browser/ui/toggle/toggle';
@@ -15,14 +16,15 @@ import 'vscode/vscode/vs/base/common/cancellation';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { noBreakWhitespace } from 'vscode/vscode/vs/base/common/strings';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
-import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { MinimapPosition, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 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';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { defaultToggleStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
-import { applyObservableDecorations, setFields } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { InputState } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
+import { applyObservableDecorations, setFields } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
 import { EditorGutter } from '../editorGutter.js';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
@@ -40,13 +42,9 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
             const model = viewModel.model;
             const inputNumber = this.inputNumber;
             const showNonConflictingChanges = viewModel.showNonConflictingChanges.read(reader);
-            return (
-                 (model.modifiedBaseRanges.read(reader)
-                    .filter((r) => r.getInputDiffs(this.inputNumber).length > 0 && (showNonConflictingChanges || r.isConflicting || !model.isHandled(r).read(reader)))
-                    .map(
-                    (baseRange, idx) => ( (new ModifiedBaseRangeGutterItemModel( (idx.toString()), baseRange, inputNumber, viewModel)))
-                ))
-            );
+            return ( model.modifiedBaseRanges.read(reader)
+                .filter((r) => r.getInputDiffs(this.inputNumber).length > 0 && (showNonConflictingChanges || r.isConflicting || !model.isHandled(r).read(reader)))
+                .map((baseRange, idx) => ( new ModifiedBaseRangeGutterItemModel(( idx.toString()), baseRange, inputNumber, viewModel))));
         });
         this.decorations = derivedOpts({ debugName: `input${this.inputNumber}.decorations` }, reader => {
             const viewModel = this.viewModel.read(reader);
@@ -56,7 +54,7 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
             const model = viewModel.model;
             const textModel = (this.inputNumber === 1 ? model.input1 : model.input2).textModel;
             const activeModifiedBaseRange = viewModel.activeModifiedBaseRange.read(reader);
-            const result = ( (new Array()));
+            const result = ( new Array());
             const showNonConflictingChanges = viewModel.showNonConflictingChanges.read(reader);
             const showDeletionMarkers = this.showDeletionMarkers.read(reader);
             const diffWithThis = viewModel.baseCodeEditorView.read(reader) !== undefined && viewModel.baseShowDiffAgainst.read(reader) === this.inputNumber;
@@ -96,7 +94,7 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
                         blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
                         description: 'Merge Editor',
                         minimap: {
-                            position: 2 ,
+                            position: MinimapPosition.Gutter,
                             color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
                         },
                         overviewRuler: modifiedBaseRange.isConflicting ? {
@@ -139,7 +137,7 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
             return result;
         });
         this.htmlElements.root.classList.add(`input`);
-        this._register(( (new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
+        this._register(( new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
             getIntersectingGutterItems: (range, reader) => {
                 if (this.checkboxesVisible.read(reader)) {
                     return this.modifiedBaseRangeGutterItemInfos.read(reader);
@@ -148,8 +146,8 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
                     return [];
                 }
             },
-            createView: (item, target) => ( (new MergeConflictGutterItemView(item, target, contextMenuService))),
-        }))));
+            createView: (item, target) => ( new MergeConflictGutterItemView(item, target, contextMenuService)),
+        })));
         this._register(createSelectionsAutorun(this, (baseRange, viewModel) => viewModel.model.translateBaseRangeToInput(this.inputNumber, baseRange)));
         this._register(instantiationService.createInstance(TitleMenu, inputNumber === 1 ? MenuId.MergeInput1Toolbar : MenuId.MergeInput2Toolbar, this.htmlElements.toolbar));
         this._register(autorunOpts({ debugName: `input${this.inputNumber}: update labels & text model` }, reader => {
@@ -159,8 +157,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 || ( localize(11500, 'Input 1'))
-                : vm.model.input2.title || ( localize(11501, 'Input 2'));
+                ? vm.model.input1.title || ( localize(7246, 'Input 1'))
+                : vm.model.input2.title || ( localize(7247, 'Input 2'));
             const description = this.inputNumber === 1
                 ? vm.model.input1.description
                 : vm.model.input2.description;
@@ -174,11 +172,11 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
         this._register(applyObservableDecorations(this.editor, this.decorations));
     }
 };
-InputCodeEditorView = ( (__decorate([
-    ( (__param(2, IInstantiationService))),
-    ( (__param(3, IContextMenuService))),
-    ( (__param(4, IConfigurationService)))
-], InputCodeEditorView)));
+InputCodeEditorView = ( __decorate([
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IContextMenuService)),
+    ( __param(4, IConfigurationService))
+], InputCodeEditorView));
 class ModifiedBaseRangeGutterItemModel {
     constructor(id, baseRange, inputNumber, viewModel) {
         this.id = id;
@@ -193,8 +191,8 @@ class ModifiedBaseRangeGutterItemModel {
                 .getState(this.baseRange)
                 .read(reader)
                 .getInput(this.inputNumber);
-            return input === 2  && !this.baseRange.isOrderRelevant
-                ? 1
+            return input === InputState.second && !this.baseRange.isOrderRelevant
+                ? InputState.first
                 : input;
         });
         this.state = derived(this, reader => {
@@ -233,32 +231,32 @@ class ModifiedBaseRangeGutterItemModel {
             });
         };
         function action(id, label, targetState, checked) {
-            const action = ( (new Action(id, label, undefined, true, () => {
+            const action = ( new Action(id, label, undefined, true, () => {
                 update(targetState);
-            })));
+            }));
             action.checked = checked;
             return action;
         }
         const both = state.includesInput1 && state.includesInput2;
         return [
             this.baseRange.input1Diffs.length > 0
-                ? action('mergeEditor.acceptInput1', ( localize(11502, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
+                ? action('mergeEditor.acceptInput1', ( localize(7248, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
                 : undefined,
             this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localize(11502, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
+                ? action('mergeEditor.acceptInput2', ( localize(7248, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
                 : undefined,
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localize(11503, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
+                ? setFields(action('mergeEditor.acceptBoth', ( localize(7249, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
                 : undefined,
-            ( (new Separator())),
+            ( new Separator()),
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.swap', ( localize(11504, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
+                ? setFields(action('mergeEditor.swap', ( localize(7250, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
                 : undefined,
-            setFields(( (new Action('mergeEditor.markAsHandled', ( localize(11505, 'Mark as Handled')), undefined, true, () => {
+            setFields(( new Action('mergeEditor.markAsHandled', ( localize(7251, 'Mark as Handled')), undefined, true, () => {
                 transaction((tx) => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
-            }))), { checked: handled }),
+            })), { checked: handled }),
         ].filter(isDefined);
     }
 }
@@ -267,12 +265,12 @@ class MergeConflictGutterItemView extends Disposable {
         super();
         this.isMultiLine = observableValue(this, false);
         this.item = observableValue(this, item);
-        const checkBox = ( (new Toggle({
+        const checkBox = ( new Toggle({
             isChecked: false,
             title: '',
             icon: Codicon.check,
             ...defaultToggleStyles
-        })));
+        }));
         checkBox.domNode.classList.add('accept-conflict-group');
         this._register(addDisposableListener(checkBox.domNode, EventType.MOUSE_DOWN, (e) => {
             const item = this.item.get();
@@ -297,10 +295,10 @@ class MergeConflictGutterItemView extends Disposable {
             const item = this.item.read(reader);
             const value = item.toggleState.read(reader);
             const iconMap = {
-                [0 ]: { icon: undefined, checked: false, title: ( localize(11506, "Accept")) },
-                [3 ]: { icon: Codicon.circleFilled, checked: false, title: ( localize(11507, "Accept (result is dirty)")) },
-                [1 ]: { icon: Codicon.check, checked: true, title: ( localize(11508, "Undo accept")) },
-                [2 ]: { icon: Codicon.checkAll, checked: true, title: ( localize(11509, "Undo accept (currently second)")) },
+                [InputState.excluded]: { icon: undefined, checked: false, title: ( localize(7252, "Accept")) },
+                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(7253, "Accept (result is dirty)")) },
+                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(7254, "Undo accept")) },
+                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(7255, "Undo accept (currently second)")) },
             };
             const state = iconMap[value];
             checkBox.setIcon(state.icon);

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

@@ -0,0 +1,11 @@
+import { IObservable } from "vscode/vscode/vs/base/common/observable";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { ILabelService } from "vscode/vscode/vs/platform/label/common/label.service";
+import { MergeEditorViewModel } from "../viewModel.js";
+import { CodeEditorView } from "./codeEditorView.js";
+export declare class ResultCodeEditorView extends CodeEditorView {
+    private readonly _labelService;
+    constructor(viewModel: IObservable<MergeEditorViewModel | undefined>, instantiationService: IInstantiationService, _labelService: ILabelService, configurationService: IConfigurationService);
+    private readonly decorations;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { reset } from 'vscode/vscode/vs/base/browser/dom';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
@@ -10,18 +11,18 @@ import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observab
 import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
-import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { MinimapPosition, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 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';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
-import { LineRange } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
-import { join, applyObservableDecorations } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { LineRange } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
+import { join, applyObservableDecorations } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
 import { EditorGutter } from '../editorGutter.js';
-import { ctxIsMergeResultEditor } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
+import { ctxIsMergeResultEditor } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
 
 let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
@@ -35,7 +36,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
             }
             const model = viewModel.model;
             const textModel = model.resultTextModel;
-            const result = ( (new Array()));
+            const result = ( new Array());
             const baseRangeWithStoreAndTouchingDiffs = join(model.modifiedBaseRanges.read(reader), model.baseResultDiffs.read(reader), (baseRange, diff) => baseRange.baseRange.touches(diff.inputRange)
                 ? CompareResult.neitherLessOrGreaterThan
                 : LineRange.compareByStart(baseRange.baseRange, diff.inputRange));
@@ -71,7 +72,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                             blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
                             description: 'Result Diff',
                             minimap: {
-                                position: 2 ,
+                                position: MinimapPosition.Gutter,
                                 color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
                             },
                             overviewRuler: modifiedBaseRange.isConflicting ? {
@@ -120,10 +121,10 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
         this.htmlElements.root.classList.add(`result`);
         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 => {
@@ -132,10 +133,10 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11510, 'Result'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(7256, 'Result'))));
             reset(this.htmlElements.description, ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, { relative: true })));
         }));
-        const remainingConflictsActionBar = this._register(( (new ActionBar(this.htmlElements.detail))));
+        const remainingConflictsActionBar = this._register(( new ActionBar(this.htmlElements.detail)));
         this._register(autorun(reader => {
             const vm = this.viewModel.read(reader);
             if (!vm) {
@@ -147,8 +148,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
             }
             const count = model.unhandledConflictsCount.read(reader);
             const text = count === 1
-                ? ( localize(11511, '{0} Conflict Remaining', count))
-                : ( localize(11512, '{0} Conflicts Remaining ', count));
+                ? ( localize(7257, '{0} Conflict Remaining', count))
+                : ( localize(7258, '{0} Conflicts Remaining ', count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -160,8 +161,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).get());
                 },
                 tooltip: count > 0
-                    ? ( localize(11513, 'Go to next conflict'))
-                    : ( localize(11514, 'All conflicts handled, the merge can be completed now.')),
+                    ? ( localize(7259, 'Go to next conflict'))
+                    : ( localize(7260, 'All conflicts handled, the merge can be completed now.')),
             });
         }));
         this._register(applyObservableDecorations(this.editor, this.decorations));
@@ -169,10 +170,10 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
         this._register(instantiationService.createInstance(TitleMenu, MenuId.MergeInputResultToolbar, this.htmlElements.toolbar));
     }
 };
-ResultCodeEditorView = ( (__decorate([
-    ( (__param(1, IInstantiationService))),
-    ( (__param(2, ILabelService))),
-    ( (__param(3, IConfigurationService)))
-], ResultCodeEditorView)));
+ResultCodeEditorView = ( __decorate([
+    ( __param(1, IInstantiationService)),
+    ( __param(2, ILabelService)),
+    ( __param(3, IConfigurationService))
+], ResultCodeEditorView));
 
 export { ResultCodeEditorView };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/lineAlignment.d.ts

@@ -0,0 +1,7 @@
+import { ModifiedBaseRange } from "@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange";
+export type LineAlignment = [
+    input1LineNumber: number | undefined,
+    baseLineNumber: number,
+    input2LineNumber: number | undefined
+];
+export declare function getAlignments(m: ModifiedBaseRange): LineAlignment[];

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

@@ -1,11 +1,12 @@
+
 import { compareBy } from 'vscode/vscode/vs/base/common/arrays';
 import { assertFn, checkAdjacentItems } from 'vscode/vscode/vs/base/common/assert';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { TextLength } from 'vscode/vscode/vs/editor/common/core/textLength';
-import { RangeMapping } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { lengthOfRange, lengthBetweenPositions, addLength } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/rangeUtils';
+import { RangeMapping } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping';
+import { lengthOfRange, lengthBetweenPositions, addLength } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/rangeUtils';
 
 function getAlignments(m) {
     const equalRanges1 = toEqualRangeMappings(m.input1Diffs.flatMap(d => d.rangeMappings), m.baseRange.toRange(), m.input1Range.toRange());

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

@@ -1,4 +1,4 @@
-import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css';
 
 var css = ".monaco-workbench .merge-editor .code-view>.header{align-content:center;display:flex;height:30px;overflow:hidden;padding:0 10px}.monaco-workbench .merge-editor .code-view>.header>span{align-self:center;overflow:hidden;padding-right:6px;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .merge-editor .code-view>.header>span.title{flex-shrink:0}.monaco-workbench .merge-editor .code-view>.header>span.description{align-items:center;color:var(--vscode-descriptionForeground);display:flex;flex-shrink:0;font-size:12px}.monaco-workbench .merge-editor .code-view.result>.header>.description{display:inline;flex-shrink:1}.monaco-workbench .merge-editor .code-view.result>.header>.detail,.monaco-workbench .merge-editor .code-view.result>.header>.toolbar{flex-shrink:0}.monaco-workbench .merge-editor .code-view>.header>span.description .codicon{color:var(--vscode-descriptionForeground);font-size:14px}.monaco-workbench .merge-editor .code-view>.header>span.detail{color:var(--vscode-descriptionForeground);font-size:12px;margin-left:auto}.monaco-workbench .merge-editor .code-view>.header>span.detail .codicon{font-size:13px}.monaco-workbench .merge-editor .code-view.input>.header>span.detail:before{content:\"•\";opacity:.5;padding-right:3px}.monaco-workbench .merge-editor .code-view.input>.header>span.detail{margin-left:0}.monaco-workbench .merge-editor .code-view.input>.header>span.toolbar{flex-shrink:0;margin-left:auto}.monaco-workbench .merge-editor .code-view>.container{display:flex;flex-direction:row}.monaco-workbench .merge-editor .code-view>.container>.gutter{flex-grow:0;flex-shrink:0;overflow:hidden;position:relative;width:24px}.monaco-workbench .merge-editor .merge-editor-diff{background-color:var(--vscode-mergeEditor-change-background)}.monaco-workbench .merge-editor .merge-editor-diff-word{background-color:var(--vscode-mergeEditor-change-word-background)}.monaco-workbench .merge-editor .merge-editor-block:not(.handled):not(.focused){border:1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border)}.monaco-workbench .merge-editor .merge-editor-block:not(.handled).focused{border:2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border)}.monaco-workbench .merge-editor .merge-editor-block.handled:not(.focused){border:1px solid var(--vscode-mergeEditor-conflict-handledUnfocused-border)}.monaco-workbench .merge-editor .merge-editor-block.handled.focused{border:1px solid var(--vscode-mergeEditor-conflict-handledFocused-border)}.merge-editor-block.use-simplified-decorations.input.i1,.monaco-workbench .merge-editor .merge-editor-simplified.input.i1{background-color:var(--vscode-mergeEditor-conflict-input1-background)}.merge-editor-block.use-simplified-decorations.input.i2,.monaco-workbench .merge-editor .merge-editor-simplified.input.i2{background-color:var(--vscode-mergeEditor-conflict-input2-background)}.gutter.monaco-editor>div{position:absolute}.merge-accept-gutter-marker{margin-left:4px;width:28px}.merge-accept-gutter-marker .background{height:100%;position:absolute;width:50%}.merge-accept-gutter-marker.multi-line.focused .background{border:2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);border-right:0}.merge-accept-gutter-marker.multi-line .background{border:2px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);border-bottom-left-radius:3px;border-right:0;border-top-left-radius:3px}.merge-accept-gutter-marker.multi-line.handled.focused .background{border:2px solid var(--vscode-mergeEditor-conflict-handledFocused-border);border-right:0}.merge-accept-gutter-marker.multi-line.handled .background{border:2px solid var(--vscode-checkbox-border);border-right:0}.focused .accept-conflict-group.monaco-custom-toggle{border:1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border)}.accept-conflict-group.monaco-custom-toggle{border:1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border)}.handled.focused .accept-conflict-group.monaco-custom-toggle{border:1px solid var(--vscode-mergeEditor-conflict-handledFocused-border)}.handled .accept-conflict-group.monaco-custom-toggle{border:1px solid var(--vscode-checkbox-border)}.merge-accept-gutter-marker.multi-line .background{left:8px;width:10px}.merge-accept-gutter-marker .checkbox{position:absolute;width:100%}.accept-conflict-group.monaco-custom-toggle{background-color:var(--vscode-checkbox-border);background-size:16px!important;border-radius:3px;height:18px;margin-left:0;margin-right:0;opacity:1;padding:0;width:18px}.merge-accept-gutter-marker .checkbox-background{background:var(--vscode-editor-background);display:flex}.conflict-zone-root{align-content:center;align-items:center;background-color:var(--vscode-mergeEditor-change-background);border:1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);display:flex;height:90%}.conflict-zone-root .dots{margin:0 10px}.conflict-zone-root pre{display:\"inline\";font-family:var(--monaco-monospace-font)}.conflict-zone-root .text{align-items:center;background:var(--vscode-mergeEditor-conflictingLines-background);display:flex;height:100%;margin-left:auto;overflow:hidden;padding:0 8px;white-space:nowrap}.focused.conflict-zone .conflict-zone-root{border:1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border)}.merge-editor-conflict-actions{color:var(--vscode-editorCodeLens-foreground);display:inline-block;margin:0 3px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.merge-editor-conflict-actions>a,.merge-editor-conflict-actions>span{user-select:none;-webkit-user-select:none;white-space:nowrap}.merge-editor-conflict-actions>a{text-decoration:none}.merge-editor-conflict-actions>a:hover{cursor:pointer}.merge-editor-conflict-actions>a:hover,.merge-editor-conflict-actions>a:hover .codicon{color:var(--vscode-editorLink-activeForeground)!important}.merge-editor-conflict-actions .codicon{color:currentColor!important;color:var(--vscode-editorCodeLens-foreground);vertical-align:middle}.merge-editor-conflict-actions>a:hover .codicon:before{cursor:pointer}.fixed-zone-widget{width:100%}.merge-editor-diff-empty-word.base{border-left:3px solid var(--vscode-mergeEditor-changeBase-word-background);margin-left:3px}.merge-editor-diff-empty-word.input{border-left:3px solid var(--vscode-mergeEditor-change-word-background);margin-left:3px}.merge-editor-diff-word.base{background-color:var(--vscode-mergeEditor-changeBase-word-background)}.merge-editor-diff.base{background-color:var(--vscode-mergeEditor-changeBase-background)}";
 n(css,{});