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

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

@@ -0,0 +1,111 @@
+"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/lineRange.ts
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LineRange = void 0;
+const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
+/**
+ * Represents a range of whole lines of text. Line numbers are zero-based.
+ */
+class LineRange {
+    static compareByStart(a, b) {
+        return a.startLineNumber - b.startLineNumber;
+    }
+    static fromLineNumbers(startLineNumber, endExclusiveLineNumber) {
+        return new LineRange(startLineNumber, endExclusiveLineNumber - startLineNumber);
+    }
+    constructor(
+    /** A zero-based number of the start line. The range starts exactly at the beginning of this line. */
+    startLineNumber, lineCount) {
+        this.startLineNumber = startLineNumber;
+        this.lineCount = lineCount;
+        if (startLineNumber < 0 || lineCount < 0) {
+            throw new Error('Invalid line range: ' + this.toString());
+        }
+    }
+    join(other) {
+        return LineRange.fromLineNumbers(Math.min(this.startLineNumber, other.startLineNumber), Math.max(this.endLineNumberExclusive, other.endLineNumberExclusive));
+    }
+    /** A zero-based number of the end line. The range ends just before the beginning of this line. */
+    get endLineNumberExclusive() {
+        return this.startLineNumber + this.lineCount;
+    }
+    get isEmpty() {
+        return this.lineCount === 0;
+    }
+    /**
+     * Returns `false` if there is at least one line between `this` and `other`.
+     */
+    touches(other) {
+        return this.startLineNumber <= other.endLineNumberExclusive && other.startLineNumber <= this.endLineNumberExclusive;
+    }
+    isAfter(other) {
+        return this.startLineNumber >= other.endLineNumberExclusive;
+    }
+    isBefore(other) {
+        return other.startLineNumber >= this.endLineNumberExclusive;
+    }
+    delta(lineDelta) {
+        return new LineRange(this.startLineNumber + lineDelta, this.lineCount);
+    }
+    deltaStart(lineDelta) {
+        return new LineRange(this.startLineNumber + lineDelta, this.lineCount - lineDelta);
+    }
+    deltaEnd(lineDelta) {
+        return new LineRange(this.startLineNumber, this.lineCount + lineDelta);
+    }
+    toString() {
+        return `[${this.startLineNumber},${this.endLineNumberExclusive})`;
+    }
+    equals(other) {
+        return this.startLineNumber === other.startLineNumber && this.lineCount === other.lineCount;
+    }
+    contains(other) {
+        return this.startLineNumber <= other.startLineNumber && other.endLineNumberExclusive <= this.endLineNumberExclusive;
+    }
+    containsLine(lineNumber) {
+        return this.startLineNumber <= lineNumber && lineNumber < this.endLineNumberExclusive;
+    }
+    getLines(document) {
+        const result = new Array(this.lineCount);
+        for (let i = 0; i < this.lineCount; i++) {
+            result[i] = document.getLineContent(this.startLineNumber + i + 1); // note that getLineContent expects a one-based line number
+        }
+        return result;
+    }
+    toRange() {
+        return vscode_languageserver_protocol_1.Range.create(this.startLineNumber, 0, this.endLineNumberExclusive, 0);
+    }
+    toInclusiveRange() {
+        if (this.isEmpty) {
+            return undefined;
+        }
+        return vscode_languageserver_protocol_1.Range.create(this.startLineNumber, 0, this.endLineNumberExclusive - 1, vscode_languageserver_protocol_1.uinteger.MAX_VALUE);
+    }
+    toInclusiveRangeOrEmpty() {
+        if (this.isEmpty) {
+            return vscode_languageserver_protocol_1.Range.create(this.startLineNumber, 0, this.startLineNumber, 0);
+        }
+        return vscode_languageserver_protocol_1.Range.create(this.startLineNumber, 0, this.endLineNumberExclusive - 1, vscode_languageserver_protocol_1.uinteger.MAX_VALUE);
+    }
+}
+exports.LineRange = LineRange;
+//# sourceMappingURL=line-range.js.map

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

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

package/lib/browser/merge-editor/model/live-diff.d.ts

@@ -0,0 +1,26 @@
+import { Disposable, DisposableCollection } from '@theia/core';
+import { Observable } from '@theia/core/lib/common/observable';
+import { DiffComputer } from '@theia/core/lib/common/diff';
+import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
+import { DetailedLineRangeMapping } from './range-mapping';
+export declare class LiveDiff implements Disposable {
+    protected readonly originalDocument: MonacoEditorModel;
+    protected readonly modifiedDocument: MonacoEditorModel;
+    protected readonly diffComputer: DiffComputer;
+    protected recomputeCount: number;
+    protected readonly stateObservable: Observable.Settable<LiveDiffState, void>;
+    protected readonly changesObservable: Observable.Settable<readonly DetailedLineRangeMapping[], void>;
+    protected readonly toDispose: DisposableCollection;
+    constructor(originalDocument: MonacoEditorModel, modifiedDocument: MonacoEditorModel, diffComputer: DiffComputer);
+    dispose(): void;
+    get state(): LiveDiffState;
+    get changes(): readonly DetailedLineRangeMapping[];
+    protected recompute(): void;
+}
+export declare const enum LiveDiffState {
+    Initializing = 0,
+    UpToDate = 1,
+    Updating = 2,
+    Error = 3
+}
+//# sourceMappingURL=live-diff.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"live-diff.d.ts","sourceRoot":"","sources":["../../../../src/browser/merge-editor/model/live-diff.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAO,MAAM,aAAa,CAAC;AACpE,OAAO,EAAW,UAAU,EAAwC,MAAM,mCAAmC,CAAC;AAC9G,OAAO,EAAE,YAAY,EAA8B,MAAM,6BAA6B,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAgB,MAAM,iBAAiB,CAAC;AAGzE,qBAAa,QAAS,YAAW,UAAU;IAQnC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB;IACtD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB;IACtD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY;IARjD,SAAS,CAAC,cAAc,SAAK;IAC7B,SAAS,CAAC,QAAQ,CAAC,eAAe,2CAAyD;IAC3F,SAAS,CAAC,QAAQ,CAAC,iBAAiB,iEAAsE;IAC1G,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;gBAGnC,gBAAgB,EAAE,iBAAiB,EACnC,gBAAgB,EAAE,iBAAiB,EACnC,YAAY,EAAE,YAAY;IAiBjD,OAAO,IAAI,IAAI;IAIf,IAAI,KAAK,IAAI,aAAa,CAEzB;IAED,IAAI,OAAO,IAAI,SAAS,wBAAwB,EAAE,CAEjD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;CAoC9B;AAED,0BAAkB,aAAa;IAC3B,YAAY,IAAA;IACZ,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,KAAK,IAAA;CACR"}

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

@@ -0,0 +1,85 @@
+"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/textModelDiffs.ts
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LiveDiff = void 0;
+const core_1 = require("@theia/core");
+const observable_1 = require("@theia/core/lib/common/observable");
+const range_mapping_1 = require("./range-mapping");
+const line_range_1 = require("./line-range");
+class LiveDiff {
+    constructor(originalDocument, modifiedDocument, diffComputer) {
+        this.originalDocument = originalDocument;
+        this.modifiedDocument = modifiedDocument;
+        this.diffComputer = diffComputer;
+        this.recomputeCount = 0;
+        this.stateObservable = observable_1.SettableObservable.create(0 /* LiveDiffState.Initializing */);
+        this.changesObservable = observable_1.SettableObservable.create([]);
+        this.toDispose = new core_1.DisposableCollection();
+        const recomputeSignal = observable_1.ObservableSignal.create();
+        this.toDispose.push(observable_1.Autorun.create(() => {
+            recomputeSignal.get();
+            this.recompute();
+        }));
+        this.toDispose.push(originalDocument.onDidChangeContent(() => recomputeSignal.trigger()));
+        this.toDispose.push(modifiedDocument.onDidChangeContent(() => recomputeSignal.trigger()));
+    }
+    dispose() {
+        this.toDispose.dispose();
+    }
+    get state() {
+        return this.stateObservable.get();
+    }
+    get changes() {
+        return this.changesObservable.get();
+    }
+    recompute() {
+        const recomputeCount = ++this.recomputeCount;
+        if (this.stateObservable.getUntracked() !== 0 /* LiveDiffState.Initializing */) { // untracked to avoid an infinite change loop in the autorun
+            this.stateObservable.set(2 /* LiveDiffState.Updating */);
+        }
+        this.diffComputer.computeDiff(new core_1.URI(this.originalDocument.uri), new core_1.URI(this.modifiedDocument.uri)).then(diff => {
+            if (this.toDispose.disposed || this.originalDocument.isDisposed() || this.modifiedDocument.isDisposed()) {
+                return;
+            }
+            if (recomputeCount !== this.recomputeCount) {
+                // There is a newer recompute call
+                return;
+            }
+            const toLineRange = (r) => new line_range_1.LineRange(r.start, r.end - r.start);
+            const changes = diff === null || diff === void 0 ? void 0 : diff.changes.map(change => {
+                var _a;
+                return new range_mapping_1.DetailedLineRangeMapping(toLineRange(change.left), this.originalDocument, toLineRange(change.right), this.modifiedDocument, (_a = change.innerChanges) === null || _a === void 0 ? void 0 : _a.map(innerChange => new range_mapping_1.RangeMapping(innerChange.left, innerChange.right)));
+            });
+            observable_1.Observable.update(() => {
+                if (changes) {
+                    this.stateObservable.set(1 /* LiveDiffState.UpToDate */);
+                    this.changesObservable.set(changes);
+                }
+                else {
+                    this.stateObservable.set(3 /* LiveDiffState.Error */);
+                }
+            });
+        });
+    }
+}
+exports.LiveDiff = LiveDiff;
+//# sourceMappingURL=live-diff.js.map

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

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

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

@@ -0,0 +1,116 @@
+import { Disposable, DisposableCollection } from '@theia/core';
+import { Observable } from '@theia/core/lib/common/observable';
+import { DiffComputer } from '@theia/core/lib/common/diff';
+import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
+import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
+import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
+import { MergeRange, MergeRangeAcceptedState, MergeRangeResultState, MergeSide } from './merge-range';
+import { DetailedLineRangeMapping, DocumentLineRangeMap, DocumentRangeMap, LineRangeMapping, RangeMapping } from './range-mapping';
+import { LiveDiff } from './live-diff';
+import { LineRange } from './line-range';
+export declare const MergeEditorModelProps: unique symbol;
+export interface MergeEditorModelProps {
+    readonly baseEditor: MonacoEditor;
+    readonly side1Editor: MonacoEditor;
+    readonly side2Editor: MonacoEditor;
+    readonly resultEditor: MonacoEditor;
+    readonly options?: {
+        readonly resetResult?: boolean;
+    };
+}
+export declare class MergeEditorModel implements Disposable {
+    protected readonly props: MergeEditorModelProps;
+    protected readonly diffComputer: DiffComputer;
+    private readonly m2p;
+    protected readonly toDispose: DisposableCollection;
+    protected side1LiveDiff: LiveDiff;
+    protected side2LiveDiff: LiveDiff;
+    protected resultLiveDiff: LiveDiff;
+    protected shouldRecomputeHandledState: boolean;
+    protected readonly mergeRangesObservable: Observable<MergeRange[], void>;
+    get mergeRanges(): readonly MergeRange[];
+    protected readonly mergeRangesDataObservable: Observable<Map<MergeRange, MergeRangeData>, void>;
+    protected readonly side1ToResultLineRangeMapObservable: Observable<DocumentLineRangeMap, void>;
+    get side1ToResultLineRangeMap(): DocumentLineRangeMap;
+    protected readonly resultToSide1LineRangeMapObservable: Observable<DocumentLineRangeMap, void>;
+    get resultToSide1LineRangeMap(): DocumentLineRangeMap;
+    protected readonly side2ToResultLineRangeMapObservable: Observable<DocumentLineRangeMap, void>;
+    get side2ToResultLineRangeMap(): DocumentLineRangeMap;
+    protected readonly resultToSide2LineRangeMapObservable: Observable<DocumentLineRangeMap, void>;
+    get resultToSide2LineRangeMap(): DocumentLineRangeMap;
+    protected readonly baseToSide1LineRangeMapObservable: Observable<DocumentLineRangeMap, void>;
+    get baseToSide1LineRangeMap(): DocumentLineRangeMap;
+    protected readonly side1ToBaseLineRangeMapObservable: Observable<DocumentLineRangeMap, void>;
+    get side1ToBaseLineRangeMap(): DocumentLineRangeMap;
+    protected readonly baseToSide2LineRangeMapObservable: Observable<DocumentLineRangeMap, void>;
+    get baseToSide2LineRangeMap(): DocumentLineRangeMap;
+    protected readonly side2ToBaseLineRangeMapObservable: Observable<DocumentLineRangeMap, void>;
+    get side2ToBaseLineRangeMap(): DocumentLineRangeMap;
+    protected readonly baseToResultLineRangeMapObservable: Observable<DocumentLineRangeMap, void>;
+    get baseToResultLineRangeMap(): DocumentLineRangeMap;
+    protected readonly resultToBaseLineRangeMapObservable: Observable<DocumentLineRangeMap, void>;
+    get resultToBaseLineRangeMap(): DocumentLineRangeMap;
+    protected readonly baseToSide1RangeMapObservable: Observable<DocumentRangeMap, void>;
+    get baseToSide1RangeMap(): DocumentRangeMap;
+    protected readonly side1ToBaseRangeMapObservable: Observable<DocumentRangeMap, void>;
+    get side1ToBaseRangeMap(): DocumentRangeMap;
+    protected readonly baseToSide2RangeMapObservable: Observable<DocumentRangeMap, void>;
+    get baseToSide2RangeMap(): DocumentRangeMap;
+    protected readonly side2ToBaseRangeMapObservable: Observable<DocumentRangeMap, void>;
+    get side2ToBaseRangeMap(): DocumentRangeMap;
+    protected readonly baseToResultRangeMapObservable: Observable<DocumentRangeMap, void>;
+    get baseToResultRangeMap(): DocumentRangeMap;
+    protected readonly resultToBaseRangeMapObservable: Observable<DocumentRangeMap, void>;
+    get resultToBaseRangeMap(): DocumentRangeMap;
+    protected readonly diffComputingStateObservable: Observable<DiffComputingState, void>;
+    protected readonly diffComputingStateForSidesObservable: Observable<DiffComputingState, void>;
+    readonly isUpToDateObservable: Observable<boolean, void>;
+    protected readonly unhandledMergeRangesCountObservable: Observable<number, void>;
+    get unhandledMergeRangesCount(): number;
+    protected _onInitialized: Promise<void>;
+    get onInitialized(): Promise<void>;
+    get baseDocument(): MonacoEditorModel;
+    get side1Document(): MonacoEditorModel;
+    get side2Document(): MonacoEditorModel;
+    get resultDocument(): MonacoEditorModel;
+    protected get resultEditor(): MonacoEditor;
+    get side1Changes(): readonly DetailedLineRangeMapping[];
+    get side2Changes(): readonly DetailedLineRangeMapping[];
+    get resultChanges(): readonly DetailedLineRangeMapping[];
+    protected init(): void;
+    protected computeMergeRangeStateFromResult(mergeRange: MergeRange): MergeRangeResultState;
+    protected doInit(): Promise<void>;
+    dispose(): void;
+    isDisposed(): boolean;
+    reset(): Promise<void>;
+    protected computeAutoMergedResult(): string;
+    protected computeMergeRanges(): MergeRange[];
+    hasMergeRange(mergeRange: MergeRange): boolean;
+    protected getMergeRangeData(mergeRange: MergeRange): MergeRangeData;
+    getMergeRangeResultState(mergeRange: MergeRange): MergeRangeResultState;
+    applyMergeRangeAcceptedState(mergeRange: MergeRange, state: MergeRangeAcceptedState): void;
+    isMergeRangeHandled(mergeRange: MergeRange): boolean;
+    getLineRangeInResult(mergeRange: MergeRange): LineRange;
+    protected getResultLineRangeMapping(mergeRange: MergeRange): LineRangeMapping;
+    translateBaseRangeToSide(range: Range, side: MergeSide): Range;
+    translateSideRangeToBase(range: Range, side: MergeSide): Range;
+    translateBaseRangeToResult(range: Range): Range;
+    translateResultRangeToBase(range: Range): Range;
+    findMergeRanges(baseRange: LineRange): MergeRange[];
+    protected computeSideToResultDiff(sideChanges: readonly LineRangeMapping[], resultChanges: readonly LineRangeMapping[]): readonly LineRangeMapping[];
+    protected newMergeRangeData(): MergeRangeData;
+    protected newLiveDiff(originalDocument: MonacoEditorModel, modifiedDocument: MonacoEditorModel): LiveDiff;
+    protected newDocumentLineRangeMap(lineRangeMappings: readonly LineRangeMapping[]): DocumentLineRangeMap;
+    protected newDocumentRangeMap(rangeMappings: readonly RangeMapping[]): DocumentRangeMap;
+    protected getDiffComputingState(...liveDiffs: LiveDiff[]): DiffComputingState;
+}
+export declare const enum DiffComputingState {
+    Initializing = 0,
+    UpToDate = 1,
+    Updating = 2
+}
+export declare class MergeRangeData {
+    readonly resultStateObservable: Observable.Settable<MergeRangeResultState, void>;
+    readonly isHandledObservable: Observable.Settable<boolean, void>;
+}
+//# sourceMappingURL=merge-editor-model.d.ts.map

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

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