@theia/scm 1.67.0-next.56 → 1.67.0-next.59

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js

@@ -0,0 +1,214 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 1C-Soft LLC and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MergeEditorPane = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+const core_1 = require("@theia/core");
+const observable_1 = require("@theia/core/lib/common/observable");
+const browser_1 = require("@theia/core/lib/browser");
+const browser_2 = require("@theia/editor/lib/browser");
+const monaco_editor_1 = require("@theia/monaco/lib/browser/monaco-editor");
+const monaco_to_protocol_converter_1 = require("@theia/monaco/lib/browser/monaco-to-protocol-converter");
+const monaco_editor_core_1 = require("@theia/monaco-editor-core");
+const merge_editor_pane_header_1 = require("./merge-editor-pane-header");
+const range_utils_1 = require("../../model/range-utils");
+const scm_colors_1 = require("../../../scm-colors");
+let MergeEditorPane = class MergeEditorPane extends browser_1.BoxPanel {
+    get editor() {
+        return monaco_editor_1.MonacoEditor.get(this.editorWidget);
+    }
+    constructor() {
+        super({ spacing: 0 });
+        this.toDispose = new core_1.DisposableCollection();
+        this.addClass('editor-pane');
+    }
+    init() {
+        this.cursorPositionObservable = observable_1.ObservableFromEvent.create(this.editor.onCursorPositionChanged, () => this.editor.cursor);
+        this.cursorLineObservable = observable_1.DerivedObservable.create(() => this.cursorPositionObservable.get().line);
+        this.selectionObservable = observable_1.ObservableFromEvent.create(this.editor.getControl().onDidChangeCursorSelection, () => {
+            const selections = this.editor.getControl().getSelections();
+            return selections === null || selections === void 0 ? void 0 : selections.map(selection => this.m2p.asRange(selection));
+        });
+        browser_1.BoxPanel.setStretch(this.header, 0);
+        browser_1.BoxPanel.setStretch(this.editorWidget, 1);
+        this.addWidget(this.header);
+        this.addWidget(this.editorWidget);
+    }
+    dispose() {
+        super.dispose();
+        this.toDispose.dispose();
+    }
+    get mergeEditor() {
+        return this._mergeEditor;
+    }
+    set mergeEditor(mergeEditor) {
+        if (this._mergeEditor) {
+            throw new Error('Merge editor has already been set');
+        }
+        this._mergeEditor = mergeEditor;
+        this.onAfterMergeEditorSet();
+    }
+    onAfterMergeEditorSet() {
+        this.initContextKeys();
+        const toolbarItems = observable_1.DerivedObservable.create(() => this.getToolbarItems());
+        this.toDispose.push(observable_1.Autorun.create(() => {
+            this.header.toolbarItems = toolbarItems.get();
+        }));
+        this.initSelectionSynchronizer();
+        let decorationIds = [];
+        const decorations = observable_1.DerivedObservable.create(() => this.computeEditorDecorations());
+        const isVisible = observable_1.ObservableFromEvent.create(this.editorWidget.onDidChangeVisibility, () => this.editorWidget.isVisible);
+        this.toDispose.push(observable_1.Autorun.create(() => {
+            if (this.mergeEditor.isShown && isVisible.get()) {
+                decorationIds = this.editor.deltaDecorations({ oldDecorations: decorationIds, newDecorations: decorations.get() });
+            }
+        }));
+        this.toDispose.push(core_1.Disposable.create(() => decorationIds = this.editor.deltaDecorations({ oldDecorations: decorationIds, newDecorations: [] })));
+    }
+    get cursorPosition() {
+        return this.cursorPositionObservable.get();
+    }
+    get cursorLine() {
+        return this.cursorLineObservable.get();
+    }
+    get selection() {
+        return this.selectionObservable.get();
+    }
+    goToMergeRange(mergeRange, options) {
+        var _a;
+        const { editor } = this;
+        const { startLineNumber, endLineNumberExclusive } = this.getLineRangeForMergeRange(mergeRange);
+        editor.cursor = { line: startLineNumber, character: 0 };
+        const reveal = (_a = options === null || options === void 0 ? void 0 : options.reveal) !== null && _a !== void 0 ? _a : true;
+        if (reveal) {
+            editor.getControl().revealLinesNearTop(startLineNumber + 1, endLineNumberExclusive + 1);
+        }
+    }
+    getToolbarItems() {
+        return [];
+    }
+    computeEditorDecorations() {
+        return [];
+    }
+    toMergeRangeDecoration(lineRange, { isHandled, isFocused, isAfterEnd }) {
+        const blockClassNames = ['merge-range'];
+        let blockPadding = [0, 0, 0, 0];
+        if (isHandled) {
+            blockClassNames.push('handled');
+        }
+        if (isFocused) {
+            blockClassNames.push('focused');
+            blockPadding = [0, 2, 0, 2];
+        }
+        return {
+            range: lineRange.toInclusiveRangeOrEmpty(),
+            options: {
+                blockClassName: blockClassNames.join(' '),
+                blockPadding,
+                blockIsAfterEnd: isAfterEnd,
+                minimap: {
+                    position: browser_2.MinimapPosition.Gutter,
+                    color: { id: isHandled ? scm_colors_1.ScmColors.handledConflictMinimapOverviewRulerColor : scm_colors_1.ScmColors.unhandledConflictMinimapOverviewRulerColor },
+                },
+                overviewRuler: {
+                    position: browser_2.OverviewRulerLane.Center,
+                    color: { id: isHandled ? scm_colors_1.ScmColors.handledConflictMinimapOverviewRulerColor : scm_colors_1.ScmColors.unhandledConflictMinimapOverviewRulerColor },
+                },
+                showIfCollapsed: true,
+                stickiness: browser_2.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+            }
+        };
+    }
+    toChangeDecorations(changes, { diffSide }) {
+        const result = [];
+        for (const change of changes) {
+            const changeRange = (diffSide === 'original' ? change.originalRange : change.modifiedRange).toInclusiveRange();
+            if (changeRange) {
+                result.push({
+                    range: changeRange,
+                    options: {
+                        className: 'diff',
+                        isWholeLine: true,
+                        stickiness: browser_2.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+                    }
+                });
+            }
+            for (const rangeMapping of change.rangeMappings) {
+                const range = diffSide === 'original' ? rangeMapping.originalRange : rangeMapping.modifiedRange;
+                result.push({
+                    range,
+                    options: {
+                        className: range_utils_1.RangeUtils.isEmpty(range) ? 'diff-empty-word' : 'diff-word',
+                        showIfCollapsed: true,
+                        stickiness: browser_2.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+                    },
+                });
+            }
+        }
+        return result;
+    }
+    initContextKeys() {
+        const editor = this.editor.getControl();
+        editor.createContextKey('isMergeEditor', true);
+        editor.createContextKey('mergeEditorBaseUri', this.mergeEditor.baseUri.toString());
+        editor.createContextKey('mergeEditorResultUri', this.mergeEditor.resultUri.toString());
+    }
+    initSelectionSynchronizer() {
+        const selectionObservable = observable_1.DerivedObservable.create(() => {
+            const { selectionInBase, currentPane } = this.mergeEditor;
+            if (!selectionInBase || currentPane === this) {
+                return [];
+            }
+            return selectionInBase.map(range => this.translateBaseRange(range));
+        });
+        this.toDispose.push(observable_1.Autorun.create(() => {
+            const selection = selectionObservable.get();
+            if (selection.length) {
+                this.editor.getControl().setSelections(selection.map(({ start, end }) => new monaco_editor_core_1.Selection(start.line + 1, start.character + 1, end.line + 1, end.character + 1)));
+            }
+        }));
+    }
+    onActivateRequest(msg) {
+        super.onActivateRequest(msg);
+        this.editorWidget.activate();
+    }
+};
+exports.MergeEditorPane = MergeEditorPane;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(merge_editor_pane_header_1.MergeEditorPaneHeader),
+    tslib_1.__metadata("design:type", merge_editor_pane_header_1.MergeEditorPaneHeader)
+], MergeEditorPane.prototype, "header", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(browser_2.EditorWidget),
+    tslib_1.__metadata("design:type", browser_2.EditorWidget)
+], MergeEditorPane.prototype, "editorWidget", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(monaco_to_protocol_converter_1.MonacoToProtocolConverter),
+    tslib_1.__metadata("design:type", monaco_to_protocol_converter_1.MonacoToProtocolConverter)
+], MergeEditorPane.prototype, "m2p", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.postConstruct)(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", void 0)
+], MergeEditorPane.prototype, "init", null);
+exports.MergeEditorPane = MergeEditorPane = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__metadata("design:paramtypes", [])
+], MergeEditorPane);
+//# sourceMappingURL=merge-editor-pane.js.map

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-editor-pane.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.ts"],"names":[],"mappings":"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"}

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts

@@ -0,0 +1,16 @@
+import { EditorDecoration, Range } from '@theia/editor/lib/browser';
+import { MergeEditorPane } from './merge-editor-pane';
+import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
+import { LineRange } from '../../model/line-range';
+import { MergeRange } from '../../model/merge-range';
+export declare class MergeEditorResultPane extends MergeEditorPane {
+    constructor();
+    protected initContextKeys(): void;
+    getLineRangeForMergeRange(mergeRange: MergeRange): LineRange;
+    protected translateBaseRange(range: Range): Range;
+    protected goToNextUnhandledMergeRange(): void;
+    reset(): void;
+    protected getToolbarItems(): MergeEditorPaneToolbarItem[];
+    protected computeEditorDecorations(): EditorDecoration[];
+}
+//# sourceMappingURL=merge-editor-result-pane.d.ts.map

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-editor-result-pane.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,qBACa,qBAAsB,SAAQ,eAAe;;cAOnC,eAAe,IAAI,IAAI;IAKjC,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS;cAIlD,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;IAI1D,SAAS,CAAC,2BAA2B,IAAI,IAAI;IAK7C,KAAK,IAAI,IAAI;cAiBM,eAAe,IAAI,0BAA0B,EAAE;cA0B/C,wBAAwB,IAAI,gBAAgB,EAAE;CAmBpE"}

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js

@@ -0,0 +1,107 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 1C-Soft LLC and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MergeEditorResultPane = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+const core_1 = require("@theia/core");
+const browser_1 = require("@theia/core/lib/browser");
+const observable_1 = require("@theia/core/lib/common/observable");
+const merge_editor_pane_1 = require("./merge-editor-pane");
+let MergeEditorResultPane = class MergeEditorResultPane extends merge_editor_pane_1.MergeEditorPane {
+    constructor() {
+        super();
+        this.addClass('result');
+    }
+    initContextKeys() {
+        super.initContextKeys();
+        this.editor.getControl().createContextKey('isMergeResultEditor', true);
+    }
+    getLineRangeForMergeRange(mergeRange) {
+        return this.mergeEditor.model.getLineRangeInResult(mergeRange);
+    }
+    translateBaseRange(range) {
+        return this.mergeEditor.model.translateBaseRangeToResult(range);
+    }
+    goToNextUnhandledMergeRange() {
+        this.mergeEditor.goToNextMergeRange(mergeRange => !this.mergeEditor.model.isMergeRangeHandled(mergeRange));
+        this.mergeEditor.activate();
+    }
+    reset() {
+        new browser_1.ConfirmDialog({
+            title: core_1.nls.localize('theia/scm/mergeEditor/resetConfirmationTitle', 'Do you really want to reset the merge result in this editor?'),
+            msg: core_1.nls.localize('theia/scm/mergeEditor/resetConfirmationMessage', 'This action cannot be undone.'),
+            ok: browser_1.Dialog.YES,
+            cancel: browser_1.Dialog.NO,
+        }).open().then(async (confirmed) => {
+            if (confirmed) {
+                this.activate();
+                const { model } = this.mergeEditor;
+                await model.reset();
+                await observable_1.ObservableUtils.waitForState(model.isUpToDateObservable);
+                this.mergeEditor.goToFirstMergeRange(mergeRange => !model.isMergeRangeHandled(mergeRange));
+            }
+        }).catch(e => console.error(e));
+    }
+    getToolbarItems() {
+        const { model } = this.mergeEditor;
+        const { unhandledMergeRangesCount } = model;
+        return [
+            {
+                id: 'nextConflict',
+                label: unhandledMergeRangesCount === 1 ?
+                    core_1.nls.localizeByDefault('{0} Conflict Remaining', unhandledMergeRangesCount) :
+                    core_1.nls.localizeByDefault('{0} Conflicts Remaining ', unhandledMergeRangesCount),
+                tooltip: unhandledMergeRangesCount ?
+                    core_1.nls.localizeByDefault('Go to next conflict') :
+                    core_1.nls.localizeByDefault('All conflicts handled, the merge can be completed now.'),
+                className: browser_1.ACTION_ITEM + (unhandledMergeRangesCount ? '' : ' ' + browser_1.DISABLED_CLASS),
+                onClick: unhandledMergeRangesCount ?
+                    () => this.goToNextUnhandledMergeRange() :
+                    undefined
+            },
+            {
+                id: 'reset',
+                tooltip: core_1.nls.localizeByDefault('Reset'),
+                className: (0, browser_1.codicon)('discard', true),
+                onClick: () => this.reset()
+            }
+        ];
+    }
+    computeEditorDecorations() {
+        const result = [];
+        const { model, currentMergeRange } = this.mergeEditor;
+        for (const mergeRange of model.mergeRanges) {
+            if (mergeRange) {
+                const lineRange = model.getLineRangeInResult(mergeRange);
+                result.push(this.toMergeRangeDecoration(lineRange, {
+                    isHandled: model.isMergeRangeHandled(mergeRange),
+                    isFocused: mergeRange === currentMergeRange,
+                    isAfterEnd: lineRange.startLineNumber > model.resultDocument.lineCount,
+                }));
+            }
+        }
+        result.push(...this.toChangeDecorations(model.resultChanges, { diffSide: 'modified' }));
+        return result;
+    }
+};
+exports.MergeEditorResultPane = MergeEditorResultPane;
+exports.MergeEditorResultPane = MergeEditorResultPane = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__metadata("design:paramtypes", [])
+], MergeEditorResultPane);
+//# sourceMappingURL=merge-editor-result-pane.js.map

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-editor-result-pane.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.ts"],"names":[],"mappings":"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"}

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts

@@ -0,0 +1,27 @@
+import { LabelProvider, OpenerService } from '@theia/core/lib/browser';
+import { EditorDecoration, Range } from '@theia/editor/lib/browser';
+import { MergeRange, MergeSide } from '../../model/merge-range';
+import { MergeEditorPane } from './merge-editor-pane';
+import { MergeEditorPaneToolbarItem } from './merge-editor-pane-header';
+import { LineRange } from '../../model/line-range';
+export declare abstract class MergeEditorSidePane extends MergeEditorPane {
+    protected readonly labelProvider: LabelProvider;
+    protected readonly openerService: OpenerService;
+    abstract get mergeSide(): MergeSide;
+    constructor();
+    getLineRangeForMergeRange(mergeRange: MergeRange): LineRange;
+    protected translateBaseRange(range: Range): Range;
+    acceptAllChanges(): Promise<void>;
+    compareWithBase(): void;
+    protected getToolbarItems(): MergeEditorPaneToolbarItem[];
+    protected computeEditorDecorations(): EditorDecoration[];
+}
+export declare class MergeEditorSide1Pane extends MergeEditorSidePane {
+    readonly mergeSide = 1;
+    constructor();
+}
+export declare class MergeEditorSide2Pane extends MergeEditorSidePane {
+    readonly mergeSide = 2;
+    constructor();
+}
+//# sourceMappingURL=merge-editor-side-pane.d.ts.map

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-editor-side-pane.d.ts","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAqB,aAAa,EAAQ,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAuB,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACzF,OAAO,EAAE,UAAU,EAA2B,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,8BACsB,mBAAoB,SAAQ,eAAe;IAG7D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,QAAQ,KAAK,SAAS,IAAI,SAAS,CAAC;;IAO3B,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS;cAIlD,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;IAIpD,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC,eAAe,IAAI,IAAI;cAYJ,eAAe,IAAI,0BAA0B,EAAE;cAiB/C,wBAAwB,IAAI,gBAAgB,EAAE;CAmBpE;AAED,qBACa,oBAAqB,SAAQ,mBAAmB;IAEzD,QAAQ,CAAC,SAAS,KAAK;;CAM1B;AAED,qBACa,oBAAqB,SAAQ,mBAAmB;IAEzD,QAAQ,CAAC,SAAS,KAAK;;CAM1B"}

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js

@@ -0,0 +1,135 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 1C-Soft LLC and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MergeEditorSide2Pane = exports.MergeEditorSide1Pane = exports.MergeEditorSidePane = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+const core_1 = require("@theia/core");
+const observable_1 = require("@theia/core/lib/common/observable");
+const browser_1 = require("@theia/core/lib/browser");
+const merge_range_1 = require("../../model/merge-range");
+const merge_editor_pane_1 = require("./merge-editor-pane");
+let MergeEditorSidePane = class MergeEditorSidePane extends merge_editor_pane_1.MergeEditorPane {
+    constructor() {
+        super();
+        this.addClass('side');
+    }
+    getLineRangeForMergeRange(mergeRange) {
+        return mergeRange.getModifiedRange(this.mergeSide);
+    }
+    translateBaseRange(range) {
+        return this.mergeEditor.model.translateBaseRangeToSide(range, this.mergeSide);
+    }
+    async acceptAllChanges() {
+        const { model, resultPane } = this.mergeEditor;
+        resultPane.activate();
+        const selections = resultPane.editor.getControl().getSelections();
+        for (const mergeRange of model.mergeRanges) {
+            await observable_1.ObservableUtils.waitForState(model.isUpToDateObservable);
+            resultPane.goToMergeRange(mergeRange, { reveal: false });
+            let state = model.getMergeRangeResultState(mergeRange);
+            if (state === 'Unrecognized') {
+                state = 'Base';
+            }
+            model.applyMergeRangeAcceptedState(mergeRange, merge_range_1.MergeRangeAcceptedState.addSide(state, this.mergeSide));
+        }
+        if (selections) {
+            resultPane.editor.getControl().setSelections(selections);
+        }
+    }
+    compareWithBase() {
+        let label = this.labelProvider.getName(this.editor.uri);
+        if (label) {
+            label += ': ';
+        }
+        label += `${core_1.nls.localizeByDefault('Base')} ⟷ ${this.header.title.label}`;
+        const options = { selection: { start: this.editor.cursor } };
+        (0, browser_1.open)(this.openerService, browser_1.DiffUris.encode(this.mergeEditor.baseUri, this.editor.uri, label), options).catch(e => {
+            console.error(e);
+        });
+    }
+    getToolbarItems() {
+        return [
+            {
+                id: 'acceptAllChanges',
+                tooltip: core_1.nls.localizeByDefault(this.mergeSide === 1 ? 'Accept All Changes from Left' : 'Accept All Changes from Right'),
+                className: (0, browser_1.codicon)('check-all', true),
+                onClick: () => this.acceptAllChanges()
+            },
+            {
+                id: 'compareWithBase',
+                tooltip: core_1.nls.localizeByDefault('Compare With Base'),
+                className: (0, browser_1.codicon)('compare-changes', true),
+                onClick: () => this.compareWithBase()
+            }
+        ];
+    }
+    computeEditorDecorations() {
+        const result = [];
+        const { model, currentMergeRange } = this.mergeEditor;
+        const document = this.mergeSide === 1 ? model.side1Document : model.side2Document;
+        for (const mergeRange of model.mergeRanges) {
+            const lineRange = mergeRange.getModifiedRange(this.mergeSide);
+            result.push(this.toMergeRangeDecoration(lineRange, {
+                isHandled: model.isMergeRangeHandled(mergeRange),
+                isFocused: mergeRange === currentMergeRange,
+                isAfterEnd: lineRange.startLineNumber > document.lineCount,
+            }));
+        }
+        const changes = this.mergeSide === 1 ? model.side1Changes : model.side2Changes;
+        result.push(...this.toChangeDecorations(changes, { diffSide: 'modified' }));
+        return result;
+    }
+};
+exports.MergeEditorSidePane = MergeEditorSidePane;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(browser_1.LabelProvider),
+    tslib_1.__metadata("design:type", browser_1.LabelProvider)
+], MergeEditorSidePane.prototype, "labelProvider", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(browser_1.OpenerService),
+    tslib_1.__metadata("design:type", Object)
+], MergeEditorSidePane.prototype, "openerService", void 0);
+exports.MergeEditorSidePane = MergeEditorSidePane = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__metadata("design:paramtypes", [])
+], MergeEditorSidePane);
+let MergeEditorSide1Pane = class MergeEditorSide1Pane extends MergeEditorSidePane {
+    constructor() {
+        super();
+        this.mergeSide = 1;
+        this.addClass('side1');
+    }
+};
+exports.MergeEditorSide1Pane = MergeEditorSide1Pane;
+exports.MergeEditorSide1Pane = MergeEditorSide1Pane = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__metadata("design:paramtypes", [])
+], MergeEditorSide1Pane);
+let MergeEditorSide2Pane = class MergeEditorSide2Pane extends MergeEditorSidePane {
+    constructor() {
+        super();
+        this.mergeSide = 2;
+        this.addClass('side2');
+    }
+};
+exports.MergeEditorSide2Pane = MergeEditorSide2Pane;
+exports.MergeEditorSide2Pane = MergeEditorSide2Pane = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__metadata("design:paramtypes", [])
+], MergeEditorSide2Pane);
+//# sourceMappingURL=merge-editor-side-pane.js.map

package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-editor-side-pane.js","sourceRoot":"","sources":["../../../../../src/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.ts"],"names":[],"mappings":"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"}

package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts

@@ -0,0 +1,20 @@
+import { Disposable, DisposableCollection } from '@theia/core';
+import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
+import { MergeEditor } from '../merge-editor';
+import { DocumentLineRangeMap } from '../model/range-mapping';
+export declare class MergeEditorScrollSync implements Disposable {
+    protected readonly mergeEditor: MergeEditor;
+    protected readonly toDispose: DisposableCollection;
+    protected isSyncing: boolean;
+    constructor(mergeEditor: MergeEditor);
+    dispose(): void;
+    storeScrollState(): unknown;
+    restoreScrollState(state: unknown): void;
+    update(): void;
+    protected handleSide1ScrollTopChanged(scrollTop: number): void;
+    protected handleSide2ScrollTopChanged(scrollTop: number): void;
+    protected handleResultScrollTopChanged(scrollTop: number): void;
+    protected handleBaseScrollTopChanged(scrollTop: number): void;
+    protected computeTargetScrollTop(sourceEditor: MonacoEditor, targetEditor: MonacoEditor, lineRangeMap: DocumentLineRangeMap): number;
+}
+//# sourceMappingURL=merge-editor-scroll-sync.d.ts.map

package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-editor-scroll-sync.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-editor-scroll-sync.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,qBAAa,qBAAsB,YAAW,UAAU;IAKxC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAHvD,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAC1D,SAAS,CAAC,SAAS,UAAS;gBAEG,WAAW,EAAE,WAAW;IA4DvD,OAAO,IAAI,IAAI;IAIf,gBAAgB,IAAI,OAAO;IAI3B,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAWxC,MAAM,IAAI,IAAI;IAad,SAAS,CAAC,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAoB9D,SAAS,CAAC,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAoB9D,SAAS,CAAC,4BAA4B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAqB/D,SAAS,CAAC,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAqB7D,SAAS,CAAC,sBAAsB,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,oBAAoB,GAAG,MAAM;CAmCvI"}