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

package/lib/browser/merge-editor/model/merge-editor-model.js

@@ -0,0 +1,507 @@
+"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/model/mergeEditorModel.ts,
+// https://github.com/microsoft/vscode/blob/1.96.3/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MergeRangeData = exports.MergeEditorModel = exports.MergeEditorModelProps = 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 diff_1 = require("@theia/core/lib/common/diff");
+const monaco_to_protocol_converter_1 = require("@theia/monaco/lib/browser/monaco-to-protocol-converter");
+const merge_range_1 = require("./merge-range");
+const range_mapping_1 = require("./range-mapping");
+const live_diff_1 = require("./live-diff");
+const line_range_1 = require("./line-range");
+const range_editing_1 = require("./range-editing");
+exports.MergeEditorModelProps = Symbol('MergeEditorModelProps');
+let MergeEditorModel = class MergeEditorModel {
+    constructor() {
+        this.toDispose = new core_1.DisposableCollection();
+        this.shouldRecomputeHandledState = true;
+        this.mergeRangesObservable = observable_1.DerivedObservable.create(() => this.computeMergeRanges());
+        this.mergeRangesDataObservable = observable_1.DerivedObservable.create(() => new Map(this.mergeRanges.map(mergeRange => [mergeRange, this.newMergeRangeData()])));
+        // #region Line Range Mapping
+        this.side1ToResultLineRangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentLineRangeMap(this.computeSideToResultDiff(this.side1Changes, this.resultChanges)));
+        this.resultToSide1LineRangeMapObservable = observable_1.DerivedObservable.create(() => this.side1ToResultLineRangeMap.reverse());
+        this.side2ToResultLineRangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentLineRangeMap(this.computeSideToResultDiff(this.side2Changes, this.resultChanges)));
+        this.resultToSide2LineRangeMapObservable = observable_1.DerivedObservable.create(() => this.side2ToResultLineRangeMap.reverse());
+        this.baseToSide1LineRangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentLineRangeMap(this.side1Changes));
+        this.side1ToBaseLineRangeMapObservable = observable_1.DerivedObservable.create(() => this.baseToSide1LineRangeMap.reverse());
+        this.baseToSide2LineRangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentLineRangeMap(this.side2Changes));
+        this.side2ToBaseLineRangeMapObservable = observable_1.DerivedObservable.create(() => this.baseToSide2LineRangeMap.reverse());
+        this.baseToResultLineRangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentLineRangeMap(this.resultChanges));
+        this.resultToBaseLineRangeMapObservable = observable_1.DerivedObservable.create(() => this.baseToResultLineRangeMap.reverse());
+        // #endregion
+        // #region Range Mapping
+        this.baseToSide1RangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentRangeMap(this.side1Changes.flatMap(change => change.rangeMappings)));
+        this.side1ToBaseRangeMapObservable = observable_1.DerivedObservable.create(() => this.baseToSide1RangeMap.reverse());
+        this.baseToSide2RangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentRangeMap(this.side2Changes.flatMap(change => change.rangeMappings)));
+        this.side2ToBaseRangeMapObservable = observable_1.DerivedObservable.create(() => this.baseToSide2RangeMap.reverse());
+        this.baseToResultRangeMapObservable = observable_1.DerivedObservable.create(() => this.newDocumentRangeMap(this.resultChanges.flatMap(change => change.rangeMappings)));
+        this.resultToBaseRangeMapObservable = observable_1.DerivedObservable.create(() => this.baseToResultRangeMap.reverse());
+        // #endregion
+        this.diffComputingStateObservable = observable_1.DerivedObservable.create(() => this.getDiffComputingState(this.side1LiveDiff, this.side2LiveDiff, this.resultLiveDiff));
+        this.diffComputingStateForSidesObservable = observable_1.DerivedObservable.create(() => this.getDiffComputingState(this.side1LiveDiff, this.side2LiveDiff));
+        this.isUpToDateObservable = observable_1.DerivedObservable.create(() => this.diffComputingStateObservable.get() === 1 /* DiffComputingState.UpToDate */);
+        this.unhandledMergeRangesCountObservable = observable_1.DerivedObservable.create(() => {
+            let result = 0;
+            const mergeRangesData = this.mergeRangesDataObservable.get();
+            for (const mergeRangeData of mergeRangesData.values()) {
+                if (!mergeRangeData.isHandledObservable.get()) {
+                    result++;
+                }
+            }
+            return result;
+        });
+    }
+    get mergeRanges() {
+        return this.mergeRangesObservable.get();
+    }
+    get side1ToResultLineRangeMap() {
+        return this.side1ToResultLineRangeMapObservable.get();
+    }
+    get resultToSide1LineRangeMap() {
+        return this.resultToSide1LineRangeMapObservable.get();
+    }
+    get side2ToResultLineRangeMap() {
+        return this.side2ToResultLineRangeMapObservable.get();
+    }
+    get resultToSide2LineRangeMap() {
+        return this.resultToSide2LineRangeMapObservable.get();
+    }
+    get baseToSide1LineRangeMap() {
+        return this.baseToSide1LineRangeMapObservable.get();
+    }
+    get side1ToBaseLineRangeMap() {
+        return this.side1ToBaseLineRangeMapObservable.get();
+    }
+    get baseToSide2LineRangeMap() {
+        return this.baseToSide2LineRangeMapObservable.get();
+    }
+    get side2ToBaseLineRangeMap() {
+        return this.side2ToBaseLineRangeMapObservable.get();
+    }
+    get baseToResultLineRangeMap() {
+        return this.baseToResultLineRangeMapObservable.get();
+    }
+    get resultToBaseLineRangeMap() {
+        return this.resultToBaseLineRangeMapObservable.get();
+    }
+    get baseToSide1RangeMap() {
+        return this.baseToSide1RangeMapObservable.get();
+    }
+    get side1ToBaseRangeMap() {
+        return this.side1ToBaseRangeMapObservable.get();
+    }
+    get baseToSide2RangeMap() {
+        return this.baseToSide2RangeMapObservable.get();
+    }
+    get side2ToBaseRangeMap() {
+        return this.side2ToBaseRangeMapObservable.get();
+    }
+    get baseToResultRangeMap() {
+        return this.baseToResultRangeMapObservable.get();
+    }
+    get resultToBaseRangeMap() {
+        return this.resultToBaseRangeMapObservable.get();
+    }
+    get unhandledMergeRangesCount() {
+        return this.unhandledMergeRangesCountObservable.get();
+    }
+    get onInitialized() {
+        return this._onInitialized;
+    }
+    get baseDocument() {
+        return this.props.baseEditor.document;
+    }
+    get side1Document() {
+        return this.props.side1Editor.document;
+    }
+    get side2Document() {
+        return this.props.side2Editor.document;
+    }
+    get resultDocument() {
+        return this.props.resultEditor.document;
+    }
+    get resultEditor() {
+        return this.props.resultEditor;
+    }
+    get side1Changes() {
+        return this.side1LiveDiff.changes;
+    }
+    get side2Changes() {
+        return this.side2LiveDiff.changes;
+    }
+    get resultChanges() {
+        return this.resultLiveDiff.changes;
+    }
+    init() {
+        this.toDispose.push(this.side1LiveDiff = this.newLiveDiff(this.baseDocument, this.side1Document));
+        this.toDispose.push(this.side2LiveDiff = this.newLiveDiff(this.baseDocument, this.side2Document));
+        this.toDispose.push(this.resultLiveDiff = this.newLiveDiff(this.baseDocument, this.resultDocument));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.mergeRangesDataObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.side1ToResultLineRangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.resultToSide1LineRangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.side2ToResultLineRangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.resultToSide2LineRangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.baseToSide1LineRangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.side1ToBaseLineRangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.baseToSide2LineRangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.side2ToBaseLineRangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.baseToResultLineRangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.resultToBaseLineRangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.baseToSide1RangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.side1ToBaseRangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.baseToSide2RangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.side2ToBaseRangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.baseToResultRangeMapObservable));
+        this.toDispose.push(observable_1.Observable.keepObserved(this.resultToBaseRangeMapObservable));
+        const initializePromise = this.doInit();
+        this._onInitialized = observable_1.ObservableUtils.waitForState(this.isUpToDateObservable).then(() => initializePromise);
+        initializePromise.then(() => {
+            this.toDispose.push(observable_1.Autorun.create(() => {
+                if (!this.isUpToDateObservable.get()) {
+                    return;
+                }
+                observable_1.Observable.update(() => {
+                    const mergeRangesData = this.mergeRangesDataObservable.get();
+                    for (const [mergeRange, mergeRangeData] of mergeRangesData) {
+                        const state = this.computeMergeRangeStateFromResult(mergeRange);
+                        mergeRangeData.resultStateObservable.set(state);
+                        if (this.shouldRecomputeHandledState) {
+                            mergeRangeData.isHandledObservable.set(state !== 'Base');
+                        }
+                    }
+                    this.shouldRecomputeHandledState = false;
+                });
+            }, {
+                willHandleChange: ctx => {
+                    if (ctx.isChangeOf(this.mergeRangesDataObservable)) {
+                        this.shouldRecomputeHandledState = true;
+                    }
+                    return true;
+                }
+            }));
+            const attachedHistory = new AttachedHistory(this.resultDocument);
+            this.toDispose.push(attachedHistory);
+            this.toDispose.push(this.resultDocument.textEditorModel.onDidChangeContent(event => {
+                if (event.isRedoing || event.isUndoing) {
+                    return;
+                }
+                // Mark merge ranges affected by content changes as handled.
+                const mergeRanges = [];
+                for (const change of event.changes) {
+                    const { start, end } = this.translateResultRangeToBase(this.m2p.asRange(change.range));
+                    const affectedMergeRanges = this.findMergeRanges(new line_range_1.LineRange(start.line, end.line - start.line));
+                    for (const mergeRange of affectedMergeRanges) {
+                        if (!this.isMergeRangeHandled(mergeRange)) {
+                            mergeRanges.push(mergeRange);
+                        }
+                    }
+                }
+                if (mergeRanges.length === 0) {
+                    return;
+                }
+                const markMergeRangesAsHandled = (handled) => {
+                    observable_1.Observable.update(() => {
+                        const mergeRangesData = this.mergeRangesDataObservable.get();
+                        for (const mergeRange of mergeRanges) {
+                            const mergeRangeData = mergeRangesData.get(mergeRange);
+                            if (mergeRangeData) {
+                                mergeRangeData.isHandledObservable.set(handled);
+                            }
+                        }
+                    });
+                };
+                const element = {
+                    redo: () => {
+                        markMergeRangesAsHandled(true);
+                    },
+                    undo: () => {
+                        markMergeRangesAsHandled(false);
+                    }
+                };
+                attachedHistory.pushAttachedHistoryElement(element);
+                element.redo();
+            }));
+        });
+    }
+    computeMergeRangeStateFromResult(mergeRange) {
+        const resultRange = this.getLineRangeInResult(mergeRange);
+        const existingLines = resultRange.getLines(this.resultDocument);
+        const states = [
+            'Base',
+            'Side1',
+            'Side2',
+            'Side1Side2Smart',
+            'Side2Side1Smart',
+            'Side1Side2',
+            'Side2Side1'
+        ];
+        for (const state of states) {
+            const edit = mergeRange.getBaseRangeEdit(state);
+            if (core_1.ArrayUtils.equals(edit.newLines, existingLines)) {
+                return state;
+            }
+        }
+        return 'Unrecognized';
+    }
+    async doInit() {
+        var _a;
+        if ((_a = this.props.options) === null || _a === void 0 ? void 0 : _a.resetResult) {
+            await this.reset();
+        }
+    }
+    dispose() {
+        this.toDispose.dispose();
+    }
+    isDisposed() {
+        return this.toDispose.disposed;
+    }
+    async reset() {
+        await observable_1.ObservableUtils.waitForState(this.diffComputingStateForSidesObservable, state => state === 1 /* DiffComputingState.UpToDate */);
+        this.shouldRecomputeHandledState = true;
+        this.resultDocument.textEditorModel.setValue(this.computeAutoMergedResult());
+    }
+    computeAutoMergedResult() {
+        const baseLines = this.baseDocument.textEditorModel.getLinesContent();
+        const side1Lines = this.side1Document.textEditorModel.getLinesContent();
+        const side2Lines = this.side2Document.textEditorModel.getLinesContent();
+        const resultLines = [];
+        function appendLinesToResult(documentLines, lineRange) {
+            for (let i = lineRange.startLineNumber; i < lineRange.endLineNumberExclusive; i++) {
+                resultLines.push(documentLines[i]);
+            }
+        }
+        let baseStartLineNumber = 0;
+        for (const mergeRange of this.mergeRanges) {
+            appendLinesToResult(baseLines, line_range_1.LineRange.fromLineNumbers(baseStartLineNumber, mergeRange.baseRange.startLineNumber));
+            if (mergeRange.side1Changes.length === 0) {
+                appendLinesToResult(side2Lines, mergeRange.side2Range);
+            }
+            else if (mergeRange.side2Changes.length === 0) {
+                appendLinesToResult(side1Lines, mergeRange.side1Range);
+            }
+            else if (mergeRange.isEqualChange) {
+                appendLinesToResult(side1Lines, mergeRange.side1Range);
+            }
+            else {
+                appendLinesToResult(baseLines, mergeRange.baseRange);
+            }
+            baseStartLineNumber = mergeRange.baseRange.endLineNumberExclusive;
+        }
+        appendLinesToResult(baseLines, line_range_1.LineRange.fromLineNumbers(baseStartLineNumber, baseLines.length));
+        return resultLines.join(this.resultDocument.textEditorModel.getEOL());
+    }
+    computeMergeRanges() {
+        return merge_range_1.MergeRange.computeMergeRanges(this.side1Changes, this.side2Changes, this.baseDocument, this.side1Document, this.side2Document);
+    }
+    hasMergeRange(mergeRange) {
+        return this.mergeRangesDataObservable.get().has(mergeRange);
+    }
+    getMergeRangeData(mergeRange) {
+        const mergeRangeData = this.mergeRangesDataObservable.get().get(mergeRange);
+        if (!mergeRangeData) {
+            throw new Error('Unknown merge range');
+        }
+        return mergeRangeData;
+    }
+    getMergeRangeResultState(mergeRange) {
+        return this.getMergeRangeData(mergeRange).resultStateObservable.get();
+    }
+    applyMergeRangeAcceptedState(mergeRange, state) {
+        if (!this.isUpToDateObservable.get()) {
+            throw new Error('Cannot apply merge range accepted state while updating');
+        }
+        if (state !== 'Base' && this.getMergeRangeResultState(mergeRange) === 'Unrecognized') {
+            throw new Error('Cannot apply merge range accepted state to an unrecognized result state');
+        }
+        const { originalRange: baseRange, modifiedRange: resultRange } = this.getResultLineRangeMapping(mergeRange);
+        let newLines;
+        if (state === 'Base') {
+            newLines = baseRange.getLines(this.baseDocument);
+        }
+        else {
+            if (!baseRange.equals(mergeRange.baseRange)) {
+                throw new Error('Assertion error');
+            }
+            newLines = mergeRange.getBaseRangeEdit(state).newLines;
+        }
+        const resultEdit = new range_editing_1.LineRangeEdit(resultRange, newLines);
+        const editOperation = resultEdit.toRangeEdit(this.resultDocument.lineCount).toMonacoEdit();
+        const cursorState = this.resultEditor.getControl().getSelections();
+        this.resultDocument.textEditorModel.pushStackElement();
+        this.resultDocument.textEditorModel.pushEditOperations(cursorState, [editOperation], () => cursorState);
+        this.resultDocument.textEditorModel.pushStackElement();
+    }
+    isMergeRangeHandled(mergeRange) {
+        return this.getMergeRangeData(mergeRange).isHandledObservable.get();
+    }
+    getLineRangeInResult(mergeRange) {
+        return this.getResultLineRangeMapping(mergeRange).modifiedRange;
+    }
+    getResultLineRangeMapping(mergeRange) {
+        const projectLine = (lineNumber) => {
+            let offset = 0;
+            const changes = this.resultChanges;
+            for (const change of changes) {
+                const { originalRange } = change;
+                if (originalRange.containsLine(lineNumber) || originalRange.endLineNumberExclusive === lineNumber) {
+                    return change;
+                }
+                else if (originalRange.endLineNumberExclusive < lineNumber) {
+                    offset = change.modifiedRange.endLineNumberExclusive - originalRange.endLineNumberExclusive;
+                }
+                else {
+                    break;
+                }
+            }
+            return lineNumber + offset;
+        };
+        let startBase = mergeRange.baseRange.startLineNumber;
+        let startResult = projectLine(startBase);
+        if (typeof startResult !== 'number') {
+            startBase = startResult.originalRange.startLineNumber;
+            startResult = startResult.modifiedRange.startLineNumber;
+        }
+        let endExclusiveBase = mergeRange.baseRange.endLineNumberExclusive;
+        let endExclusiveResult = projectLine(endExclusiveBase);
+        if (typeof endExclusiveResult !== 'number') {
+            endExclusiveBase = endExclusiveResult.originalRange.endLineNumberExclusive;
+            endExclusiveResult = endExclusiveResult.modifiedRange.endLineNumberExclusive;
+        }
+        return new range_mapping_1.LineRangeMapping(line_range_1.LineRange.fromLineNumbers(startBase, endExclusiveBase), line_range_1.LineRange.fromLineNumbers(startResult, endExclusiveResult));
+    }
+    translateBaseRangeToSide(range, side) {
+        const rangeMap = side === 1 ? this.baseToSide1RangeMap : this.baseToSide2RangeMap;
+        return rangeMap.projectRange(range).modifiedRange;
+    }
+    translateSideRangeToBase(range, side) {
+        const rangeMap = side === 1 ? this.side1ToBaseRangeMap : this.side2ToBaseRangeMap;
+        return rangeMap.projectRange(range).modifiedRange;
+    }
+    translateBaseRangeToResult(range) {
+        return this.baseToResultRangeMap.projectRange(range).modifiedRange;
+    }
+    translateResultRangeToBase(range) {
+        return this.resultToBaseRangeMap.projectRange(range).modifiedRange;
+    }
+    findMergeRanges(baseRange) {
+        return this.mergeRanges.filter(mergeRange => mergeRange.baseRange.touches(baseRange));
+    }
+    computeSideToResultDiff(sideChanges, resultChanges) {
+        return range_mapping_1.DocumentLineRangeMap.betweenModifiedSides(sideChanges, resultChanges).lineRangeMappings;
+    }
+    newMergeRangeData() {
+        return new MergeRangeData();
+    }
+    newLiveDiff(originalDocument, modifiedDocument) {
+        return new live_diff_1.LiveDiff(originalDocument, modifiedDocument, this.diffComputer);
+    }
+    newDocumentLineRangeMap(lineRangeMappings) {
+        return new range_mapping_1.DocumentLineRangeMap(lineRangeMappings);
+    }
+    newDocumentRangeMap(rangeMappings) {
+        return new range_mapping_1.DocumentRangeMap(rangeMappings);
+    }
+    getDiffComputingState(...liveDiffs) {
+        const liveDiffStates = liveDiffs.map(liveDiff => liveDiff.state);
+        if (liveDiffStates.some(state => state === 0 /* LiveDiffState.Initializing */)) {
+            return 0 /* DiffComputingState.Initializing */;
+        }
+        if (liveDiffStates.some(state => state === 2 /* LiveDiffState.Updating */)) {
+            return 2 /* DiffComputingState.Updating */;
+        }
+        return 1 /* DiffComputingState.UpToDate */;
+    }
+};
+exports.MergeEditorModel = MergeEditorModel;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(exports.MergeEditorModelProps),
+    tslib_1.__metadata("design:type", Object)
+], MergeEditorModel.prototype, "props", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(diff_1.DiffComputer),
+    tslib_1.__metadata("design:type", Object)
+], MergeEditorModel.prototype, "diffComputer", 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)
+], MergeEditorModel.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)
+], MergeEditorModel.prototype, "init", null);
+exports.MergeEditorModel = MergeEditorModel = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], MergeEditorModel);
+class MergeRangeData {
+    constructor() {
+        this.resultStateObservable = observable_1.SettableObservable.create('Base');
+        this.isHandledObservable = observable_1.SettableObservable.create(false);
+    }
+}
+exports.MergeRangeData = MergeRangeData;
+class AttachedHistory {
+    constructor(model) {
+        this.model = model;
+        this.toDispose = new core_1.DisposableCollection();
+        this.attachedHistory = [];
+        let previousAltId = this.model.textEditorModel.getAlternativeVersionId();
+        this.toDispose.push(model.textEditorModel.onDidChangeContent(event => {
+            const currentAltId = model.textEditorModel.getAlternativeVersionId();
+            if (event.isRedoing) {
+                for (const item of this.attachedHistory) {
+                    if (previousAltId < item.altId && item.altId <= currentAltId) {
+                        item.element.redo();
+                    }
+                }
+            }
+            else if (event.isUndoing) {
+                for (let i = this.attachedHistory.length - 1; i >= 0; i--) {
+                    const item = this.attachedHistory[i];
+                    if (currentAltId < item.altId && item.altId <= previousAltId) {
+                        item.element.undo();
+                    }
+                }
+            }
+            else {
+                // The user destroyed the redo stack by performing a non redo/undo operation.
+                while (this.attachedHistory.length > 0
+                    && this.attachedHistory[this.attachedHistory.length - 1].altId > previousAltId) {
+                    this.attachedHistory.pop();
+                }
+            }
+            previousAltId = currentAltId;
+        }));
+    }
+    dispose() {
+        this.toDispose.dispose();
+    }
+    pushAttachedHistoryElement(element) {
+        this.attachedHistory.push({ altId: this.model.textEditorModel.getAlternativeVersionId(), element });
+    }
+}
+//# sourceMappingURL=merge-editor-model.js.map

package/lib/browser/merge-editor/model/merge-editor-model.js.map

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

package/lib/browser/merge-editor/model/merge-range.d.ts

@@ -0,0 +1,50 @@
+import { TextEditorDocument } from '@theia/editor/lib/browser/editor';
+import { DetailedLineRangeMapping } from './range-mapping';
+import { LineRange } from './line-range';
+import { LineRangeEdit, RangeEdit } from './range-editing';
+/**
+ * Describes modifications in side 1 and side 2 for a specific range in base.
+ */
+export declare class MergeRange {
+    readonly baseRange: LineRange;
+    readonly baseDocument: TextEditorDocument;
+    readonly side1Range: LineRange;
+    readonly side1Changes: readonly DetailedLineRangeMapping[];
+    readonly side1Document: TextEditorDocument;
+    readonly side2Range: LineRange;
+    readonly side2Changes: readonly DetailedLineRangeMapping[];
+    readonly side2Document: TextEditorDocument;
+    static computeMergeRanges(side1Diff: readonly DetailedLineRangeMapping[], side2Diff: readonly DetailedLineRangeMapping[], baseDocument: TextEditorDocument, side1Document: TextEditorDocument, side2Document: TextEditorDocument): MergeRange[];
+    readonly side1CombinedChange: DetailedLineRangeMapping | undefined;
+    readonly side2CombinedChange: DetailedLineRangeMapping | undefined;
+    readonly isEqualChange: boolean;
+    constructor(baseRange: LineRange, baseDocument: TextEditorDocument, side1Range: LineRange, side1Changes: readonly DetailedLineRangeMapping[], side1Document: TextEditorDocument, side2Range: LineRange, side2Changes: readonly DetailedLineRangeMapping[], side2Document: TextEditorDocument);
+    getModifiedRange(side: MergeSide): LineRange;
+    getCombinedChange(side: MergeSide): DetailedLineRangeMapping | undefined;
+    getChanges(side: MergeSide): readonly DetailedLineRangeMapping[];
+    get isConflicting(): boolean;
+    canBeSmartCombined(firstSide: MergeSide): boolean;
+    get isSmartCombinationOrderRelevant(): boolean;
+    getBaseRangeEdit(state: MergeRangeAcceptedState): LineRangeEdit;
+    protected smartCombinationEdit1?: {
+        value: LineRangeEdit | undefined;
+    };
+    protected smartCombinationEdit2?: {
+        value: LineRangeEdit | undefined;
+    };
+    protected smartCombineChanges(firstSide: MergeSide): LineRangeEdit | undefined;
+    protected editsToLineRangeEdit(range: LineRange, sortedEdits: RangeEdit[], document: TextEditorDocument): LineRangeEdit | undefined;
+    protected dumbCombinationEdit1?: LineRangeEdit;
+    protected dumbCombinationEdit2?: LineRangeEdit;
+    protected dumbCombineChanges(firstSide: MergeSide): LineRangeEdit;
+}
+export type MergeSide = 1 | 2;
+export type MergeRangeAcceptedState = 'Base' | 'Side1' | 'Side2' | 'Side1Side2' | 'Side2Side1' | 'Side1Side2Smart' | 'Side2Side1Smart';
+export declare namespace MergeRangeAcceptedState {
+    function addSide(state: MergeRangeAcceptedState, side: MergeSide, options?: {
+        smartCombination?: boolean;
+    }): MergeRangeAcceptedState;
+    function removeSide(state: MergeRangeAcceptedState, side: MergeSide): MergeRangeAcceptedState;
+}
+export type MergeRangeResultState = MergeRangeAcceptedState | 'Unrecognized';
+//# sourceMappingURL=merge-range.d.ts.map

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

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