@theia/scm 1.64.0-next.28 → 1.64.0

package/src/browser/merge-editor/model/line-range.ts

@@ -0,0 +1,128 @@
+// *****************************************************************************
+// 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
+
+import { Range, uinteger } 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 class LineRange {
+    static compareByStart(a: LineRange, b: LineRange): number {
+        return a.startLineNumber - b.startLineNumber;
+    }
+
+    static fromLineNumbers(startLineNumber: number, endExclusiveLineNumber: number): LineRange {
+        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. */
+        readonly startLineNumber: number,
+        readonly lineCount: number
+    ) {
+        if (startLineNumber < 0 || lineCount < 0) {
+            throw new Error('Invalid line range: ' + this.toString());
+        }
+    }
+
+    join(other: LineRange): LineRange {
+        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(): number {
+        return this.startLineNumber + this.lineCount;
+    }
+
+    get isEmpty(): boolean {
+        return this.lineCount === 0;
+    }
+
+    /**
+     * Returns `false` if there is at least one line between `this` and `other`.
+     */
+    touches(other: LineRange): boolean {
+        return this.startLineNumber <= other.endLineNumberExclusive && other.startLineNumber <= this.endLineNumberExclusive;
+    }
+
+    isAfter(other: LineRange): boolean {
+        return this.startLineNumber >= other.endLineNumberExclusive;
+    }
+
+    isBefore(other: LineRange): boolean {
+        return other.startLineNumber >= this.endLineNumberExclusive;
+    }
+
+    delta(lineDelta: number): LineRange {
+        return new LineRange(this.startLineNumber + lineDelta, this.lineCount);
+    }
+
+    deltaStart(lineDelta: number): LineRange {
+        return new LineRange(this.startLineNumber + lineDelta, this.lineCount - lineDelta);
+    }
+
+    deltaEnd(lineDelta: number): LineRange {
+        return new LineRange(this.startLineNumber, this.lineCount + lineDelta);
+    }
+
+    toString(): string {
+        return `[${this.startLineNumber},${this.endLineNumberExclusive})`;
+    }
+
+    equals(other: LineRange): boolean {
+        return this.startLineNumber === other.startLineNumber && this.lineCount === other.lineCount;
+    }
+
+    contains(other: LineRange): boolean {
+        return this.startLineNumber <= other.startLineNumber && other.endLineNumberExclusive <= this.endLineNumberExclusive;
+    }
+
+    containsLine(lineNumber: number): boolean {
+        return this.startLineNumber <= lineNumber && lineNumber < this.endLineNumberExclusive;
+    }
+
+    getLines(document: TextEditorDocument): string[] {
+        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(): Range {
+        return Range.create(this.startLineNumber, 0, this.endLineNumberExclusive, 0);
+    }
+
+    toInclusiveRange(): Range | undefined {
+        if (this.isEmpty) {
+            return undefined;
+        }
+        return Range.create(this.startLineNumber, 0, this.endLineNumberExclusive - 1, uinteger.MAX_VALUE);
+    }
+
+    toInclusiveRangeOrEmpty(): Range {
+        if (this.isEmpty) {
+            return Range.create(this.startLineNumber, 0, this.startLineNumber, 0);
+        }
+        return Range.create(this.startLineNumber, 0, this.endLineNumberExclusive - 1, uinteger.MAX_VALUE);
+    }
+}

package/src/browser/merge-editor/model/live-diff.ts

@@ -0,0 +1,111 @@
+// *****************************************************************************
+// 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
+
+import { Disposable, DisposableCollection, URI } from '@theia/core';
+import { Autorun, Observable, ObservableSignal, SettableObservable } from '@theia/core/lib/common/observable';
+import { DiffComputer, LineRange as DiffLineRange } from '@theia/core/lib/common/diff';
+import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
+import { DetailedLineRangeMapping, RangeMapping } from './range-mapping';
+import { LineRange } from './line-range';
+
+export class LiveDiff implements Disposable {
+
+    protected recomputeCount = 0;
+    protected readonly stateObservable = SettableObservable.create(LiveDiffState.Initializing);
+    protected readonly changesObservable = SettableObservable.create<readonly DetailedLineRangeMapping[]>([]);
+    protected readonly toDispose = new DisposableCollection();
+
+    constructor(
+        protected readonly originalDocument: MonacoEditorModel,
+        protected readonly modifiedDocument: MonacoEditorModel,
+        protected readonly diffComputer: DiffComputer
+    ) {
+        const recomputeSignal = ObservableSignal.create();
+
+        this.toDispose.push(Autorun.create(() => {
+            recomputeSignal.get();
+            this.recompute();
+        }));
+
+        this.toDispose.push(originalDocument.onDidChangeContent(
+            () => recomputeSignal.trigger()
+        ));
+        this.toDispose.push(modifiedDocument.onDidChangeContent(
+            () => recomputeSignal.trigger()
+        ));
+    }
+
+    dispose(): void {
+        this.toDispose.dispose();
+    }
+
+    get state(): LiveDiffState {
+        return this.stateObservable.get();
+    }
+
+    get changes(): readonly DetailedLineRangeMapping[] {
+        return this.changesObservable.get();
+    }
+
+    protected recompute(): void {
+        const recomputeCount = ++this.recomputeCount;
+
+        if (this.stateObservable.getUntracked() !== LiveDiffState.Initializing) { // untracked to avoid an infinite change loop in the autorun
+            this.stateObservable.set(LiveDiffState.Updating);
+        }
+
+        this.diffComputer.computeDiff(new URI(this.originalDocument.uri), new 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: DiffLineRange) => new LineRange(r.start, r.end - r.start);
+            const changes = diff?.changes.map(change => new DetailedLineRangeMapping(
+                toLineRange(change.left),
+                this.originalDocument,
+                toLineRange(change.right),
+                this.modifiedDocument,
+                change.innerChanges?.map(innerChange => new RangeMapping(innerChange.left, innerChange.right))
+            ));
+
+            Observable.update(() => {
+                if (changes) {
+                    this.stateObservable.set(LiveDiffState.UpToDate);
+                    this.changesObservable.set(changes);
+                } else {
+                    this.stateObservable.set(LiveDiffState.Error);
+                }
+            });
+        });
+    }
+}
+
+export const enum LiveDiffState {
+    Initializing,
+    UpToDate,
+    Updating,
+    Error
+}