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

package/lib/browser/merge-editor/view/merge-editor-scroll-sync.js

@@ -0,0 +1,218 @@
+"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
+// *****************************************************************************
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// copied and modified from https://github.com/microsoft/vscode/blob/1.96.3/src/vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer.ts
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MergeEditorScrollSync = void 0;
+const core_1 = require("@theia/core");
+class MergeEditorScrollSync {
+    constructor(mergeEditor) {
+        this.mergeEditor = mergeEditor;
+        this.toDispose = new core_1.DisposableCollection();
+        this.isSyncing = false;
+        const { side1Pane, side2Pane, resultPane, basePane } = mergeEditor;
+        const syncingHandler = (handler) => (event) => {
+            if (this.isSyncing) {
+                return;
+            }
+            this.isSyncing = true;
+            try {
+                handler(event);
+            }
+            finally {
+                this.isSyncing = false;
+            }
+        };
+        this.toDispose.push(side1Pane.editor.getControl().onDidScrollChange(syncingHandler(event => {
+            if (event.scrollTopChanged) {
+                this.handleSide1ScrollTopChanged(event.scrollTop);
+            }
+            if (event.scrollLeftChanged) {
+                basePane.editor.getControl().setScrollLeft(event.scrollLeft);
+                side2Pane.editor.getControl().setScrollLeft(event.scrollLeft);
+                resultPane.editor.getControl().setScrollLeft(event.scrollLeft);
+            }
+        })));
+        this.toDispose.push(side2Pane.editor.getControl().onDidScrollChange(syncingHandler(event => {
+            if (event.scrollTopChanged) {
+                this.handleSide2ScrollTopChanged(event.scrollTop);
+            }
+            if (event.scrollLeftChanged) {
+                basePane.editor.getControl().setScrollLeft(event.scrollLeft);
+                side1Pane.editor.getControl().setScrollLeft(event.scrollLeft);
+                resultPane.editor.getControl().setScrollLeft(event.scrollLeft);
+            }
+        })));
+        this.toDispose.push(resultPane.editor.getControl().onDidScrollChange(syncingHandler(event => {
+            if (event.scrollTopChanged) {
+                this.handleResultScrollTopChanged(event.scrollTop);
+            }
+            if (event.scrollLeftChanged) {
+                basePane.editor.getControl().setScrollLeft(event.scrollLeft);
+                side1Pane.editor.getControl().setScrollLeft(event.scrollLeft);
+                side2Pane.editor.getControl().setScrollLeft(event.scrollLeft);
+            }
+        })));
+        this.toDispose.push(basePane.editor.getControl().onDidScrollChange(syncingHandler(event => {
+            if (event.scrollTopChanged) {
+                this.handleBaseScrollTopChanged(event.scrollTop);
+            }
+            if (event.scrollLeftChanged) {
+                side1Pane.editor.getControl().setScrollLeft(event.scrollLeft);
+                side2Pane.editor.getControl().setScrollLeft(event.scrollLeft);
+                resultPane.editor.getControl().setScrollLeft(event.scrollLeft);
+            }
+        })));
+    }
+    dispose() {
+        this.toDispose.dispose();
+    }
+    storeScrollState() {
+        return this.mergeEditor.side1Pane.editor.getControl().getScrollTop();
+    }
+    restoreScrollState(state) {
+        if (typeof state === 'number') {
+            const scrollTop = this.mergeEditor.side1Pane.editor.getControl().getScrollTop();
+            if (state !== scrollTop) {
+                this.mergeEditor.side1Pane.editor.getControl().setScrollTop(state);
+            }
+            else {
+                this.update();
+            }
+        }
+    }
+    update() {
+        if (this.isSyncing) {
+            return;
+        }
+        this.isSyncing = true;
+        try {
+            const scrollTop = this.mergeEditor.side1Pane.editor.getControl().getScrollTop();
+            this.handleSide1ScrollTopChanged(scrollTop);
+        }
+        finally {
+            this.isSyncing = false;
+        }
+    }
+    handleSide1ScrollTopChanged(scrollTop) {
+        const { side1Pane, side2Pane, resultPane, basePane, shouldAlignBase, shouldAlignResult, model } = this.mergeEditor;
+        side2Pane.editor.getControl().setScrollTop(scrollTop);
+        if (shouldAlignResult) {
+            resultPane.editor.getControl().setScrollTop(scrollTop);
+        }
+        else {
+            const targetScrollTop = this.computeTargetScrollTop(side1Pane.editor, resultPane.editor, model.side1ToResultLineRangeMap);
+            resultPane.editor.getControl().setScrollTop(targetScrollTop);
+        }
+        if (shouldAlignBase) {
+            basePane.editor.getControl().setScrollTop(scrollTop);
+        }
+        else {
+            const targetScrollTop = this.computeTargetScrollTop(side1Pane.editor, basePane.editor, model.side1ToBaseLineRangeMap);
+            basePane.editor.getControl().setScrollTop(targetScrollTop);
+        }
+    }
+    handleSide2ScrollTopChanged(scrollTop) {
+        const { side1Pane, side2Pane, resultPane, basePane, shouldAlignBase, shouldAlignResult, model } = this.mergeEditor;
+        side1Pane.editor.getControl().setScrollTop(scrollTop);
+        if (shouldAlignResult) {
+            resultPane.editor.getControl().setScrollTop(scrollTop);
+        }
+        else {
+            const targetScrollTop = this.computeTargetScrollTop(side2Pane.editor, resultPane.editor, model.side2ToResultLineRangeMap);
+            resultPane.editor.getControl().setScrollTop(targetScrollTop);
+        }
+        if (shouldAlignBase) {
+            basePane.editor.getControl().setScrollTop(scrollTop);
+        }
+        else {
+            const targetScrollTop = this.computeTargetScrollTop(side2Pane.editor, basePane.editor, model.side2ToBaseLineRangeMap);
+            basePane.editor.getControl().setScrollTop(targetScrollTop);
+        }
+    }
+    handleResultScrollTopChanged(scrollTop) {
+        const { side1Pane, side2Pane, resultPane, basePane, shouldAlignBase, shouldAlignResult, model } = this.mergeEditor;
+        if (shouldAlignResult) {
+            side1Pane.editor.getControl().setScrollTop(scrollTop);
+            side2Pane.editor.getControl().setScrollTop(scrollTop);
+        }
+        else {
+            const targetScrollTop = this.computeTargetScrollTop(resultPane.editor, side1Pane.editor, model.resultToSide1LineRangeMap);
+            side1Pane.editor.getControl().setScrollTop(targetScrollTop);
+            side2Pane.editor.getControl().setScrollTop(targetScrollTop);
+            if (shouldAlignBase) {
+                basePane.editor.getControl().setScrollTop(targetScrollTop);
+            }
+        }
+        if (!shouldAlignBase) {
+            const targetScrollTop = this.computeTargetScrollTop(resultPane.editor, basePane.editor, model.resultToBaseLineRangeMap);
+            basePane.editor.getControl().setScrollTop(targetScrollTop);
+        }
+    }
+    handleBaseScrollTopChanged(scrollTop) {
+        const { side1Pane, side2Pane, resultPane, basePane, shouldAlignBase, shouldAlignResult, model } = this.mergeEditor;
+        if (shouldAlignBase) {
+            side1Pane.editor.getControl().setScrollTop(scrollTop);
+            side2Pane.editor.getControl().setScrollTop(scrollTop);
+        }
+        else {
+            const targetScrollTop = this.computeTargetScrollTop(basePane.editor, side1Pane.editor, model.baseToSide1LineRangeMap);
+            side1Pane.editor.getControl().setScrollTop(targetScrollTop);
+            side2Pane.editor.getControl().setScrollTop(targetScrollTop);
+            if (shouldAlignResult) {
+                resultPane.editor.getControl().setScrollTop(targetScrollTop);
+            }
+        }
+        if (!shouldAlignResult) {
+            const targetScrollTop = this.computeTargetScrollTop(basePane.editor, resultPane.editor, model.baseToResultLineRangeMap);
+            resultPane.editor.getControl().setScrollTop(targetScrollTop);
+        }
+    }
+    computeTargetScrollTop(sourceEditor, targetEditor, lineRangeMap) {
+        const visibleRanges = sourceEditor.getVisibleRanges();
+        if (visibleRanges.length === 0) {
+            return 0;
+        }
+        const topLineNumber = visibleRanges[0].start.line;
+        const scrollTop = sourceEditor.getControl().getScrollTop();
+        let sourceStartTopPx;
+        let sourceEndPx;
+        let targetStartTopPx;
+        let targetEndPx;
+        if (topLineNumber === 0 && scrollTop <= sourceEditor.getControl().getTopForLineNumber(1)) { // special case: scrollTop is before or at the top of the first line
+            sourceStartTopPx = 0;
+            sourceEndPx = sourceEditor.getControl().getTopForLineNumber(1);
+            targetStartTopPx = 0;
+            targetEndPx = targetEditor.getControl().getTopForLineNumber(1);
+        }
+        else {
+            const { originalRange: sourceRange, modifiedRange: targetRange } = lineRangeMap.projectLine(Math.max(topLineNumber - 1, 0));
+            sourceStartTopPx = sourceEditor.getControl().getTopForLineNumber(sourceRange.startLineNumber + 1);
+            sourceEndPx = sourceEditor.getControl().getTopForLineNumber(sourceRange.endLineNumberExclusive + 1);
+            targetStartTopPx = targetEditor.getControl().getTopForLineNumber(targetRange.startLineNumber + 1);
+            targetEndPx = targetEditor.getControl().getTopForLineNumber(targetRange.endLineNumberExclusive + 1);
+        }
+        const factor = Math.min(sourceEndPx === sourceStartTopPx ? 0 : (scrollTop - sourceStartTopPx) / (sourceEndPx - sourceStartTopPx), 1);
+        const targetScrollTop = targetStartTopPx + (targetEndPx - targetStartTopPx) * factor;
+        return targetScrollTop;
+    }
+}
+exports.MergeEditorScrollSync = MergeEditorScrollSync;
+//# sourceMappingURL=merge-editor-scroll-sync.js.map

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

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

package/lib/browser/merge-editor/view/merge-editor-view-zones.d.ts

@@ -0,0 +1,57 @@
+import { Disposable } from '@theia/core';
+import { Observable } from '@theia/core/lib/common/observable';
+import { MonacoEditorViewZone } from '@theia/monaco/lib/browser/monaco-editor-zone-widget';
+import { MergeEditor } from '../merge-editor';
+import { MergeRange } from '../model/merge-range';
+import { MergeRangeAction, MergeRangeActions } from './merge-range-actions';
+import { MergeEditorPane } from './merge-editor-panes';
+import { DiffSpacerService } from './diff-spacers';
+export interface MergeEditorViewZone {
+    create(ctx: MergeEditorViewZone.CreationContext): void;
+}
+export declare namespace MergeEditorViewZone {
+    interface CreationContext {
+        createViewZone(viewZone: Omit<MonacoEditorViewZone, 'id'>): void;
+        register(disposable: Disposable): void;
+    }
+}
+export interface MergeEditorViewZones {
+    readonly baseViewZones: readonly MergeEditorViewZone[];
+    readonly side1ViewZones: readonly MergeEditorViewZone[];
+    readonly side2ViewZones: readonly MergeEditorViewZone[];
+    readonly resultViewZones: readonly MergeEditorViewZone[];
+}
+export declare class MergeEditorViewZoneComputer {
+    protected readonly diffSpacerService: DiffSpacerService;
+    computeViewZones(mergeEditor: MergeEditor): MergeEditorViewZones;
+    protected createSpacerZones(spacers: number[], viewZones: MergeEditorViewZone[]): void;
+    protected newMergeRangeActions(mergeEditor: MergeEditor, mergeRange: MergeRange): MergeRangeActions;
+    protected getActionZoneMinHeight(pane: MergeEditorPane): number;
+    protected newActionZone(pane: MergeEditorPane, actions: Observable<readonly MergeRangeAction[]>, afterLineNumber: number, heightInPx: number): MergeEditorViewZone;
+    protected newActionZonePlaceholder(afterLineNumber: number, heightInPx: number): MergeEditorViewZone;
+    protected newSpacerZone(afterLineNumber: number, heightInLines: number): MergeEditorViewZone;
+}
+export declare class MergeEditorActionZone implements MergeEditorViewZone {
+    protected readonly pane: MergeEditorPane;
+    protected readonly actionsObservable: Observable<readonly MergeRangeAction[]>;
+    protected readonly afterLineNumber: number;
+    protected readonly heightInPx: number;
+    protected static counter: number;
+    constructor(pane: MergeEditorPane, actionsObservable: Observable<readonly MergeRangeAction[]>, afterLineNumber: number, heightInPx: number);
+    create(ctx: MergeEditorViewZone.CreationContext): void;
+    protected renderActions(parent: HTMLElement, actions: readonly MergeRangeAction[]): void;
+    protected getActionTitle(action: MergeRangeAction): string;
+}
+export declare class MergeEditorActionZonePlaceholder implements MergeEditorViewZone {
+    protected readonly afterLineNumber: number;
+    protected readonly heightInPx: number;
+    constructor(afterLineNumber: number, heightInPx: number);
+    create(ctx: MergeEditorViewZone.CreationContext): void;
+}
+export declare class MergeEditorSpacerZone implements MergeEditorViewZone {
+    protected readonly afterLineNumber: number;
+    protected readonly heightInLines: number;
+    constructor(afterLineNumber: number, heightInLines: number);
+    create(ctx: MergeEditorViewZone.CreationContext): void;
+}
+//# sourceMappingURL=merge-editor-view-zones.d.ts.map

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

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

package/lib/browser/merge-editor/view/merge-editor-view-zones.js

@@ -0,0 +1,218 @@
+"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.MergeEditorSpacerZone = exports.MergeEditorActionZonePlaceholder = exports.MergeEditorActionZone = exports.MergeEditorViewZoneComputer = 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 monaco = require("@theia/monaco-editor-core");
+const merge_range_actions_1 = require("./merge-range-actions");
+const diff_spacers_1 = require("./diff-spacers");
+let MergeEditorViewZoneComputer = class MergeEditorViewZoneComputer {
+    computeViewZones(mergeEditor) {
+        const baseViewZones = [];
+        const side1ViewZones = [];
+        const side2ViewZones = [];
+        const resultViewZones = [];
+        const { model, shouldAlignResult, shouldAlignBase } = mergeEditor;
+        for (const mergeRange of model.mergeRanges) {
+            const { side1Pane, side2Pane, resultPane } = mergeEditor;
+            const actions = this.newMergeRangeActions(mergeEditor, mergeRange);
+            let resultActionZoneHeight = this.getActionZoneMinHeight(resultPane);
+            if (actions.hasSideActions || (shouldAlignResult && actions.hasResultActions)) {
+                let actionZoneHeight = Math.max(this.getActionZoneMinHeight(side1Pane), this.getActionZoneMinHeight(side2Pane));
+                if (shouldAlignResult) {
+                    resultActionZoneHeight = actionZoneHeight = Math.max(actionZoneHeight, resultActionZoneHeight);
+                }
+                side1ViewZones.push(this.newActionZone(side1Pane, actions.side1ActionsObservable, mergeRange.side1Range.startLineNumber - 1, actionZoneHeight));
+                side2ViewZones.push(this.newActionZone(side2Pane, actions.side2ActionsObservable, mergeRange.side2Range.startLineNumber - 1, actionZoneHeight));
+                if (shouldAlignBase) {
+                    baseViewZones.push(this.newActionZonePlaceholder(mergeRange.baseRange.startLineNumber - 1, actionZoneHeight));
+                }
+            }
+            if (actions.hasResultActions) {
+                resultViewZones.push(this.newActionZone(resultPane, actions.resultActionsObservable, model.getLineRangeInResult(mergeRange).startLineNumber - 1, resultActionZoneHeight));
+            }
+            else if (shouldAlignResult && actions.hasSideActions) {
+                resultViewZones.push(this.newActionZonePlaceholder(model.getLineRangeInResult(mergeRange).startLineNumber - 1, resultActionZoneHeight));
+            }
+        }
+        const baseLineCount = model.baseDocument.lineCount;
+        const multiDiffSpacers = [];
+        multiDiffSpacers.push(this.diffSpacerService.computeDiffSpacers(model.side1Changes, baseLineCount));
+        multiDiffSpacers.push(this.diffSpacerService.computeDiffSpacers(model.side2Changes, baseLineCount));
+        if (shouldAlignResult) {
+            multiDiffSpacers.push(this.diffSpacerService.computeDiffSpacers(model.resultChanges, baseLineCount));
+        }
+        const combinedMultiDiffSpacers = this.diffSpacerService.combineMultiDiffSpacers(multiDiffSpacers);
+        if (shouldAlignBase) {
+            this.createSpacerZones(combinedMultiDiffSpacers.originalSpacers, baseViewZones);
+        }
+        const { modifiedSides } = shouldAlignBase ? combinedMultiDiffSpacers : this.diffSpacerService.excludeOriginalSide(combinedMultiDiffSpacers);
+        this.createSpacerZones(modifiedSides[0].modifiedSpacers, side1ViewZones);
+        this.createSpacerZones(modifiedSides[1].modifiedSpacers, side2ViewZones);
+        if (shouldAlignResult) {
+            this.createSpacerZones(modifiedSides[2].modifiedSpacers, resultViewZones);
+        }
+        return { baseViewZones, side1ViewZones, side2ViewZones, resultViewZones };
+    }
+    createSpacerZones(spacers, viewZones) {
+        const lineNumbers = Object.keys(spacers).map(Number); // note: spacers is a sparse array
+        for (const lineNumber of lineNumbers) {
+            const heightInLines = spacers[lineNumber];
+            if (heightInLines) {
+                viewZones.push(this.newSpacerZone(lineNumber - 1, heightInLines));
+            }
+        }
+    }
+    newMergeRangeActions(mergeEditor, mergeRange) {
+        return new merge_range_actions_1.MergeRangeActions(mergeEditor, mergeRange);
+    }
+    getActionZoneMinHeight(pane) {
+        return pane.editor.getControl().getOption(monaco.editor.EditorOption.lineHeight);
+    }
+    newActionZone(pane, actions, afterLineNumber, heightInPx) {
+        return new MergeEditorActionZone(pane, actions, afterLineNumber, heightInPx);
+    }
+    newActionZonePlaceholder(afterLineNumber, heightInPx) {
+        return new MergeEditorActionZonePlaceholder(afterLineNumber, heightInPx);
+    }
+    newSpacerZone(afterLineNumber, heightInLines) {
+        return new MergeEditorSpacerZone(afterLineNumber, heightInLines);
+    }
+};
+exports.MergeEditorViewZoneComputer = MergeEditorViewZoneComputer;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(diff_spacers_1.DiffSpacerService),
+    tslib_1.__metadata("design:type", diff_spacers_1.DiffSpacerService)
+], MergeEditorViewZoneComputer.prototype, "diffSpacerService", void 0);
+exports.MergeEditorViewZoneComputer = MergeEditorViewZoneComputer = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], MergeEditorViewZoneComputer);
+class MergeEditorActionZone {
+    constructor(pane, actionsObservable, afterLineNumber, heightInPx) {
+        this.pane = pane;
+        this.actionsObservable = actionsObservable;
+        this.afterLineNumber = afterLineNumber;
+        this.heightInPx = heightInPx;
+    }
+    create(ctx) {
+        const overlayWidgetNode = document.createElement('div');
+        overlayWidgetNode.className = 'action-zone';
+        ctx.createViewZone({
+            domNode: document.createElement('div'),
+            afterLineNumber: this.afterLineNumber + 1, // + 1, since line numbers in Monaco are 1-based
+            heightInPx: this.heightInPx,
+            onComputedHeight: height => overlayWidgetNode.style.height = `${height}px`,
+            onDomNodeTop: top => overlayWidgetNode.style.top = `${top}px`
+        });
+        const editor = this.pane.editor.getControl();
+        const setLeftPosition = () => overlayWidgetNode.style.left = editor.getLayoutInfo().contentLeft + 'px';
+        setLeftPosition();
+        ctx.register(editor.onDidLayoutChange(setLeftPosition));
+        const overlayWidgetId = `mergeEditorActionZone${MergeEditorActionZone.counter++}`;
+        const overlayWidget = {
+            getId: () => overlayWidgetId,
+            getDomNode: () => overlayWidgetNode,
+            // eslint-disable-next-line no-null/no-null
+            getPosition: () => null
+        };
+        editor.addOverlayWidget(overlayWidget);
+        ctx.register(core_1.Disposable.create(() => {
+            editor.removeOverlayWidget(overlayWidget);
+        }));
+        const actionContainer = document.createElement('div');
+        actionContainer.className = 'codelens-decoration';
+        overlayWidgetNode.appendChild(actionContainer);
+        ctx.register(observable_1.Autorun.create(() => this.renderActions(actionContainer, this.actionsObservable.get())));
+    }
+    ;
+    renderActions(parent, actions) {
+        const children = [];
+        let isFirst = true;
+        for (const action of actions) {
+            if (isFirst) {
+                isFirst = false;
+            }
+            else {
+                const actionSeparator = document.createElement('span');
+                actionSeparator.append('\u00a0|\u00a0');
+                children.push(actionSeparator);
+            }
+            const title = this.getActionTitle(action);
+            if (action.run) {
+                const actionLink = document.createElement('a');
+                actionLink.role = 'button';
+                actionLink.onclick = () => action.run();
+                if (action.tooltip) {
+                    actionLink.title = action.tooltip;
+                }
+                actionLink.append(title);
+                children.push(actionLink);
+            }
+            else {
+                const actionLabel = document.createElement('span');
+                if (action.tooltip) {
+                    actionLabel.title = action.tooltip;
+                }
+                actionLabel.append(title);
+                children.push(actionLabel);
+            }
+        }
+        parent.innerText = ''; // reset children
+        parent.append(...children);
+    }
+    getActionTitle(action) {
+        return action.text;
+    }
+}
+exports.MergeEditorActionZone = MergeEditorActionZone;
+MergeEditorActionZone.counter = 0;
+class MergeEditorActionZonePlaceholder {
+    constructor(afterLineNumber, heightInPx) {
+        this.afterLineNumber = afterLineNumber;
+        this.heightInPx = heightInPx;
+    }
+    create(ctx) {
+        const domNode = document.createElement('div');
+        domNode.className = 'action-zone-placeholder';
+        ctx.createViewZone({
+            afterLineNumber: this.afterLineNumber + 1, // + 1, since line numbers in Monaco are 1-based
+            heightInPx: this.heightInPx,
+            domNode
+        });
+    }
+}
+exports.MergeEditorActionZonePlaceholder = MergeEditorActionZonePlaceholder;
+class MergeEditorSpacerZone {
+    constructor(afterLineNumber, heightInLines) {
+        this.afterLineNumber = afterLineNumber;
+        this.heightInLines = heightInLines;
+    }
+    create(ctx) {
+        const domNode = document.createElement('div');
+        domNode.className = 'diagonal-fill';
+        ctx.createViewZone({
+            afterLineNumber: this.afterLineNumber + 1, // + 1, since line numbers in Monaco are 1-based
+            heightInLines: this.heightInLines,
+            domNode
+        });
+    }
+}
+exports.MergeEditorSpacerZone = MergeEditorSpacerZone;
+//# sourceMappingURL=merge-editor-view-zones.js.map

package/lib/browser/merge-editor/view/merge-editor-view-zones.js.map

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

package/lib/browser/merge-editor/view/merge-range-actions.d.ts

@@ -0,0 +1,23 @@
+import { MergeRange, MergeRangeAcceptedState, MergeSide } from '../model/merge-range';
+import { MergeEditor } from '../merge-editor';
+export interface MergeRangeAction {
+    readonly text: string;
+    readonly tooltip?: string;
+    run?(): unknown;
+}
+export declare class MergeRangeActions {
+    protected readonly mergeEditor: MergeEditor;
+    protected readonly mergeRange: MergeRange;
+    readonly side1ActionsObservable: import("@theia/core/lib/common/observable").Observable<readonly MergeRangeAction[], void>;
+    readonly side2ActionsObservable: import("@theia/core/lib/common/observable").Observable<readonly MergeRangeAction[], void>;
+    readonly resultActionsObservable: import("@theia/core/lib/common/observable").Observable<readonly MergeRangeAction[], void>;
+    protected readonly hasSideActionsObservable: import("@theia/core/lib/common/observable").Observable<boolean, void>;
+    get hasSideActions(): boolean;
+    protected readonly hasResultActionsObservable: import("@theia/core/lib/common/observable").Observable<boolean, void>;
+    get hasResultActions(): boolean;
+    constructor(mergeEditor: MergeEditor, mergeRange: MergeRange);
+    protected getActionsForSide(side: MergeSide): readonly MergeRangeAction[];
+    protected getResultActions(): readonly MergeRangeAction[];
+    protected applyMergeRangeAcceptedState(mergeRange: MergeRange, state: MergeRangeAcceptedState): Promise<void>;
+}
+//# sourceMappingURL=merge-range-actions.d.ts.map

package/lib/browser/merge-editor/view/merge-range-actions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-range-actions.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/merge-range-actions.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,GAAG,CAAC,IAAI,OAAO,CAAC;CACnB;AAED,qBAAa,iBAAiB;IAatB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAC3C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU;IAZ7C,QAAQ,CAAC,sBAAsB,4FAA6D;IAC5F,QAAQ,CAAC,sBAAsB,4FAA6D;IAC5F,QAAQ,CAAC,uBAAuB,4FAA2D;IAE3F,SAAS,CAAC,QAAQ,CAAC,wBAAwB,wEAA2H;IACtK,IAAI,cAAc,IAAI,OAAO,CAAgD;IAE7E,SAAS,CAAC,QAAQ,CAAC,0BAA0B,wEAAiF;IAC9H,IAAI,gBAAgB,IAAI,OAAO,CAAkD;gBAG1D,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU;IAG7C,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS,gBAAgB,EAAE;IAmCzE,SAAS,CAAC,gBAAgB,IAAI,SAAS,gBAAgB,EAAE;cAiEzC,4BAA4B,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAStH"}