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

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

@@ -1,252 +0,0 @@
-"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/mapping.ts
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DocumentRangeMap = exports.RangeMapping = exports.DetailedLineRangeMapping = exports.MappingAlignment = exports.DocumentLineRangeMap = exports.LineRangeMapping = void 0;
-const core_1 = require("@theia/core");
-const editor_1 = require("@theia/editor/lib/browser/editor");
-const line_range_1 = require("./line-range");
-const range_editing_1 = require("./range-editing");
-const range_utils_1 = require("./range-utils");
-/**
- * Maps a line range in the original text document to a line range in the modified text document.
- */
-class LineRangeMapping {
-    static join(mappings) {
-        return mappings.reduce((acc, cur) => acc ? acc.join(cur) : cur, undefined);
-    }
-    constructor(originalRange, modifiedRange) {
-        this.originalRange = originalRange;
-        this.modifiedRange = modifiedRange;
-    }
-    toString() {
-        return `${this.originalRange.toString()} -> ${this.modifiedRange.toString()}`;
-    }
-    join(other) {
-        return new LineRangeMapping(this.originalRange.join(other.originalRange), this.modifiedRange.join(other.modifiedRange));
-    }
-    addModifiedLineDelta(delta) {
-        return new LineRangeMapping(this.originalRange, this.modifiedRange.delta(delta));
-    }
-    addOriginalLineDelta(delta) {
-        return new LineRangeMapping(this.originalRange.delta(delta), this.modifiedRange);
-    }
-    reverse() {
-        return new LineRangeMapping(this.modifiedRange, this.originalRange);
-    }
-}
-exports.LineRangeMapping = LineRangeMapping;
-/**
- * Represents a total monotonous mapping of line ranges in one document to another document.
- */
-class DocumentLineRangeMap {
-    static betweenModifiedSides(side1Diff, side2Diff) {
-        const alignments = MappingAlignment.computeAlignments(side1Diff, side2Diff);
-        const mappings = alignments.map(alignment => new LineRangeMapping(alignment.side1Range, alignment.side2Range));
-        return new DocumentLineRangeMap(mappings);
-    }
-    constructor(
-    /**
-     * The line range mappings that define this document mapping.
-     * The number of lines between two adjacent original ranges must equal the number of lines between their corresponding modified ranges.
-     */
-    lineRangeMappings) {
-        this.lineRangeMappings = lineRangeMappings;
-        if (!core_1.ArrayUtils.checkAdjacentItems(lineRangeMappings, (m1, m2) => m1.originalRange.isBefore(m2.originalRange) && m1.modifiedRange.isBefore(m2.modifiedRange) &&
-            m2.originalRange.startLineNumber - m1.originalRange.endLineNumberExclusive === m2.modifiedRange.startLineNumber - m1.modifiedRange.endLineNumberExclusive)) {
-            throw new Error('Illegal line range mappings');
-        }
-    }
-    /**
-     * @param lineNumber 0-based line number in the original text document
-     */
-    projectLine(lineNumber) {
-        const lastBefore = core_1.ArrayUtils.findLast(this.lineRangeMappings, m => m.originalRange.startLineNumber <= lineNumber);
-        if (!lastBefore) {
-            return new LineRangeMapping(new line_range_1.LineRange(lineNumber, 1), new line_range_1.LineRange(lineNumber, 1));
-        }
-        if (lastBefore.originalRange.containsLine(lineNumber)) {
-            return lastBefore;
-        }
-        return new LineRangeMapping(new line_range_1.LineRange(lineNumber, 1), new line_range_1.LineRange(lineNumber + lastBefore.modifiedRange.endLineNumberExclusive - lastBefore.originalRange.endLineNumberExclusive, 1));
-    }
-    reverse() {
-        return new DocumentLineRangeMap(this.lineRangeMappings.map(m => m.reverse()));
-    }
-}
-exports.DocumentLineRangeMap = DocumentLineRangeMap;
-/**
- * Aligns mappings for two modified sides with a common base range.
- */
-class MappingAlignment {
-    static computeAlignments(side1Mappings, side2Mappings) {
-        const combinedMappings = side1Mappings.map(mapping => ({ source: 0, mapping })).concat(side2Mappings.map(mapping => ({ source: 1, mapping }))).sort((a, b) => line_range_1.LineRange.compareByStart(a.mapping.originalRange, b.mapping.originalRange));
-        const currentMappings = [new Array(), new Array()];
-        const currentDelta = [0, 0];
-        const alignments = new Array();
-        function pushAlignment(baseRange) {
-            const mapping1 = LineRangeMapping.join(currentMappings[0]) || new LineRangeMapping(baseRange, baseRange.delta(currentDelta[0]));
-            const mapping2 = LineRangeMapping.join(currentMappings[1]) || new LineRangeMapping(baseRange, baseRange.delta(currentDelta[1]));
-            function getAlignedModifiedRange(m) {
-                const startDelta = baseRange.startLineNumber - m.originalRange.startLineNumber;
-                const endDelta = baseRange.endLineNumberExclusive - m.originalRange.endLineNumberExclusive;
-                return new line_range_1.LineRange(m.modifiedRange.startLineNumber + startDelta, m.modifiedRange.lineCount - startDelta + endDelta);
-            }
-            alignments.push(new MappingAlignment(baseRange, getAlignedModifiedRange(mapping1), currentMappings[0], getAlignedModifiedRange(mapping2), currentMappings[1]));
-            currentMappings[0] = [];
-            currentMappings[1] = [];
-        }
-        let currentBaseRange;
-        for (const current of combinedMappings) {
-            const { originalRange, modifiedRange } = current.mapping;
-            if (currentBaseRange && !currentBaseRange.touches(originalRange)) {
-                pushAlignment(currentBaseRange);
-                currentBaseRange = undefined;
-            }
-            currentBaseRange = currentBaseRange ? currentBaseRange.join(originalRange) : originalRange;
-            currentMappings[current.source].push(current.mapping);
-            currentDelta[current.source] = modifiedRange.endLineNumberExclusive - originalRange.endLineNumberExclusive;
-        }
-        if (currentBaseRange) {
-            pushAlignment(currentBaseRange);
-        }
-        return alignments;
-    }
-    constructor(baseRange, side1Range, side1Mappings, side2Range, side2Mappings) {
-        this.baseRange = baseRange;
-        this.side1Range = side1Range;
-        this.side1Mappings = side1Mappings;
-        this.side2Range = side2Range;
-        this.side2Mappings = side2Mappings;
-    }
-    toString() {
-        return `${this.side1Range} <- ${this.baseRange} -> ${this.side2Range}`;
-    }
-}
-exports.MappingAlignment = MappingAlignment;
-/**
- * A line range mapping with inner range mappings.
- */
-class DetailedLineRangeMapping extends LineRangeMapping {
-    static join(mappings) {
-        return mappings.reduce((acc, cur) => acc ? acc.join(cur) : cur, undefined);
-    }
-    constructor(originalRange, originalDocument, modifiedRange, modifiedDocument, rangeMappings) {
-        super(originalRange, modifiedRange);
-        this.originalDocument = originalDocument;
-        this.modifiedDocument = modifiedDocument;
-        this.rangeMappings = rangeMappings || [new RangeMapping(originalRange.toRange(), modifiedRange.toRange())];
-    }
-    join(other) {
-        return new DetailedLineRangeMapping(this.originalRange.join(other.originalRange), this.originalDocument, this.modifiedRange.join(other.modifiedRange), this.modifiedDocument);
-    }
-    addModifiedLineDelta(delta) {
-        return new DetailedLineRangeMapping(this.originalRange, this.originalDocument, this.modifiedRange.delta(delta), this.modifiedDocument, this.rangeMappings.map(m => m.addModifiedLineDelta(delta)));
-    }
-    addOriginalLineDelta(delta) {
-        return new DetailedLineRangeMapping(this.originalRange.delta(delta), this.originalDocument, this.modifiedRange, this.modifiedDocument, this.rangeMappings.map(m => m.addOriginalLineDelta(delta)));
-    }
-    reverse() {
-        return new DetailedLineRangeMapping(this.modifiedRange, this.modifiedDocument, this.originalRange, this.originalDocument, this.rangeMappings.map(m => m.reverse()));
-    }
-    getLineEdit() {
-        return new range_editing_1.LineRangeEdit(this.originalRange, this.getModifiedLines());
-    }
-    getReverseLineEdit() {
-        return new range_editing_1.LineRangeEdit(this.modifiedRange, this.getOriginalLines());
-    }
-    getModifiedLines() {
-        return this.modifiedRange.getLines(this.modifiedDocument);
-    }
-    getOriginalLines() {
-        return this.originalRange.getLines(this.originalDocument);
-    }
-}
-exports.DetailedLineRangeMapping = DetailedLineRangeMapping;
-/**
- * Maps a range in the original text document to a range in the modified text document.
- */
-class RangeMapping {
-    constructor(originalRange, modifiedRange) {
-        this.originalRange = originalRange;
-        this.modifiedRange = modifiedRange;
-    }
-    toString() {
-        function rangeToString(range) {
-            return `[${range.start.line}:${range.start.character}, ${range.end.line}:${range.end.character})`;
-        }
-        return `${rangeToString(this.originalRange)} -> ${rangeToString(this.modifiedRange)}`;
-    }
-    addModifiedLineDelta(deltaLines) {
-        return new RangeMapping(this.originalRange, editor_1.Range.create(this.modifiedRange.start.line + deltaLines, this.modifiedRange.start.character, this.modifiedRange.end.line + deltaLines, this.modifiedRange.end.character));
-    }
-    addOriginalLineDelta(deltaLines) {
-        return new RangeMapping(editor_1.Range.create(this.originalRange.start.line + deltaLines, this.originalRange.start.character, this.originalRange.end.line + deltaLines, this.originalRange.end.character), this.modifiedRange);
-    }
-    reverse() {
-        return new RangeMapping(this.modifiedRange, this.originalRange);
-    }
-}
-exports.RangeMapping = RangeMapping;
-/**
- * Represents a total monotonous mapping of ranges in one document to another document.
- */
-class DocumentRangeMap {
-    constructor(
-    /**
-     * The range mappings that define this document mapping.
-     */
-    rangeMappings) {
-        this.rangeMappings = rangeMappings;
-        if (!core_1.ArrayUtils.checkAdjacentItems(rangeMappings, (m1, m2) => range_utils_1.RangeUtils.isBeforeOrTouching(m1.originalRange, m2.originalRange) &&
-            range_utils_1.RangeUtils.isBeforeOrTouching(m1.modifiedRange, m2.modifiedRange))) {
-            throw new Error('Illegal range mappings');
-        }
-    }
-    /**
-     * @param position position in the original text document
-     */
-    projectPosition(position) {
-        const lastBefore = core_1.ArrayUtils.findLast(this.rangeMappings, m => range_utils_1.PositionUtils.isBeforeOrEqual(m.originalRange.start, position));
-        if (!lastBefore) {
-            return new RangeMapping(editor_1.Range.create(position, position), editor_1.Range.create(position, position));
-        }
-        if (range_utils_1.RangeUtils.containsPosition(lastBefore.originalRange, position)) {
-            return lastBefore;
-        }
-        const relativePosition = range_utils_1.PositionUtils.relativize(lastBefore.originalRange.end, position);
-        const modifiedRangePosition = range_utils_1.PositionUtils.resolve(lastBefore.modifiedRange.end, relativePosition);
-        return new RangeMapping(editor_1.Range.create(position, position), editor_1.Range.create(modifiedRangePosition, modifiedRangePosition));
-    }
-    /**
-     * @param range range in the original text document
-     */
-    projectRange(range) {
-        const start = this.projectPosition(range.start);
-        const end = this.projectPosition(range.end);
-        return new RangeMapping(range_utils_1.RangeUtils.union(start.originalRange, end.originalRange), range_utils_1.RangeUtils.union(start.modifiedRange, end.modifiedRange));
-    }
-    reverse() {
-        return new DocumentRangeMap(this.rangeMappings.map(m => m.reverse()));
-    }
-}
-exports.DocumentRangeMap = DocumentRangeMap;
-//# sourceMappingURL=range-mapping.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"range-mapping.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-mapping.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF;;;gGAGgG;AAChG,yIAAyI;;;AAEzI,sCAAyC;AACzC,6DAAuF;AACvF,6CAAyC;AACzC,mDAAgD;AAChD,+CAA0D;AAE1D;;GAEG;AACH,MAAa,gBAAgB;IAEzB,MAAM,CAAC,IAAI,CAAC,QAAqC;QAC7C,OAAO,QAAQ,CAAC,MAAM,CAA+B,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC7G,CAAC;IAED,YACa,aAAwB,EACxB,aAAwB;QADxB,kBAAa,GAAb,aAAa,CAAW;QACxB,kBAAa,GAAb,aAAa,CAAW;IACjC,CAAC;IAEL,QAAQ;QACJ,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC;IAClF,CAAC;IAED,IAAI,CAAC,KAAuB;QACxB,OAAO,IAAI,gBAAgB,CACvB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAC5C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAC/C,CAAC;IACN,CAAC;IAED,oBAAoB,CAAC,KAAa;QAC9B,OAAO,IAAI,gBAAgB,CACvB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAClC,CAAC;IACN,CAAC;IAED,oBAAoB,CAAC,KAAa;QAC9B,OAAO,IAAI,gBAAgB,CACvB,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,EAC/B,IAAI,CAAC,aAAa,CACrB,CAAC;IACN,CAAC;IAED,OAAO;QACH,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IACxE,CAAC;CACJ;AAvCD,4CAuCC;AAED;;GAEG;AACH,MAAa,oBAAoB;IAE7B,MAAM,CAAC,oBAAoB,CACvB,SAAsC,EACtC,SAAsC;QAEtC,MAAM,UAAU,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC5E,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,gBAAgB,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;QAC/G,OAAO,IAAI,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED;IACI;;;OAGG;IACM,iBAA8C;QAA9C,sBAAiB,GAAjB,iBAAiB,CAA6B;QAEvD,IAAI,CAAC,iBAAU,CAAC,kBAAkB,CAAC,iBAAiB,EAChD,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC,aAAa,CAAC;YAClG,EAAE,CAAC,aAAa,CAAC,eAAe,GAAG,EAAE,CAAC,aAAa,CAAC,sBAAsB,KAAK,EAAE,CAAC,aAAa,CAAC,eAAe,GAAG,EAAE,CAAC,aAAa,CAAC,sBAAsB,CAChK,EAAE,CAAC;YACA,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACnD,CAAC;IACL,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,UAAkB;QAC1B,MAAM,UAAU,GAAG,iBAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,eAAe,IAAI,UAAU,CAAC,CAAC;QACnH,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,OAAO,IAAI,gBAAgB,CACvB,IAAI,sBAAS,CAAC,UAAU,EAAE,CAAC,CAAC,EAC5B,IAAI,sBAAS,CAAC,UAAU,EAAE,CAAC,CAAC,CAC/B,CAAC;QACN,CAAC;QAED,IAAI,UAAU,CAAC,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;YACpD,OAAO,UAAU,CAAC;QACtB,CAAC;QAED,OAAO,IAAI,gBAAgB,CACvB,IAAI,sBAAS,CAAC,UAAU,EAAE,CAAC,CAAC,EAC5B,IAAI,sBAAS,CAAC,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,sBAAsB,GAAG,UAAU,CAAC,aAAa,CAAC,sBAAsB,EAAE,CAAC,CAAC,CACnI,CAAC;IACN,CAAC;IAED,OAAO;QACH,OAAO,IAAI,oBAAoB,CAC3B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAC/C,CAAC;IACN,CAAC;CACJ;AArDD,oDAqDC;AAED;;GAEG;AACH,MAAa,gBAAgB;IAEzB,MAAM,CAAC,iBAAiB,CACpB,aAA2B,EAC3B,aAA2B;QAE3B,MAAM,gBAAgB,GAClB,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CACzD,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CACxD,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,sBAAS,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;QAElG,MAAM,eAAe,GAAG,CAAC,IAAI,KAAK,EAAK,EAAE,IAAI,KAAK,EAAK,CAAC,CAAC;QACzD,MAAM,YAAY,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAE5B,MAAM,UAAU,GAAG,IAAI,KAAK,EAAuB,CAAC;QAEpD,SAAS,aAAa,CAAC,SAAoB;YACvC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChI,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEhI,SAAS,uBAAuB,CAAC,CAAmB;gBAChD,MAAM,UAAU,GAAG,SAAS,CAAC,eAAe,GAAG,CAAC,CAAC,aAAa,CAAC,eAAe,CAAC;gBAC/E,MAAM,QAAQ,GAAG,SAAS,CAAC,sBAAsB,GAAG,CAAC,CAAC,aAAa,CAAC,sBAAsB,CAAC;gBAC3F,OAAO,IAAI,sBAAS,CAChB,CAAC,CAAC,aAAa,CAAC,eAAe,GAAG,UAAU,EAC5C,CAAC,CAAC,aAAa,CAAC,SAAS,GAAG,UAAU,GAAG,QAAQ,CACpD,CAAC;YACN,CAAC;YAED,UAAU,CAAC,IAAI,CACX,IAAI,gBAAgB,CAChB,SAAS,EACT,uBAAuB,CAAC,QAAQ,CAAC,EACjC,eAAe,CAAC,CAAC,CAAC,EAClB,uBAAuB,CAAC,QAAQ,CAAC,EACjC,eAAe,CAAC,CAAC,CAAC,CACrB,CACJ,CAAC;YACF,eAAe,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;YACxB,eAAe,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;QAC5B,CAAC;QAED,IAAI,gBAAuC,CAAC;QAE5C,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE,CAAC;YACrC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;YACzD,IAAI,gBAAgB,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC/D,aAAa,CAAC,gBAAgB,CAAC,CAAC;gBAChC,gBAAgB,GAAG,SAAS,CAAC;YACjC,CAAC;YACD,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;YAC3F,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACtD,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,sBAAsB,GAAG,aAAa,CAAC,sBAAsB,CAAC;QAC/G,CAAC;QACD,IAAI,gBAAgB,EAAE,CAAC;YACnB,aAAa,CAAC,gBAAgB,CAAC,CAAC;QACpC,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,YACa,SAAoB,EACpB,UAAqB,EACrB,aAA2B,EAC3B,UAAqB,EACrB,aAA2B;QAJ3B,cAAS,GAAT,SAAS,CAAW;QACpB,eAAU,GAAV,UAAU,CAAW;QACrB,kBAAa,GAAb,aAAa,CAAc;QAC3B,eAAU,GAAV,UAAU,CAAW;QACrB,kBAAa,GAAb,aAAa,CAAc;IACpC,CAAC;IAEL,QAAQ;QACJ,OAAO,GAAG,IAAI,CAAC,UAAU,OAAO,IAAI,CAAC,SAAS,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;IAC3E,CAAC;CACJ;AAxED,4CAwEC;AAED;;GAEG;AACH,MAAa,wBAAyB,SAAQ,gBAAgB;IAE1D,MAAM,CAAU,IAAI,CAAC,QAA6C;QAC9D,OAAO,QAAQ,CAAC,MAAM,CAAuC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACrH,CAAC;IAID,YACI,aAAwB,EACf,gBAAoC,EAC7C,aAAwB,EACf,gBAAoC,EAC7C,aAAuC;QAEvC,KAAK,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QAL3B,qBAAgB,GAAhB,gBAAgB,CAAoB;QAEpC,qBAAgB,GAAhB,gBAAgB,CAAoB;QAK7C,IAAI,CAAC,aAAa,GAAG,aAAa,IAAI,CAAC,IAAI,YAAY,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC/G,CAAC;IAEQ,IAAI,CAAC,KAA+B;QACzC,OAAO,IAAI,wBAAwB,CAC/B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAC5C,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAC5C,IAAI,CAAC,gBAAgB,CACxB,CAAC;IACN,CAAC;IAEQ,oBAAoB,CAAC,KAAa;QACvC,OAAO,IAAI,wBAAwB,CAC/B,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,EAC/B,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAC7D,CAAC;IACN,CAAC;IAEQ,oBAAoB,CAAC,KAAa;QACvC,OAAO,IAAI,wBAAwB,CAC/B,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,EAC/B,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAC7D,CAAC;IACN,CAAC;IAEQ,OAAO;QACZ,OAAO,IAAI,wBAAwB,CAC/B,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAC3C,CAAC;IACN,CAAC;IAED,WAAW;QACP,OAAO,IAAI,6BAAa,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,6BAAa,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC9D,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC9D,CAAC;CACJ;AA1ED,4DA0EC;AAED;;GAEG;AACH,MAAa,YAAY;IAErB,YACa,aAA8B,EAC9B,aAA8B;QAD9B,kBAAa,GAAb,aAAa,CAAiB;QAC9B,kBAAa,GAAb,aAAa,CAAiB;IACvC,CAAC;IAEL,QAAQ;QACJ,SAAS,aAAa,CAAC,KAAY;YAC/B,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,KAAK,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC;QACtG,CAAC;QAED,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;IAC1F,CAAC;IAED,oBAAoB,CAAC,UAAkB;QACnC,OAAO,IAAI,YAAY,CACnB,IAAI,CAAC,aAAa,EAClB,cAAK,CAAC,MAAM,CACR,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,GAAG,UAAU,EAC1C,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,SAAS,EAClC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,EACxC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CACnC,CACJ,CAAC;IACN,CAAC;IAED,oBAAoB,CAAC,UAAkB;QACnC,OAAO,IAAI,YAAY,CACnB,cAAK,CAAC,MAAM,CACR,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,GAAG,UAAU,EAC1C,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,SAAS,EAClC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,EACxC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CACnC,EACD,IAAI,CAAC,aAAa,CACrB,CAAC;IACN,CAAC;IAED,OAAO;QACH,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IACpE,CAAC;CACJ;AA1CD,oCA0CC;AAED;;GAEG;AACH,MAAa,gBAAgB;IAEzB;IACI;;OAEG;IACM,aAAsC;QAAtC,kBAAa,GAAb,aAAa,CAAyB;QAE/C,IAAI,CAAC,iBAAU,CAAC,kBAAkB,CAC9B,aAAa,EACb,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CACP,wBAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC;YACjE,wBAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,CACxE,EAAE,CAAC;YACA,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC9C,CAAC;IACL,CAAC;IAED;;OAEG;IACH,eAAe,CAAC,QAAkB;QAC9B,MAAM,UAAU,GAAG,iBAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,CAAC,2BAAa,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAChI,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,OAAO,IAAI,YAAY,CACnB,cAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAChC,cAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CACnC,CAAC;QACN,CAAC;QAED,IAAI,wBAAU,CAAC,gBAAgB,CAAC,UAAU,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAE,CAAC;YAClE,OAAO,UAAU,CAAC;QACtB,CAAC;QAED,MAAM,gBAAgB,GAAG,2BAAa,CAAC,UAAU,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC1F,MAAM,qBAAqB,GAAG,2BAAa,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAEpG,OAAO,IAAI,YAAY,CACnB,cAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAChC,cAAK,CAAC,MAAM,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,CAC7D,CAAC;IACN,CAAC;IAED;;OAEG;IACH,YAAY,CAAC,KAAY;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,OAAO,IAAI,YAAY,CACnB,wBAAU,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,CAAC,aAAa,CAAC,EACxD,wBAAU,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,CAAC,aAAa,CAAC,CAC3D,CAAC;IACN,CAAC;IAED,OAAO;QACH,OAAO,IAAI,gBAAgB,CACvB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAC3C,CAAC;IACN,CAAC;CACJ;AA5DD,4CA4DC"}

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

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=range-mapping.spec.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"range-mapping.spec.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-mapping.spec.ts"],"names":[],"mappings":""}

package/lib/browser/merge-editor/model/range-mapping.spec.js

@@ -1,48 +0,0 @@
-"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/test/browser/mapping.test.ts
-Object.defineProperty(exports, "__esModule", { value: true });
-const chai_1 = require("chai");
-const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
-const range_mapping_1 = require("./range-mapping");
-describe('document-range-map', () => {
-    it('project', () => {
-        const documentRangeMap = new range_mapping_1.DocumentRangeMap([
-            new range_mapping_1.RangeMapping(vscode_languageserver_protocol_1.Range.create(2, 4, 2, 6), vscode_languageserver_protocol_1.Range.create(2, 4, 2, 7)),
-            new range_mapping_1.RangeMapping(vscode_languageserver_protocol_1.Range.create(3, 2, 4, 3), vscode_languageserver_protocol_1.Range.create(3, 2, 6, 4)),
-            new range_mapping_1.RangeMapping(vscode_languageserver_protocol_1.Range.create(4, 5, 4, 7), vscode_languageserver_protocol_1.Range.create(6, 6, 6, 9)),
-        ]);
-        const project = (line, character) => documentRangeMap.projectPosition({ line, character }).toString();
-        (0, chai_1.expect)(project(1, 1)).to.be.equal('[1:1, 1:1) -> [1:1, 1:1)');
-        (0, chai_1.expect)(project(2, 3)).to.be.equal('[2:3, 2:3) -> [2:3, 2:3)');
-        (0, chai_1.expect)(project(2, 4)).to.be.equal('[2:4, 2:6) -> [2:4, 2:7)');
-        (0, chai_1.expect)(project(2, 5)).to.be.equal('[2:4, 2:6) -> [2:4, 2:7)');
-        (0, chai_1.expect)(project(2, 6)).to.be.equal('[2:6, 2:6) -> [2:7, 2:7)');
-        (0, chai_1.expect)(project(2, 7)).to.be.equal('[2:7, 2:7) -> [2:8, 2:8)');
-        (0, chai_1.expect)(project(3, 1)).to.be.equal('[3:1, 3:1) -> [3:1, 3:1)');
-        (0, chai_1.expect)(project(3, 2)).to.be.equal('[3:2, 4:3) -> [3:2, 6:4)');
-        (0, chai_1.expect)(project(4, 2)).to.be.equal('[3:2, 4:3) -> [3:2, 6:4)');
-        (0, chai_1.expect)(project(4, 3)).to.be.equal('[4:3, 4:3) -> [6:4, 6:4)');
-        (0, chai_1.expect)(project(4, 4)).to.be.equal('[4:4, 4:4) -> [6:5, 6:5)');
-        (0, chai_1.expect)(project(4, 5)).to.be.equal('[4:5, 4:7) -> [6:6, 6:9)');
-    });
-});
-//# sourceMappingURL=range-mapping.spec.js.map

package/lib/browser/merge-editor/model/range-mapping.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"range-mapping.spec.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-mapping.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF;;;gGAGgG;AAChG,6IAA6I;;AAE7I,+BAA8B;AAC9B,sGAA0E;AAC1E,mDAAiE;AAEjE,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAEhC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACf,MAAM,gBAAgB,GAAG,IAAI,gCAAgB,CAAC;YAC1C,IAAI,4BAAY,CAAC,sCAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,sCAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACpE,IAAI,4BAAY,CAAC,sCAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,sCAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACpE,IAAI,4BAAY,CAAC,sCAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,sCAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACvE,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,CAAC,IAAY,EAAE,SAAiB,EAAE,EAAE,CAChD,gBAAgB,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QAErE,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC"}

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

@@ -1,25 +0,0 @@
-import { Position, Range } from '@theia/core/shared/vscode-languageserver-protocol';
-export declare namespace RangeUtils {
-    function isEmpty(range: Range): boolean;
-    function containsPosition(range: Range, position: Position): boolean;
-    function isBeforeOrTouching(range: Range, other: Range): boolean;
-    function union(range: Range, other: Range): Range;
-    /**
-     * A function that compares ranges, useful for sorting ranges.
-     * It will first compare ranges on the start position and then on the end position.
-     */
-    function compareUsingStarts(range: Range, other: Range): number;
-}
-export declare namespace PositionUtils {
-    function isBeforeOrEqual(position: Position, other: Position): boolean;
-    function compare(position: Position, other: Position): number;
-    /**
-     * Given two positions, computes the relative position of the greater position against the lesser position.
-     */
-    function relativize(position: Position, other: Position): Position;
-    /**
-     * Resolves the given relative position against the given position and returns the resulting position.
-     */
-    function resolve(position: Position, relativePosition: Position): Position;
-}
-//# sourceMappingURL=range-utils.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"range-utils.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-utils.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAEpF,yBAAiB,UAAU,CAAC;IAExB,SAAgB,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAE7C;IAED,SAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAW1E;IAED,SAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAMtE;IAED,SAAgB,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,CAIvD;IAED;;;OAGG;IACH,SAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,CAWrE;CACJ;AAED,yBAAiB,aAAa,CAAC;IAE3B,SAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAE5E;IAED,SAAgB,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,GAAG,MAAM,CAKnE;IAED;;OAEG;IACH,SAAgB,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,GAAG,QAAQ,CASxE;IAED;;OAEG;IACH,SAAgB,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,GAAG,QAAQ,CAMhF;CACJ"}

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

@@ -1,118 +0,0 @@
-"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/rangeUtils.ts,
-// https://github.com/microsoft/vscode/blob/1.96.3/src/vs/editor/common/core/range.ts,
-// https://github.com/microsoft/vscode/blob/1.96.3/src/vs/editor/common/core/position.ts,
-// https://github.com/microsoft/vscode/blob/1.96.3/src/vs/editor/common/core/textLength.ts
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PositionUtils = exports.RangeUtils = void 0;
-const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
-var RangeUtils;
-(function (RangeUtils) {
-    function isEmpty(range) {
-        return range.start.line === range.end.line && range.start.character === range.end.character;
-    }
-    RangeUtils.isEmpty = isEmpty;
-    function containsPosition(range, position) {
-        if (position.line < range.start.line || position.line > range.end.line) {
-            return false;
-        }
-        if (position.line === range.start.line && position.character < range.start.character) {
-            return false;
-        }
-        if (position.line === range.end.line && position.character >= range.end.character) {
-            return false;
-        }
-        return true;
-    }
-    RangeUtils.containsPosition = containsPosition;
-    function isBeforeOrTouching(range, other) {
-        return (range.end.line < other.start.line ||
-            (range.end.line === other.start.line &&
-                range.end.character <= other.start.character));
-    }
-    RangeUtils.isBeforeOrTouching = isBeforeOrTouching;
-    function union(range, other) {
-        const start = PositionUtils.isBeforeOrEqual(range.start, other.start) ? range.start : other.start;
-        const end = PositionUtils.isBeforeOrEqual(range.end, other.end) ? other.end : range.end;
-        return { start, end };
-    }
-    RangeUtils.union = union;
-    /**
-     * A function that compares ranges, useful for sorting ranges.
-     * It will first compare ranges on the start position and then on the end position.
-     */
-    function compareUsingStarts(range, other) {
-        if (range.start.line === other.start.line) {
-            if (range.start.character === other.start.character) {
-                if (range.end.line === other.end.line) {
-                    return range.end.character - other.end.character;
-                }
-                return range.end.line - other.end.line;
-            }
-            return range.start.character - other.start.character;
-        }
-        return range.start.line - other.start.line;
-    }
-    RangeUtils.compareUsingStarts = compareUsingStarts;
-})(RangeUtils || (exports.RangeUtils = RangeUtils = {}));
-var PositionUtils;
-(function (PositionUtils) {
-    function isBeforeOrEqual(position, other) {
-        return compare(position, other) <= 0;
-    }
-    PositionUtils.isBeforeOrEqual = isBeforeOrEqual;
-    function compare(position, other) {
-        if (position.line === other.line) {
-            return position.character - other.character;
-        }
-        return position.line - other.line;
-    }
-    PositionUtils.compare = compare;
-    /**
-     * Given two positions, computes the relative position of the greater position against the lesser position.
-     */
-    function relativize(position, other) {
-        if (compare(position, other) > 0) {
-            [position, other] = [other, position];
-        }
-        if (position.line === other.line) {
-            return vscode_languageserver_protocol_1.Position.create(0, other.character - position.character);
-        }
-        else {
-            return vscode_languageserver_protocol_1.Position.create(other.line - position.line, other.character);
-        }
-    }
-    PositionUtils.relativize = relativize;
-    /**
-     * Resolves the given relative position against the given position and returns the resulting position.
-     */
-    function resolve(position, relativePosition) {
-        if (relativePosition.line === 0) {
-            return vscode_languageserver_protocol_1.Position.create(position.line, position.character + relativePosition.character);
-        }
-        else {
-            return vscode_languageserver_protocol_1.Position.create(position.line + relativePosition.line, relativePosition.character);
-        }
-    }
-    PositionUtils.resolve = resolve;
-})(PositionUtils || (exports.PositionUtils = PositionUtils = {}));
-//# sourceMappingURL=range-utils.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"range-utils.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-utils.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF;;;gGAGgG;AAChG,6IAA6I;AAC7I,sFAAsF;AACtF,yFAAyF;AACzF,0FAA0F;;;AAE1F,sGAAoF;AAEpF,IAAiB,UAAU,CAiD1B;AAjDD,WAAiB,UAAU;IAEvB,SAAgB,OAAO,CAAC,KAAY;QAChC,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC;IAChG,CAAC;IAFe,kBAAO,UAEtB,CAAA;IAED,SAAgB,gBAAgB,CAAC,KAAY,EAAE,QAAkB;QAC7D,IAAI,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACrE,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACnF,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,QAAQ,CAAC,SAAS,IAAI,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YAChF,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAXe,2BAAgB,mBAW/B,CAAA;IAED,SAAgB,kBAAkB,CAAC,KAAY,EAAE,KAAY;QACzD,OAAO,CACH,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI;YACjC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,IAAI;gBAChC,KAAK,CAAC,GAAG,CAAC,SAAS,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CACpD,CAAC;IACN,CAAC;IANe,6BAAkB,qBAMjC,CAAA;IAED,SAAgB,KAAK,CAAC,KAAY,EAAE,KAAY;QAC5C,MAAM,KAAK,GAAG,aAAa,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;QAClG,MAAM,GAAG,GAAG,aAAa,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;QACxF,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IAC1B,CAAC;IAJe,gBAAK,QAIpB,CAAA;IAED;;;OAGG;IACH,SAAgB,kBAAkB,CAAC,KAAY,EAAE,KAAY;QACzD,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YACxC,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;gBAClD,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;oBACpC,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC;gBACrD,CAAC;gBACD,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;YAC3C,CAAC;YACD,OAAO,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC;QACzD,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;IAC/C,CAAC;IAXe,6BAAkB,qBAWjC,CAAA;AACL,CAAC,EAjDgB,UAAU,0BAAV,UAAU,QAiD1B;AAED,IAAiB,aAAa,CAqC7B;AArCD,WAAiB,aAAa;IAE1B,SAAgB,eAAe,CAAC,QAAkB,EAAE,KAAe;QAC/D,OAAO,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAFe,6BAAe,kBAE9B,CAAA;IAED,SAAgB,OAAO,CAAC,QAAkB,EAAE,KAAe;QACvD,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;YAC/B,OAAO,QAAQ,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QAChD,CAAC;QACD,OAAO,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IACtC,CAAC;IALe,qBAAO,UAKtB,CAAA;IAED;;OAEG;IACH,SAAgB,UAAU,CAAC,QAAkB,EAAE,KAAe;QAC1D,IAAI,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;YAC/B,OAAO,yCAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QACpE,CAAC;aAAM,CAAC;YACJ,OAAO,yCAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QACxE,CAAC;IACL,CAAC;IATe,wBAAU,aASzB,CAAA;IAED;;OAEG;IACH,SAAgB,OAAO,CAAC,QAAkB,EAAE,gBAA0B;QAClE,IAAI,gBAAgB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,yCAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC3F,CAAC;aAAM,CAAC;YACJ,OAAO,yCAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9F,CAAC;IACL,CAAC;IANe,qBAAO,UAMtB,CAAA;AACL,CAAC,EArCgB,aAAa,6BAAb,aAAa,QAqC7B"}

package/lib/browser/merge-editor/view/diff-spacers.d.ts

@@ -1,50 +0,0 @@
-import { LineRangeMapping } from '../model/range-mapping';
-export interface DiffSpacers {
-    /**
-     * An array representing spacers in the original side of the diff.
-     * Indices are line numbers in the original document, and values are the height in lines of the spacer directly above the given line.
-     * If a value is missing for a line number, the corresponding spacer is assumed to have zero height.
-     */
-    originalSpacers: number[];
-    /**
-     * An array representing spacers in the modified side of the diff.
-     * Indices are line numbers in the modified document, and values are the height in lines of the spacer directly above the given line.
-     * If a value is missing for a line number, the corresponding spacer is assumed to have zero height.
-     */
-    modifiedSpacers: number[];
-    /**
-     * An array respresenting a mapping of line numbers for the diff.
-     * Indices are line numbers in the original document, and values are the corresponding line numbers in the modified document.
-     * If a value is missing for a line number, it is assumed that the line was deleted.
-     */
-    lineMapping: number[];
-}
-export type ModifiedSideSpacers = Omit<DiffSpacers, 'originalSpacers'>;
-export interface CombinedMultiDiffSpacers {
-    originalSpacers: number[];
-    modifiedSides: ModifiedSideSpacers[];
-}
-export declare class DiffSpacerService {
-    computeDiffSpacers(changes: readonly LineRangeMapping[], originalLineCount: number): DiffSpacers;
-    /**
-     * Combines multiple {@link DiffSpacers} objects into a {@link CombinedMultiDiffSpacers} object with the appropriately adjusted spacers.
-     * The given {@link DiffSpacers} objects are not modified.
-     *
-     * It is assumed that all of the given {@link DiffSpacers} objects have been computed from diffs against the same original side.
-     */
-    combineMultiDiffSpacers(multiDiffSpacers: DiffSpacers[]): CombinedMultiDiffSpacers;
-    /**
-     * Given a {@link CombinedMultiDiffSpacers} object, excludes the original side, returning the modified sides with the appropriately adjusted spacers.
-     * The given {@link CombinedMultiDiffSpacers} object is not modified.
-     */
-    excludeOriginalSide({ modifiedSides }: CombinedMultiDiffSpacers): {
-        modifiedSides: {
-            modifiedSpacers: number[];
-        }[];
-    };
-    protected checkLineMappingsHaveEqualLength(items: {
-        lineMapping: number[];
-    }[]): void;
-    protected projectLine(originalLine: number, lineMapping: number[]): number;
-}
-//# sourceMappingURL=diff-spacers.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"diff-spacers.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/view/diff-spacers.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,MAAM,WAAW,WAAW;IACxB;;;;OAIG;IACH,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B;;;;OAIG;IACH,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B;;;;OAIG;IACH,WAAW,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;AAEvE,MAAM,WAAW,wBAAwB;IACrC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,mBAAmB,EAAE,CAAC;CACxC;AAED,qBACa,iBAAiB;IAE1B,kBAAkB,CAAC,OAAO,EAAE,SAAS,gBAAgB,EAAE,EAAE,iBAAiB,EAAE,MAAM,GAAG,WAAW;IA4BhG;;;;;OAKG;IACH,uBAAuB,CAAC,gBAAgB,EAAE,WAAW,EAAE,GAAG,wBAAwB;IA6BlF;;;OAGG;IACH,mBAAmB,CAAC,EAAE,aAAa,EAAE,EAAE,wBAAwB,GAAG;QAAE,aAAa,EAAE;YAAE,eAAe,EAAE,MAAM,EAAE,CAAA;SAAE,EAAE,CAAA;KAAE;IAwBpH,SAAS,CAAC,gCAAgC,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,GAAG,IAAI;IAMpF,SAAS,CAAC,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM;CAW7E"}