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

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

@@ -1,215 +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/modifiedBaseRange.ts
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MergeRangeAcceptedState = exports.MergeRange = void 0;
-const core_1 = require("@theia/core");
-const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
-const range_mapping_1 = require("./range-mapping");
-const range_editing_1 = require("./range-editing");
-const range_utils_1 = require("./range-utils");
-/**
- * Describes modifications in side 1 and side 2 for a specific range in base.
- */
-class MergeRange {
-    static computeMergeRanges(side1Diff, side2Diff, baseDocument, side1Document, side2Document) {
-        const alignments = range_mapping_1.MappingAlignment.computeAlignments(side1Diff, side2Diff);
-        return alignments.map(alignment => new MergeRange(alignment.baseRange, baseDocument, alignment.side1Range, alignment.side1Mappings, side1Document, alignment.side2Range, alignment.side2Mappings, side2Document));
-    }
-    constructor(baseRange, baseDocument, side1Range, side1Changes, side1Document, side2Range, side2Changes, side2Document) {
-        this.baseRange = baseRange;
-        this.baseDocument = baseDocument;
-        this.side1Range = side1Range;
-        this.side1Changes = side1Changes;
-        this.side1Document = side1Document;
-        this.side2Range = side2Range;
-        this.side2Changes = side2Changes;
-        this.side2Document = side2Document;
-        this.side1CombinedChange = range_mapping_1.DetailedLineRangeMapping.join(this.side1Changes);
-        this.side2CombinedChange = range_mapping_1.DetailedLineRangeMapping.join(this.side2Changes);
-        this.isEqualChange = core_1.ArrayUtils.equals(this.side1Changes, this.side2Changes, (a, b) => a.getLineEdit().equals(b.getLineEdit()));
-        if (side1Changes.length === 0 && side2Changes.length === 0) {
-            throw new Error('At least one change is expected');
-        }
-    }
-    getModifiedRange(side) {
-        return side === 1 ? this.side1Range : this.side2Range;
-    }
-    getCombinedChange(side) {
-        return side === 1 ? this.side1CombinedChange : this.side2CombinedChange;
-    }
-    getChanges(side) {
-        return side === 1 ? this.side1Changes : this.side2Changes;
-    }
-    get isConflicting() {
-        return this.side1Changes.length > 0 && this.side2Changes.length > 0 && !this.isEqualChange;
-    }
-    canBeSmartCombined(firstSide) {
-        return this.isConflicting && this.smartCombineChanges(firstSide) !== undefined;
-    }
-    get isSmartCombinationOrderRelevant() {
-        const edit1 = this.smartCombineChanges(1);
-        const edit2 = this.smartCombineChanges(2);
-        if (!edit1 || !edit2) {
-            return false;
-        }
-        return !edit1.equals(edit2);
-    }
-    getBaseRangeEdit(state) {
-        if (state === 'Base') {
-            return new range_editing_1.LineRangeEdit(this.baseRange, this.baseRange.getLines(this.baseDocument));
-        }
-        if (state === 'Side1') {
-            return new range_editing_1.LineRangeEdit(this.baseRange, this.side1Range.getLines(this.side1Document));
-        }
-        if (state === 'Side2') {
-            return new range_editing_1.LineRangeEdit(this.baseRange, this.side2Range.getLines(this.side2Document));
-        }
-        let edit;
-        const firstSide = state.startsWith('Side1') ? 1 : 2;
-        if (state.endsWith('Smart')) {
-            edit = this.smartCombineChanges(firstSide);
-        }
-        if (!edit) {
-            edit = this.dumbCombineChanges(firstSide);
-        }
-        return edit;
-    }
-    smartCombineChanges(firstSide) {
-        if (firstSide === 1 && this.smartCombinationEdit1) {
-            return this.smartCombinationEdit1.value;
-        }
-        else if (firstSide === 2 && this.smartCombinationEdit2) {
-            return this.smartCombinationEdit2.value;
-        }
-        const combinedChanges = this.side1Changes.flatMap(change => change.rangeMappings.map(rangeMapping => ({ rangeMapping, side: 1 }))).concat(this.side2Changes.flatMap(change => change.rangeMappings.map(rangeMapping => ({ rangeMapping, side: 2 })))).sort((a, b) => {
-            let result = range_utils_1.RangeUtils.compareUsingStarts(a.rangeMapping.originalRange, b.rangeMapping.originalRange);
-            if (result === 0) {
-                const sideWeight = (side) => side === firstSide ? 1 : 2;
-                result = sideWeight(a.side) - sideWeight(b.side);
-            }
-            return result;
-        });
-        const sortedEdits = combinedChanges.map(change => {
-            const modifiedDocument = change.side === 1 ? this.side1Document : this.side2Document;
-            return new range_editing_1.RangeEdit(change.rangeMapping.originalRange, modifiedDocument.getText(change.rangeMapping.modifiedRange));
-        });
-        const edit = this.editsToLineRangeEdit(this.baseRange, sortedEdits, this.baseDocument);
-        if (firstSide === 1) {
-            this.smartCombinationEdit1 = { value: edit };
-        }
-        else {
-            this.smartCombinationEdit2 = { value: edit };
-        }
-        return edit;
-    }
-    editsToLineRangeEdit(range, sortedEdits, document) {
-        let text = '';
-        const startsLineBefore = range.startLineNumber > 0;
-        let currentPosition = startsLineBefore
-            ? vscode_languageserver_protocol_1.Position.create(range.startLineNumber - 1, document.getLineMaxColumn((range.startLineNumber - 1) + 1) // note that getLineMaxColumn expects a 1-based line number
-            )
-            : vscode_languageserver_protocol_1.Position.create(range.startLineNumber, 0);
-        for (const edit of sortedEdits) {
-            const diffStart = edit.range.start;
-            if (!range_utils_1.PositionUtils.isBeforeOrEqual(currentPosition, diffStart)) {
-                return undefined;
-            }
-            let originalText = document.getText(vscode_languageserver_protocol_1.Range.create(currentPosition, diffStart));
-            if (diffStart.line >= document.lineCount) {
-                // getText doesn't include this virtual line break, as the document ends the line before.
-                // endsLineAfter will be false.
-                originalText += '\n';
-            }
-            text += originalText;
-            text += edit.newText;
-            currentPosition = edit.range.end;
-        }
-        const endsLineAfter = range.endLineNumberExclusive < document.lineCount;
-        const end = endsLineAfter ?
-            vscode_languageserver_protocol_1.Position.create(range.endLineNumberExclusive, 0) :
-            vscode_languageserver_protocol_1.Position.create(range.endLineNumberExclusive - 1, vscode_languageserver_protocol_1.uinteger.MAX_VALUE);
-        text += document.getText(vscode_languageserver_protocol_1.Range.create(currentPosition, end));
-        const lines = text.split(/\r\n|\r|\n/);
-        if (startsLineBefore) {
-            if (lines[0] !== '') {
-                return undefined;
-            }
-            lines.shift();
-        }
-        if (endsLineAfter) {
-            if (lines[lines.length - 1] !== '') {
-                return undefined;
-            }
-            lines.pop();
-        }
-        return new range_editing_1.LineRangeEdit(range, lines);
-    }
-    dumbCombineChanges(firstSide) {
-        if (firstSide === 1 && this.dumbCombinationEdit1) {
-            return this.dumbCombinationEdit1;
-        }
-        else if (firstSide === 2 && this.dumbCombinationEdit2) {
-            return this.dumbCombinationEdit2;
-        }
-        const modifiedLines1 = this.side1Range.getLines(this.side1Document);
-        const modifiedLines2 = this.side2Range.getLines(this.side2Document);
-        const combinedLines = firstSide === 1 ? modifiedLines1.concat(modifiedLines2) : modifiedLines2.concat(modifiedLines1);
-        const edit = new range_editing_1.LineRangeEdit(this.baseRange, combinedLines);
-        if (firstSide === 1) {
-            this.dumbCombinationEdit1 = edit;
-        }
-        else {
-            this.dumbCombinationEdit2 = edit;
-        }
-        return edit;
-    }
-}
-exports.MergeRange = MergeRange;
-var MergeRangeAcceptedState;
-(function (MergeRangeAcceptedState) {
-    function addSide(state, side, options) {
-        if (state === 'Base') {
-            return side === 1 ? 'Side1' : 'Side2';
-        }
-        if (state.includes('Side' + side)) {
-            return state;
-        }
-        if (side === 2) {
-            return (options === null || options === void 0 ? void 0 : options.smartCombination) ? 'Side1Side2Smart' : 'Side1Side2';
-        }
-        else {
-            return (options === null || options === void 0 ? void 0 : options.smartCombination) ? 'Side2Side1Smart' : 'Side2Side1';
-        }
-    }
-    MergeRangeAcceptedState.addSide = addSide;
-    function removeSide(state, side) {
-        if (!state.includes('Side' + side)) {
-            return state;
-        }
-        if (state === 'Side' + side) {
-            return 'Base';
-        }
-        return side === 1 ? 'Side2' : 'Side1';
-    }
-    MergeRangeAcceptedState.removeSide = removeSide;
-})(MergeRangeAcceptedState || (exports.MergeRangeAcceptedState = MergeRangeAcceptedState = {}));
-//# sourceMappingURL=merge-range.js.map

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

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

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

@@ -1,21 +0,0 @@
-import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
-import { LineRange } from './line-range';
-import * as monaco from '@theia/monaco-editor-core';
-/**
- * Represents an edit, expressed in whole lines:
- * At (before) {@link LineRange.startLineNumber}, delete {@link LineRange.lineCount} many lines and insert {@link newLines}.
- */
-export declare class LineRangeEdit {
-    readonly range: LineRange;
-    readonly newLines: string[];
-    constructor(range: LineRange, newLines: string[]);
-    equals(other: LineRangeEdit): boolean;
-    toRangeEdit(documentLineCount: number): RangeEdit;
-}
-export declare class RangeEdit {
-    readonly range: Range;
-    readonly newText: string;
-    constructor(range: Range, newText: string);
-    toMonacoEdit(): monaco.editor.ISingleEditOperation;
-}
-//# sourceMappingURL=range-editing.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"range-editing.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-editing.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,KAAK,EAAY,MAAM,mDAAmD,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD;;;GAGG;AACH,qBAAa,aAAa;IAElB,QAAQ,CAAC,KAAK,EAAE,SAAS;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE;gBADlB,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,MAAM,EAAE;IAG/B,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAIrC,WAAW,CAAC,iBAAiB,EAAE,MAAM,GAAG,SAAS;CAoBpD;AAED,qBAAa,SAAS;IAEd,QAAQ,CAAC,KAAK,EAAE,KAAK;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM;gBADf,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,MAAM;IAG5B,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,oBAAoB;CAYrD"}

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

@@ -1,68 +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/editing.ts
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RangeEdit = exports.LineRangeEdit = void 0;
-const core_1 = require("@theia/core");
-const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
-/**
- * Represents an edit, expressed in whole lines:
- * At (before) {@link LineRange.startLineNumber}, delete {@link LineRange.lineCount} many lines and insert {@link newLines}.
- */
-class LineRangeEdit {
-    constructor(range, newLines) {
-        this.range = range;
-        this.newLines = newLines;
-    }
-    equals(other) {
-        return this.range.equals(other.range) && core_1.ArrayUtils.equals(this.newLines, other.newLines);
-    }
-    toRangeEdit(documentLineCount) {
-        if (this.range.endLineNumberExclusive < documentLineCount) {
-            return new RangeEdit(vscode_languageserver_protocol_1.Range.create(this.range.startLineNumber, 0, this.range.endLineNumberExclusive, 0), this.newLines.map(s => s + '\n').join(''));
-        }
-        if (this.range.startLineNumber === 0) {
-            return new RangeEdit(vscode_languageserver_protocol_1.Range.create(0, 0, documentLineCount - 1, vscode_languageserver_protocol_1.uinteger.MAX_VALUE), this.newLines.join('\n'));
-        }
-        return new RangeEdit(vscode_languageserver_protocol_1.Range.create(this.range.startLineNumber - 1, vscode_languageserver_protocol_1.uinteger.MAX_VALUE, documentLineCount - 1, vscode_languageserver_protocol_1.uinteger.MAX_VALUE), this.newLines.map(s => '\n' + s).join(''));
-    }
-}
-exports.LineRangeEdit = LineRangeEdit;
-class RangeEdit {
-    constructor(range, newText) {
-        this.range = range;
-        this.newText = newText;
-    }
-    toMonacoEdit() {
-        const { start, end } = this.range;
-        return {
-            range: {
-                startLineNumber: start.line + 1,
-                startColumn: start.character + 1,
-                endLineNumber: end.line + 1,
-                endColumn: end.character + 1
-            },
-            text: this.newText
-        };
-    }
-}
-exports.RangeEdit = RangeEdit;
-//# sourceMappingURL=range-editing.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"range-editing.js","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/range-editing.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,sGAAoF;AAIpF;;;GAGG;AACH,MAAa,aAAa;IACtB,YACa,KAAgB,EAChB,QAAkB;QADlB,UAAK,GAAL,KAAK,CAAW;QAChB,aAAQ,GAAR,QAAQ,CAAU;IAC3B,CAAC;IAEL,MAAM,CAAC,KAAoB;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,iBAAU,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9F,CAAC;IAED,WAAW,CAAC,iBAAyB;QACjC,IAAI,IAAI,CAAC,KAAK,CAAC,sBAAsB,GAAG,iBAAiB,EAAE,CAAC;YACxD,OAAO,IAAI,SAAS,CAChB,sCAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,EACjF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAC5C,CAAC;QACN,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,eAAe,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,IAAI,SAAS,CAChB,sCAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,iBAAiB,GAAG,CAAC,EAAE,yCAAQ,CAAC,SAAS,CAAC,EAC7D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAC3B,CAAC;QACN,CAAC;QAED,OAAO,IAAI,SAAS,CAChB,sCAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,EAAE,yCAAQ,CAAC,SAAS,EAAE,iBAAiB,GAAG,CAAC,EAAE,yCAAQ,CAAC,SAAS,CAAC,EAC3G,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAC5C,CAAC;IACN,CAAC;CACJ;AA9BD,sCA8BC;AAED,MAAa,SAAS;IAClB,YACa,KAAY,EACZ,OAAe;QADf,UAAK,GAAL,KAAK,CAAO;QACZ,YAAO,GAAP,OAAO,CAAQ;IACxB,CAAC;IAEL,YAAY;QACR,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAClC,OAAO;YACH,KAAK,EAAE;gBACH,eAAe,EAAE,KAAK,CAAC,IAAI,GAAG,CAAC;gBAC/B,WAAW,EAAE,KAAK,CAAC,SAAS,GAAG,CAAC;gBAChC,aAAa,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC;gBAC3B,SAAS,EAAE,GAAG,CAAC,SAAS,GAAG,CAAC;aAC/B;YACD,IAAI,EAAE,IAAI,CAAC,OAAO;SACrB,CAAC;IACN,CAAC;CACJ;AAlBD,8BAkBC"}

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

@@ -1,106 +0,0 @@
-import { Position, Range, TextEditorDocument } from '@theia/editor/lib/browser/editor';
-import { LineRange } from './line-range';
-import { LineRangeEdit } from './range-editing';
-/**
- * Maps a line range in the original text document to a line range in the modified text document.
- */
-export declare class LineRangeMapping {
-    readonly originalRange: LineRange;
-    readonly modifiedRange: LineRange;
-    static join(mappings: readonly LineRangeMapping[]): LineRangeMapping | undefined;
-    constructor(originalRange: LineRange, modifiedRange: LineRange);
-    toString(): string;
-    join(other: LineRangeMapping): LineRangeMapping;
-    addModifiedLineDelta(delta: number): LineRangeMapping;
-    addOriginalLineDelta(delta: number): LineRangeMapping;
-    reverse(): LineRangeMapping;
-}
-/**
- * Represents a total monotonous mapping of line ranges in one document to another document.
- */
-export declare class DocumentLineRangeMap {
-    /**
-     * 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.
-     */
-    readonly lineRangeMappings: readonly LineRangeMapping[];
-    static betweenModifiedSides(side1Diff: readonly LineRangeMapping[], side2Diff: readonly LineRangeMapping[]): DocumentLineRangeMap;
-    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: readonly LineRangeMapping[]);
-    /**
-     * @param lineNumber 0-based line number in the original text document
-     */
-    projectLine(lineNumber: number): LineRangeMapping;
-    reverse(): DocumentLineRangeMap;
-}
-/**
- * Aligns mappings for two modified sides with a common base range.
- */
-export declare class MappingAlignment<T extends LineRangeMapping> {
-    readonly baseRange: LineRange;
-    readonly side1Range: LineRange;
-    readonly side1Mappings: readonly T[];
-    readonly side2Range: LineRange;
-    readonly side2Mappings: readonly T[];
-    static computeAlignments<T extends LineRangeMapping>(side1Mappings: readonly T[], side2Mappings: readonly T[]): MappingAlignment<T>[];
-    constructor(baseRange: LineRange, side1Range: LineRange, side1Mappings: readonly T[], side2Range: LineRange, side2Mappings: readonly T[]);
-    toString(): string;
-}
-/**
- * A line range mapping with inner range mappings.
- */
-export declare class DetailedLineRangeMapping extends LineRangeMapping {
-    readonly originalDocument: TextEditorDocument;
-    readonly modifiedDocument: TextEditorDocument;
-    static join(mappings: readonly DetailedLineRangeMapping[]): DetailedLineRangeMapping | undefined;
-    readonly rangeMappings: readonly RangeMapping[];
-    constructor(originalRange: LineRange, originalDocument: TextEditorDocument, modifiedRange: LineRange, modifiedDocument: TextEditorDocument, rangeMappings?: readonly RangeMapping[]);
-    join(other: DetailedLineRangeMapping): DetailedLineRangeMapping;
-    addModifiedLineDelta(delta: number): DetailedLineRangeMapping;
-    addOriginalLineDelta(delta: number): DetailedLineRangeMapping;
-    reverse(): DetailedLineRangeMapping;
-    getLineEdit(): LineRangeEdit;
-    getReverseLineEdit(): LineRangeEdit;
-    getModifiedLines(): string[];
-    getOriginalLines(): string[];
-}
-/**
- * Maps a range in the original text document to a range in the modified text document.
- */
-export declare class RangeMapping {
-    readonly originalRange: Readonly<Range>;
-    readonly modifiedRange: Readonly<Range>;
-    constructor(originalRange: Readonly<Range>, modifiedRange: Readonly<Range>);
-    toString(): string;
-    addModifiedLineDelta(deltaLines: number): RangeMapping;
-    addOriginalLineDelta(deltaLines: number): RangeMapping;
-    reverse(): RangeMapping;
-}
-/**
- * Represents a total monotonous mapping of ranges in one document to another document.
- */
-export declare class DocumentRangeMap {
-    /**
-     * The range mappings that define this document mapping.
-     */
-    readonly rangeMappings: readonly RangeMapping[];
-    constructor(
-    /**
-     * The range mappings that define this document mapping.
-     */
-    rangeMappings: readonly RangeMapping[]);
-    /**
-     * @param position position in the original text document
-     */
-    projectPosition(position: Position): RangeMapping;
-    /**
-     * @param range range in the original text document
-     */
-    projectRange(range: Range): RangeMapping;
-    reverse(): DocumentRangeMap;
-}
-//# sourceMappingURL=range-mapping.d.ts.map

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

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