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

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

@@ -1,560 +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
-// *****************************************************************************
-var MergeEditorSettings_1, MergeEditorOpenHandler_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MergeEditorOpenHandler = exports.MergeEditor = exports.MergeEditorSettings = exports.MergeEditorLayoutMode = exports.MergeEditorUri = void 0;
-const tslib_1 = require("tslib");
-const inversify_1 = require("@theia/core/shared/inversify");
-const core_1 = require("@theia/core");
-const browser_1 = require("@theia/core/lib/browser");
-const observable_1 = require("@theia/core/lib/common/observable");
-const merge_editor_model_1 = require("./model/merge-editor-model");
-const merge_editor_panes_1 = require("./view/merge-editor-panes");
-const merge_editor_view_zones_1 = require("./view/merge-editor-view-zones");
-const merge_editor_scroll_sync_1 = require("./view/merge-editor-scroll-sync");
-var MergeEditorUri;
-(function (MergeEditorUri) {
-    const SCHEME = 'merge-editor';
-    function isMergeEditorUri(uri) {
-        return uri.scheme === SCHEME;
-    }
-    MergeEditorUri.isMergeEditorUri = isMergeEditorUri;
-    function encode({ baseUri, side1Uri, side2Uri, resultUri }) {
-        return new core_1.URI().withScheme(SCHEME).withQuery(JSON.stringify([baseUri.toString(), side1Uri.toString(), side2Uri.toString(), resultUri.toString()]));
-    }
-    MergeEditorUri.encode = encode;
-    function decode(uri) {
-        if (uri.scheme !== SCHEME) {
-            throw new Error(`The URI must have scheme ${SCHEME}. The URI was: ${uri}`);
-        }
-        const mergeUris = JSON.parse(uri.query);
-        if (!Array.isArray(mergeUris) || !mergeUris.every(mergeUri => typeof mergeUri === 'string')) {
-            throw new Error(`The URI ${uri} is not a valid URI for scheme ${SCHEME}`);
-        }
-        return {
-            baseUri: new core_1.URI(mergeUris[0]),
-            side1Uri: new core_1.URI(mergeUris[1]),
-            side2Uri: new core_1.URI(mergeUris[2]),
-            resultUri: new core_1.URI(mergeUris[3])
-        };
-    }
-    MergeEditorUri.decode = decode;
-})(MergeEditorUri || (exports.MergeEditorUri = MergeEditorUri = {}));
-var MergeEditorLayoutMode;
-(function (MergeEditorLayoutMode) {
-    MergeEditorLayoutMode.DEFAULT = { kind: 'mixed', showBase: true, showBaseAtTop: false };
-})(MergeEditorLayoutMode || (exports.MergeEditorLayoutMode = MergeEditorLayoutMode = {}));
-let MergeEditorSettings = MergeEditorSettings_1 = class MergeEditorSettings {
-    constructor() {
-        this.layoutMode = MergeEditorLayoutMode.DEFAULT;
-    }
-    async load() {
-        await Promise.allSettled([
-            this.storageService.getData(MergeEditorSettings_1.LAYOUT_MODE, this.layoutMode).then(layoutMode => this.layoutMode = layoutMode),
-        ]);
-    }
-    async save() {
-        await Promise.allSettled([
-            this.storageService.setData(MergeEditorSettings_1.LAYOUT_MODE, this.layoutMode),
-        ]);
-    }
-};
-exports.MergeEditorSettings = MergeEditorSettings;
-MergeEditorSettings.LAYOUT_MODE = 'mergeEditor/layoutMode';
-tslib_1.__decorate([
-    (0, inversify_1.inject)(browser_1.StorageService),
-    tslib_1.__metadata("design:type", Object)
-], MergeEditorSettings.prototype, "storageService", void 0);
-exports.MergeEditorSettings = MergeEditorSettings = MergeEditorSettings_1 = tslib_1.__decorate([
-    (0, inversify_1.injectable)()
-], MergeEditorSettings);
-let MergeEditor = class MergeEditor extends browser_1.BaseWidget {
-    constructor() {
-        super(...arguments);
-        this.visibilityObservable = observable_1.SettableObservable.create(true);
-        this.currentPaneObservable = observable_1.SettableObservable.create(undefined);
-        this.layoutModeObservable = observable_1.SettableObservable.create(MergeEditorLayoutMode.DEFAULT, {
-            isEqual: (a, b) => JSON.stringify(a) === JSON.stringify(b)
-        });
-        this.currentMergeRangeObservable = this.createCurrentMergeRangeObservable();
-        this.selectionInBaseObservable = this.createSelectionInBaseObservable();
-        this.layoutInitialized = false;
-    }
-    init() {
-        this.addClass('theia-merge-editor');
-        const { baseUri, side1Uri, side2Uri, resultUri } = this;
-        this.id = MergeEditorUri.encode({ baseUri, side1Uri, side2Uri, resultUri }).toString();
-        const setLabels = () => {
-            this.title.label = core_1.nls.localizeByDefault('Merging: {0}', this.labelProvider.getName(resultUri));
-            this.title.iconClass = this.labelProvider.getIcon(resultUri) + ' file-icon';
-            this.resultPane.header.description = this.labelProvider.getLongName(resultUri);
-        };
-        setLabels();
-        this.toDispose.push(this.labelProvider.onDidChange(event => {
-            if (event.affects(resultUri)) {
-                setLabels();
-            }
-        }));
-        this.title.caption = resultUri.path.fsPath();
-        this.title.closable = true;
-        this.basePane.header.title.label = core_1.nls.localizeByDefault('Base');
-        this.side1Pane.header.title.label = core_1.nls.localizeByDefault('Input 1');
-        this.side2Pane.header.title.label = core_1.nls.localizeByDefault('Input 2');
-        this.resultPane.header.title.label = core_1.nls.localizeByDefault('Result');
-        this.panes.forEach(pane => pane.mergeEditor = this);
-        const layout = this.layout = new browser_1.PanelLayout();
-        this.verticalSplitPanel = new browser_1.SplitPanel({
-            spacing: 1, // --theia-border-width
-            orientation: 'vertical'
-        });
-        layout.addWidget(this.verticalSplitPanel);
-        this.horizontalSplitPanel = new browser_1.SplitPanel({
-            spacing: 1, // --theia-border-width
-            orientation: 'horizontal'
-        });
-        this.verticalSplitPanel.addWidget(this.horizontalSplitPanel);
-        this.layoutMode = this.settings.layoutMode;
-        this.toDispose.push(this.scrollSync = this.createScrollSynchronizer());
-        this.initCurrentPaneTracker();
-    }
-    createScrollSynchronizer() {
-        return new merge_editor_scroll_sync_1.MergeEditorScrollSync(this);
-    }
-    initCurrentPaneTracker() {
-        const focusTracker = new browser_1.FocusTracker();
-        this.toDispose.push(focusTracker);
-        focusTracker.currentChanged.connect((_, { oldValue, newValue }) => {
-            oldValue === null || oldValue === void 0 ? void 0 : oldValue.removeClass('focused');
-            newValue === null || newValue === void 0 ? void 0 : newValue.addClass('focused');
-            this.currentPaneObservable.set(newValue || undefined);
-        });
-        this.panes.forEach(pane => focusTracker.add(pane));
-    }
-    ensureLayoutInitialized() {
-        if (!this.layoutInitialized) {
-            this.layoutInitialized = true;
-            this.doInitializeLayout();
-            this.onLayoutInitialized();
-        }
-    }
-    doInitializeLayout() {
-        this.toDispose.push(observable_1.Autorun.create(({ isFirstRun }) => {
-            const { layoutMode } = this;
-            const scrollState = this.scrollSync.storeScrollState();
-            const currentPane = this.currentPaneObservable.getUntracked();
-            this.applyLayoutMode(layoutMode);
-            const pane = (currentPane === null || currentPane === void 0 ? void 0 : currentPane.isVisible) ? currentPane : this.resultPane;
-            this.currentPaneObservable.set(pane);
-            pane.activate();
-            this.scrollSync.restoreScrollState(scrollState);
-            if (!isFirstRun) {
-                this.settings.layoutMode = layoutMode;
-            }
-        }));
-        let storedState;
-        this.toDispose.push(observable_1.ObservableUtils.autorunWithDisposables(({ toDispose }) => {
-            if (this.isShown) {
-                toDispose.push(this.createViewZones());
-                if (storedState) {
-                    const { currentPane, scrollState } = storedState;
-                    storedState = undefined;
-                    const pane = currentPane !== null && currentPane !== void 0 ? currentPane : this.resultPane;
-                    this.currentPaneObservable.set(pane);
-                    pane.activate();
-                    this.scrollSync.restoreScrollState(scrollState);
-                }
-                else {
-                    this.scrollSync.update();
-                }
-            }
-            else {
-                storedState = {
-                    scrollState: this.scrollSync.storeScrollState(),
-                    currentPane: this.currentPaneObservable.getUntracked()
-                };
-            }
-        }));
-    }
-    onLayoutInitialized() {
-        const shouldGoToInitialMergeRange = () => {
-            var _a;
-            const { cursorPosition } = (_a = this.currentPane) !== null && _a !== void 0 ? _a : this.resultPane;
-            return cursorPosition.line === 0 && cursorPosition.character === 0;
-        };
-        if (shouldGoToInitialMergeRange()) {
-            this.model.onInitialized.then(() => {
-                if (!this.isDisposed && shouldGoToInitialMergeRange()) {
-                    this.goToFirstMergeRange(mergeRange => !this.model.isMergeRangeHandled(mergeRange));
-                }
-            });
-        }
-    }
-    onResize(msg) {
-        super.onResize(msg);
-        if (msg.width >= 0 && msg.height >= 0) {
-            // Don't try to initialize layout until the merge editor itself is positioned.
-            // Otherwise, SplitPanel.setRelativeSizes might not work properly when initializing layout.
-            this.ensureLayoutInitialized();
-        }
-    }
-    get isShown() {
-        return this.visibilityObservable.get();
-    }
-    get currentPane() {
-        return this.currentPaneObservable.get();
-    }
-    createCurrentMergeRangeObservable() {
-        return observable_1.DerivedObservable.create(() => {
-            const { currentPane } = this;
-            if (!currentPane) {
-                return undefined;
-            }
-            const { cursorLine } = currentPane;
-            return this.model.mergeRanges.find(mergeRange => {
-                const lineRange = currentPane.getLineRangeForMergeRange(mergeRange);
-                return lineRange.isEmpty ? lineRange.startLineNumber === cursorLine : lineRange.containsLine(cursorLine);
-            });
-        });
-    }
-    get currentMergeRange() {
-        return this.currentMergeRangeObservable.get();
-    }
-    createSelectionInBaseObservable() {
-        return observable_1.DerivedObservable.create(() => {
-            var _a;
-            const { currentPane } = this;
-            return (_a = currentPane === null || currentPane === void 0 ? void 0 : currentPane.selection) === null || _a === void 0 ? void 0 : _a.map(range => {
-                if (currentPane === this.side1Pane) {
-                    return this.model.translateSideRangeToBase(range, 1);
-                }
-                if (currentPane === this.side2Pane) {
-                    return this.model.translateSideRangeToBase(range, 2);
-                }
-                if (currentPane === this.resultPane) {
-                    return this.model.translateResultRangeToBase(range);
-                }
-                return range;
-            });
-        });
-    }
-    get selectionInBase() {
-        return this.selectionInBaseObservable.get();
-    }
-    get panes() {
-        return [this.basePane, this.side1Pane, this.side2Pane, this.resultPane];
-    }
-    get baseUri() {
-        return this.basePane.editor.uri;
-    }
-    get side1Uri() {
-        return this.side1Pane.editor.uri;
-    }
-    get side1Title() {
-        return this.side1Pane.header.title.label;
-    }
-    get side2Uri() {
-        return this.side2Pane.editor.uri;
-    }
-    get side2Title() {
-        return this.side2Pane.header.title.label;
-    }
-    get resultUri() {
-        return this.resultPane.editor.uri;
-    }
-    storeState() {
-        const getSideState = ({ header }) => ({
-            title: header.title.label,
-            description: header.description,
-            detail: header.detail
-        });
-        return {
-            layoutMode: this.layoutMode,
-            side1State: getSideState(this.side1Pane),
-            side2State: getSideState(this.side2Pane)
-        };
-    }
-    restoreState(state) {
-        const { layoutMode, side1State, side2State } = state;
-        if (layoutMode) {
-            this.layoutMode = layoutMode;
-        }
-        const restoreSideState = ({ header }, { title, description, detail }) => {
-            if (title) {
-                header.title.label = title;
-            }
-            if (description) {
-                header.description = description;
-            }
-            if (detail) {
-                header.detail = detail;
-            }
-        };
-        if (side1State) {
-            restoreSideState(this.side1Pane, side1State);
-        }
-        if (side2State) {
-            restoreSideState(this.side2Pane, side2State);
-        }
-    }
-    get saveable() {
-        return this.resultPane.editor.document;
-    }
-    getResourceUri() {
-        return this.resultUri;
-    }
-    createMoveToUri(resourceUri) {
-        const { baseUri, side1Uri, side2Uri, resultUri } = this;
-        return MergeEditorUri.encode({ baseUri, side1Uri, side2Uri, resultUri: resultUri.withPath(resourceUri.path) });
-    }
-    getTrackableWidgets() {
-        return this.panes.map(pane => pane.editorWidget);
-    }
-    goToFirstMergeRange(predicate = () => true) {
-        var _a;
-        const firstMergeRange = this.model.mergeRanges.find(mergeRange => predicate(mergeRange));
-        if (firstMergeRange) {
-            const pane = (_a = this.currentPane) !== null && _a !== void 0 ? _a : this.resultPane;
-            pane.goToMergeRange(firstMergeRange);
-        }
-    }
-    goToNextMergeRange(predicate = () => true) {
-        var _a;
-        const pane = (_a = this.currentPane) !== null && _a !== void 0 ? _a : this.resultPane;
-        const lineNumber = pane.cursorLine;
-        const nextMergeRange = this.model.mergeRanges.find(mergeRange => predicate(mergeRange) && pane.getLineRangeForMergeRange(mergeRange).startLineNumber > lineNumber) ||
-            this.model.mergeRanges.find(mergeRange => predicate(mergeRange));
-        if (nextMergeRange) {
-            pane.goToMergeRange(nextMergeRange);
-        }
-    }
-    goToPreviousMergeRange(predicate = () => true) {
-        var _a;
-        const pane = (_a = this.currentPane) !== null && _a !== void 0 ? _a : this.resultPane;
-        const lineNumber = pane.cursorLine;
-        const previousMergeRange = core_1.ArrayUtils.findLast(this.model.mergeRanges, mergeRange => predicate(mergeRange) && pane.getLineRangeForMergeRange(mergeRange).endLineNumberExclusive <= lineNumber) ||
-            core_1.ArrayUtils.findLast(this.model.mergeRanges, mergeRange => predicate(mergeRange));
-        if (previousMergeRange) {
-            pane.goToMergeRange(previousMergeRange);
-        }
-    }
-    get layoutMode() {
-        return this.layoutModeObservable.get();
-    }
-    set layoutMode(value) {
-        this.layoutModeObservable.set(value);
-    }
-    get layoutKind() {
-        return this.layoutMode.kind;
-    }
-    set layoutKind(kind) {
-        this.layoutMode = {
-            ...this.layoutMode,
-            kind
-        };
-    }
-    get isShowingBase() {
-        return this.layoutMode.showBase;
-    }
-    get isShowingBaseAtTop() {
-        const { layoutMode } = this;
-        return layoutMode.showBase && layoutMode.showBaseAtTop;
-    }
-    toggleShowBase() {
-        const { layoutMode } = this;
-        this.layoutMode = {
-            ...layoutMode,
-            showBase: !layoutMode.showBase
-        };
-    }
-    toggleShowBaseTop() {
-        const { layoutMode } = this;
-        const isToggled = layoutMode.showBase && layoutMode.showBaseAtTop;
-        this.layoutMode = {
-            ...layoutMode,
-            showBaseAtTop: true,
-            showBase: !isToggled,
-        };
-    }
-    toggleShowBaseCenter() {
-        const { layoutMode } = this;
-        const isToggled = layoutMode.showBase && !layoutMode.showBaseAtTop;
-        this.layoutMode = {
-            ...layoutMode,
-            showBaseAtTop: false,
-            showBase: !isToggled,
-        };
-    }
-    get shouldAlignResult() {
-        return this.layoutKind === 'columns';
-    }
-    get shouldAlignBase() {
-        const { layoutMode } = this;
-        return layoutMode.kind === 'mixed' && layoutMode.showBase && !layoutMode.showBaseAtTop;
-    }
-    applyLayoutMode(layoutMode) {
-        const oldVerticalSplitWidgets = [...this.verticalSplitPanel.widgets];
-        if (!layoutMode.showBase) {
-            // eslint-disable-next-line no-null/no-null
-            this.basePane.parent = null;
-        }
-        this.horizontalSplitPanel.insertWidget(0, this.side1Pane);
-        this.horizontalSplitPanel.insertWidget(2, this.side2Pane);
-        let horizontalSplitRatio = [50, 50];
-        let verticalSplitRatio;
-        if (layoutMode.kind === 'columns') {
-            horizontalSplitRatio = [33, 34, 33];
-            verticalSplitRatio = [100];
-            this.horizontalSplitPanel.insertWidget(1, this.resultPane);
-            if (layoutMode.showBase) {
-                verticalSplitRatio = [30, 70];
-                this.verticalSplitPanel.insertWidget(0, this.basePane);
-            }
-        }
-        else {
-            verticalSplitRatio = [45, 55];
-            if (layoutMode.showBase) {
-                if (layoutMode.showBaseAtTop) {
-                    verticalSplitRatio = [30, 33, 37];
-                    this.verticalSplitPanel.insertWidget(0, this.basePane);
-                }
-                else {
-                    horizontalSplitRatio = [33, 34, 33];
-                    this.horizontalSplitPanel.insertWidget(1, this.basePane);
-                }
-            }
-            this.verticalSplitPanel.insertWidget(2, this.resultPane);
-        }
-        this.horizontalSplitPanel.setRelativeSizes(horizontalSplitRatio);
-        // Keep the existing vertical split ratio if the layout mode change has not affected the vertical split layout.
-        if (!core_1.ArrayUtils.equals(oldVerticalSplitWidgets, this.verticalSplitPanel.widgets)) {
-            this.verticalSplitPanel.setRelativeSizes(verticalSplitRatio);
-        }
-    }
-    createViewZones() {
-        const { baseViewZones, side1ViewZones, side2ViewZones, resultViewZones } = this.viewZoneComputer.computeViewZones(this);
-        const toDispose = new core_1.DisposableCollection();
-        const addViewZones = (pane, viewZones) => {
-            const editor = pane.editor.getControl();
-            const viewZoneIds = [];
-            toDispose.push(core_1.Disposable.create(() => {
-                editor.changeViewZones(accessor => {
-                    for (const viewZoneId of viewZoneIds) {
-                        accessor.removeZone(viewZoneId);
-                    }
-                });
-            }));
-            editor.changeViewZones(accessor => {
-                const ctx = {
-                    createViewZone: viewZone => viewZoneIds.push(accessor.addZone(viewZone)),
-                    register: disposable => toDispose.push(disposable)
-                };
-                for (const viewZone of viewZones) {
-                    viewZone.create(ctx);
-                }
-            });
-        };
-        addViewZones(this.basePane, baseViewZones);
-        addViewZones(this.side1Pane, side1ViewZones);
-        addViewZones(this.side2Pane, side2ViewZones);
-        addViewZones(this.resultPane, resultViewZones);
-        return toDispose;
-    }
-    onBeforeHide(msg) {
-        this.visibilityObservable.set(false);
-    }
-    onAfterShow(msg) {
-        this.visibilityObservable.set(true);
-    }
-    onActivateRequest(msg) {
-        super.onActivateRequest(msg);
-        const { currentPane } = this;
-        if (currentPane) {
-            currentPane.activate();
-        }
-        else {
-            this.resultPane.activate();
-        }
-    }
-};
-exports.MergeEditor = MergeEditor;
-tslib_1.__decorate([
-    (0, inversify_1.inject)(merge_editor_model_1.MergeEditorModel),
-    tslib_1.__metadata("design:type", merge_editor_model_1.MergeEditorModel)
-], MergeEditor.prototype, "model", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(merge_editor_panes_1.MergeEditorBasePane),
-    tslib_1.__metadata("design:type", merge_editor_panes_1.MergeEditorBasePane)
-], MergeEditor.prototype, "basePane", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(merge_editor_panes_1.MergeEditorSide1Pane),
-    tslib_1.__metadata("design:type", merge_editor_panes_1.MergeEditorSide1Pane)
-], MergeEditor.prototype, "side1Pane", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(merge_editor_panes_1.MergeEditorSide2Pane),
-    tslib_1.__metadata("design:type", merge_editor_panes_1.MergeEditorSide2Pane)
-], MergeEditor.prototype, "side2Pane", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(merge_editor_panes_1.MergeEditorResultPane),
-    tslib_1.__metadata("design:type", merge_editor_panes_1.MergeEditorResultPane)
-], MergeEditor.prototype, "resultPane", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(merge_editor_view_zones_1.MergeEditorViewZoneComputer),
-    tslib_1.__metadata("design:type", merge_editor_view_zones_1.MergeEditorViewZoneComputer)
-], MergeEditor.prototype, "viewZoneComputer", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(MergeEditorSettings),
-    tslib_1.__metadata("design:type", MergeEditorSettings)
-], MergeEditor.prototype, "settings", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(browser_1.LabelProvider),
-    tslib_1.__metadata("design:type", browser_1.LabelProvider)
-], MergeEditor.prototype, "labelProvider", 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)
-], MergeEditor.prototype, "init", null);
-exports.MergeEditor = MergeEditor = tslib_1.__decorate([
-    (0, inversify_1.injectable)()
-], MergeEditor);
-let MergeEditorOpenHandler = MergeEditorOpenHandler_1 = class MergeEditorOpenHandler extends browser_1.NavigatableWidgetOpenHandler {
-    constructor() {
-        super(...arguments);
-        this.id = MergeEditorOpenHandler_1.ID;
-        this.label = core_1.nls.localizeByDefault('Merge Editor');
-    }
-    canHandle(uri, options) {
-        return MergeEditorUri.isMergeEditorUri(uri) ? 1000 : 0;
-    }
-    open(uri, options) {
-        return super.open(uri, options);
-    }
-    async getOrCreateWidget(uri, options) {
-        const widget = await super.getOrCreateWidget(uri, options);
-        if (options === null || options === void 0 ? void 0 : options.widgetState) {
-            widget.restoreState(options.widgetState);
-        }
-        return widget;
-    }
-};
-exports.MergeEditorOpenHandler = MergeEditorOpenHandler;
-MergeEditorOpenHandler.ID = 'merge-editor-opener';
-exports.MergeEditorOpenHandler = MergeEditorOpenHandler = MergeEditorOpenHandler_1 = tslib_1.__decorate([
-    (0, inversify_1.injectable)()
-], MergeEditorOpenHandler);
-//# sourceMappingURL=merge-editor.js.map

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

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

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

@@ -1,37 +0,0 @@
-import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
-import { TextEditorDocument } from '@theia/editor/lib/browser/editor';
-/**
- * Represents a range of whole lines of text. Line numbers are zero-based.
- */
-export declare class LineRange {
-    /** A zero-based number of the start line. The range starts exactly at the beginning of this line. */
-    readonly startLineNumber: number;
-    readonly lineCount: number;
-    static compareByStart(a: LineRange, b: LineRange): number;
-    static fromLineNumbers(startLineNumber: number, endExclusiveLineNumber: number): LineRange;
-    constructor(
-    /** A zero-based number of the start line. The range starts exactly at the beginning of this line. */
-    startLineNumber: number, lineCount: number);
-    join(other: LineRange): LineRange;
-    /** A zero-based number of the end line. The range ends just before the beginning of this line. */
-    get endLineNumberExclusive(): number;
-    get isEmpty(): boolean;
-    /**
-     * Returns `false` if there is at least one line between `this` and `other`.
-     */
-    touches(other: LineRange): boolean;
-    isAfter(other: LineRange): boolean;
-    isBefore(other: LineRange): boolean;
-    delta(lineDelta: number): LineRange;
-    deltaStart(lineDelta: number): LineRange;
-    deltaEnd(lineDelta: number): LineRange;
-    toString(): string;
-    equals(other: LineRange): boolean;
-    contains(other: LineRange): boolean;
-    containsLine(lineNumber: number): boolean;
-    getLines(document: TextEditorDocument): string[];
-    toRange(): Range;
-    toInclusiveRange(): Range | undefined;
-    toInclusiveRangeOrEmpty(): Range;
-}
-//# sourceMappingURL=line-range.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"line-range.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/line-range.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,KAAK,EAAY,MAAM,mDAAmD,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE;;GAEG;AACH,qBAAa,SAAS;IAUd,qGAAqG;IACrG,QAAQ,CAAC,eAAe,EAAE,MAAM;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM;IAX9B,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,GAAG,MAAM;IAIzD,MAAM,CAAC,eAAe,CAAC,eAAe,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,GAAG,SAAS;;IAKtF,qGAAqG;IAC5F,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM;IAO9B,IAAI,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS;IAIjC,kGAAkG;IAClG,IAAI,sBAAsB,IAAI,MAAM,CAEnC;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED;;OAEG;IACH,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO;IAIlC,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO;IAIlC,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO;IAInC,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;IAInC,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;IAIxC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;IAItC,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO;IAIjC,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO;IAInC,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAIzC,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM,EAAE;IAQhD,OAAO,IAAI,KAAK;IAIhB,gBAAgB,IAAI,KAAK,GAAG,SAAS;IAOrC,uBAAuB,IAAI,KAAK;CAMnC"}