@theia/scm 1.71.0-next.72 → 1.71.0

package/lib/browser/scm-history-graph-helpers.js

@@ -0,0 +1,167 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.laneColor = laneColor;
+exports.getChangeStatus = getChangeStatus;
+exports.getFileName = getFileName;
+exports.getFilePath = getFilePath;
+exports.getRepoRelativePath = getRepoRelativePath;
+exports.getRefBadgeClass = getRefBadgeClass;
+exports.isTagRef = isTagRef;
+exports.isRemoteRef = isRemoteRef;
+exports.getLocalNameFromRemote = getLocalNameFromRemote;
+exports.deduplicateRefs = deduplicateRefs;
+/**
+ * Returns the CSS color variable for the given lane index.
+ * Uses Theia's `--theia-scmGraph-*` variables, mirroring the VS Code
+ * scm graph color scheme:
+ *   lane 0 (current ref)  → historyItemRefColor
+ *   lane 1 (remote ref)   → historyItemRemoteRefColor
+ *   lane 2 (base ref)     → historyItemBaseRefColor
+ *   lane 3–7              → foreground1–5
+ */
+function laneColor(index) {
+    switch (index % 8) {
+        case 0: return 'var(--theia-scmGraph-historyItemRefColor)';
+        case 1: return 'var(--theia-scmGraph-historyItemRemoteRefColor)';
+        case 2: return 'var(--theia-scmGraph-historyItemBaseRefColor)';
+        case 3: return 'var(--theia-scmGraph-foreground1)';
+        case 4: return 'var(--theia-scmGraph-foreground2)';
+        case 5: return 'var(--theia-scmGraph-foreground3)';
+        case 6: return 'var(--theia-scmGraph-foreground4)';
+        default: return 'var(--theia-scmGraph-foreground5)';
+    }
+}
+function getChangeStatus(change) {
+    if (!change.originalUri) {
+        return 'A';
+    }
+    if (!change.modifiedUri) {
+        return 'D';
+    }
+    if (change.renameUri) {
+        return 'R';
+    }
+    return 'M';
+}
+function getFileName(uri) {
+    const parts = uri.split('/');
+    return parts[parts.length - 1] || uri;
+}
+function getFilePath(uri) {
+    try {
+        const u = new URL(uri);
+        return u.pathname;
+    }
+    catch {
+        return uri;
+    }
+}
+/**
+ * Returns the repo-relative path of the given URI, stripping the rootUri prefix.
+ * Falls back to the full path if rootUri is unavailable or doesn't match.
+ */
+function getRepoRelativePath(uri, rootUri) {
+    const fullPath = getFilePath(uri);
+    if (!rootUri) {
+        return fullPath;
+    }
+    const rootPath = getFilePath(rootUri);
+    // Normalize: ensure rootPath ends with '/'
+    const rootPrefix = rootPath.endsWith('/') ? rootPath : rootPath + '/';
+    if (fullPath.startsWith(rootPrefix)) {
+        return fullPath.slice(rootPrefix.length);
+    }
+    return fullPath;
+}
+function getRefBadgeClass(ref) {
+    const cat = (ref.category ?? '').toLowerCase();
+    if (cat === 'heads' || cat === 'head' || ref.id.startsWith('refs/heads/')) {
+        return 'head';
+    }
+    if (cat === 'remotes' || cat === 'remote' || ref.id.startsWith('refs/remotes/')) {
+        return 'remote';
+    }
+    if (cat === 'tags' || cat === 'tag' || ref.id.startsWith('refs/tags/')) {
+        return 'tag';
+    }
+    if (cat === 'base') {
+        return 'base';
+    }
+    return 'head';
+}
+function isTagRef(ref) {
+    const cat = (ref.category ?? '').toLowerCase();
+    if (cat === 'tags' || cat === 'tag') {
+        return true;
+    }
+    // Fall back to checking the ref id prefix (e.g. 'refs/tags/v1.0')
+    return ref.id.startsWith('refs/tags/');
+}
+function isRemoteRef(ref) {
+    const cat = (ref.category ?? '').toLowerCase();
+    if (cat === 'remotes' || cat === 'remote') {
+        return true;
+    }
+    // Fall back to checking the ref id prefix (e.g. 'refs/remotes/origin/main')
+    return ref.id.startsWith('refs/remotes/');
+}
+/**
+ * Extracts the local branch name from a remote ref name like "origin/master" → "master".
+ * Falls back to the full name if no slash is found.
+ */
+function getLocalNameFromRemote(remoteName) {
+    const slashIdx = remoteName.indexOf('/');
+    return slashIdx >= 0 ? remoteName.slice(slashIdx + 1) : remoteName;
+}
+/**
+ * Deduplicates refs: when a local branch (e.g. "master") and a remote branch
+ * (e.g. "origin/master") both appear, collapse them into one entry with `hasBoth=true`.
+ * Tags and other ref types are passed through unchanged.
+ */
+function deduplicateRefs(refs) {
+    const localNames = new Set();
+    for (const ref of refs) {
+        if (!isRemoteRef(ref) && !isTagRef(ref)) {
+            localNames.add(ref.name.toLowerCase());
+        }
+    }
+    const result = [];
+    const suppressedRemotes = new Set();
+    // First pass: identify remote refs that have a matching local branch
+    for (const ref of refs) {
+        if (isRemoteRef(ref)) {
+            const localName = getLocalNameFromRemote(ref.name).toLowerCase();
+            if (localNames.has(localName)) {
+                suppressedRemotes.add(ref.id);
+            }
+        }
+    }
+    // Second pass: emit all refs except suppressed remote ones;
+    // mark local branches that have a matching remote with hasBoth=true
+    for (const ref of refs) {
+        if (suppressedRemotes.has(ref.id)) {
+            continue;
+        }
+        const hasBoth = !isRemoteRef(ref) && !isTagRef(ref)
+            ? refs.some(r => isRemoteRef(r) && getLocalNameFromRemote(r.name).toLowerCase() === ref.name.toLowerCase())
+            : false;
+        result.push({ ref, hasBoth });
+    }
+    return result;
+}
+//# sourceMappingURL=scm-history-graph-helpers.js.map

package/lib/browser/scm-history-graph-helpers.js.map

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

package/lib/browser/scm-history-graph-lanes.d.ts

@@ -0,0 +1,59 @@
+/**
+ * DAG graph lane computation for SCM commit history visualization.
+ *
+ * Each row in the graph has:
+ * - `lane`: the column index where the commit circle is drawn
+ * - `color`: a lane index (0-7) used to pick a CSS color variable
+ * - `edges`: segments to draw on this row — each segment connects two lane
+ *   positions and carries a color and type
+ *
+ * Edge types determine how each segment is rendered in the SVG:
+ * - `'pass-through'`: straight vertical line through the full row height
+ * - `'branch-out'`:  bezier curve starting at the commit's Y (mid-row),
+ *                    sweeping down to the new lane at the bottom of the row
+ * - `'merge-in'`:    bezier curve starting at the source lane at the top of
+ *                    the row, sweeping into the commit's Y (mid-row)
+ */
+export type GraphEdgeType = 'pass-through' | 'branch-out' | 'merge-in';
+export interface GraphEdge {
+    /** Source lane position (top of the row for pass-through/merge-in; commit lane for branch-out). */
+    readonly fromLane: number;
+    /** Target lane position (bottom of the row for pass-through/branch-out; commit lane for merge-in). */
+    readonly toLane: number;
+    /** Color index (0–7) for this edge. */
+    readonly color: number;
+    /** How this edge should be rendered in the SVG. */
+    readonly type: GraphEdgeType;
+}
+export interface GraphRow {
+    /** Lane index where the commit node is rendered. */
+    readonly lane: number;
+    /** Color index for the commit node dot. */
+    readonly color: number;
+    /** Edges crossing or originating on this row. */
+    readonly edges: readonly GraphEdge[];
+    /**
+     * Whether the commit's lane continues downward (i.e. first parent stays in
+     * the same lane). When false, no bottom line segment is drawn below the
+     * commit circle (root commit or merge convergence where the lane is freed).
+     */
+    readonly hasContinuation: boolean;
+    /**
+     * Whether there is an incoming line from above on the commit's lane (i.e.
+     * the commit was referenced as a parent by an earlier row). When false,
+     * no top line segment is drawn above the commit circle.
+     */
+    readonly hasTopLine: boolean;
+}
+/**
+ * Compute graph rows for an ordered list of commits (topological order,
+ * newest first). Each commit must supply its own `id` and `parentIds`.
+ *
+ * @param commits Topologically sorted commits (newest → oldest).
+ * @returns One `GraphRow` per commit in the same order.
+ */
+export declare function computeGraphRows(commits: ReadonlyArray<{
+    id: string;
+    parentIds?: readonly string[];
+}>): GraphRow[];
+//# sourceMappingURL=scm-history-graph-lanes.d.ts.map

package/lib/browser/scm-history-graph-lanes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scm-history-graph-lanes.d.ts","sourceRoot":"","sources":["../../src/browser/scm-history-graph-lanes.ts"],"names":[],"mappings":"AAgBA;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,MAAM,aAAa,GAAG,cAAc,GAAG,YAAY,GAAG,UAAU,CAAC;AAEvE,MAAM,WAAW,SAAS;IACtB,mGAAmG;IACnG,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,sGAAsG;IACtG,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,uCAAuC;IACvC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,mDAAmD;IACnD,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,QAAQ;IACrB,oDAAoD;IACpD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,iDAAiD;IACjD,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAC;IACrC;;;;OAIG;IACH,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC;;;;OAIG;IACH,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAChC;AAaD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC5B,OAAO,EAAE,aAAa,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC,GACtE,QAAQ,EAAE,CAoKZ"}

package/lib/browser/scm-history-graph-lanes.js

@@ -0,0 +1,183 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.computeGraphRows = computeGraphRows;
+/**
+ * Compute graph rows for an ordered list of commits (topological order,
+ * newest first). Each commit must supply its own `id` and `parentIds`.
+ *
+ * @param commits Topologically sorted commits (newest → oldest).
+ * @returns One `GraphRow` per commit in the same order.
+ */
+function computeGraphRows(commits) {
+    // lanes[i] = id of commit that "owns" lane i (i.e. we are waiting for this
+    // commit to appear in the list so we can close the lane).
+    const lanes = [];
+    // laneColors[i] = the color index permanently assigned to lane i
+    const laneColors = [];
+    const rows = [];
+    for (const commit of commits) {
+        const parentIds = commit.parentIds ?? [];
+        // --- 1. Find or assign a lane for this commit -----------------------
+        let myLane = lanes.indexOf(commit.id);
+        // hasTopLine: true when this commit was already reserved as a parent by
+        // an earlier row — meaning there IS a connection coming from above.
+        const hasTopLine = myLane !== -1;
+        if (myLane === -1) {
+            // Not yet tracked → open a new lane
+            myLane = firstFreeLane(lanes);
+            lanes[myLane] = commit.id;
+            laneColors[myLane] = myLane % 8;
+        }
+        const myColor = laneColors[myLane] ?? myLane % 8;
+        // Collect any duplicate lane occupants: other lanes that were kept
+        // alive pointing at this same commit (sibling branch tips whose lane
+        // was preserved until the parent row).  These emit merge-in edges and
+        // are freed before the pass-through snapshot so they don't appear as
+        // spurious pass-through lines on this row.
+        const duplicateLanes = [];
+        if (hasTopLine) {
+            for (let li = 0; li < lanes.length; li++) {
+                if (lanes[li] === commit.id && li !== myLane) {
+                    duplicateLanes.push({ lane: li, color: laneColors[li] ?? li % 8 });
+                    lanes[li] = undefined;
+                    laneColors[li] = undefined;
+                }
+            }
+        }
+        // --- 2. Snapshot current lane state before mutations ----------------
+        const lanesCopy = lanes.slice();
+        // --- 3. Determine parent lane assignments ---------------------------
+        const parentLanes = [];
+        // Track which parents were ALREADY in existing lanes (merge-in) vs new
+        const parentIsExisting = [];
+        for (let pi = 0; pi < parentIds.length; pi++) {
+            const pid = parentIds[pi];
+            const parentLane = lanesCopy.indexOf(pid);
+            if (parentLane !== -1 && parentLane !== myLane) {
+                if (hasTopLine) {
+                    // Pre-reserved commit: parent already has a lane → merge-in edge on this row.
+                    parentLanes.push(parentLane);
+                    parentIsExisting.push(true);
+                }
+                else {
+                    // Non-pre-reserved sibling branch tip: keep this lane alive so it
+                    // passes through as a pass-through line until the parent row, where
+                    // a merge-in is emitted via the duplicateLanes mechanism.
+                    // No edge is emitted here; record myLane so hasContinuation is true.
+                    lanes[myLane] = pid;
+                    parentLanes.push(myLane);
+                    parentIsExisting.push(false);
+                }
+            }
+            else if (parentLane === myLane) {
+                // First parent inherits this lane (fast-forward) — straight down
+                parentLanes.push(myLane);
+                parentIsExisting.push(false); // treated as inline continuation
+            }
+            else {
+                // New parent → assign a lane
+                if (pi === 0) {
+                    // First parent continues in the same lane
+                    lanes[myLane] = pid;
+                    // Keep the same color as myLane for the first parent
+                    parentLanes.push(myLane);
+                    parentIsExisting.push(false);
+                }
+                else {
+                    // Additional parents get new lanes — branch-out
+                    const newLane = firstFreeLane(lanes);
+                    lanes[newLane] = pid;
+                    laneColors[newLane] = newLane % 8;
+                    parentLanes.push(newLane);
+                    parentIsExisting.push(false);
+                }
+            }
+        }
+        // If the commit has no parents (root commit), free the lane
+        if (parentIds.length === 0) {
+            lanes[myLane] = undefined;
+            laneColors[myLane] = undefined;
+        }
+        else if (!parentLanes.includes(myLane)) {
+            // No parent inherited myLane — decide whether to free or keep the lane.
+            if (hasTopLine) {
+                // Pre-reserved commit (merge convergence): free the lane immediately.
+                lanes[myLane] = undefined;
+                laneColors[myLane] = undefined;
+            }
+            else {
+                // Non-pre-reserved sibling branch tip: keep the lane alive pointing
+                // at the first parent so it persists as a pass-through until the
+                // parent row.  At the parent row, the duplicate lane occupant is
+                // detected and a merge-in edge is emitted there instead.
+                lanes[myLane] = parentIds[0];
+            }
+        }
+        // --- 4. Emit edges --------------------------------------------------
+        const edges = [];
+        // Pass-through lines: lanes that were occupied before this row and
+        // are NOT the commit's own lane continue straight through.
+        for (let li = 0; li < lanesCopy.length; li++) {
+            const occupant = lanesCopy[li];
+            if (!occupant || occupant === commit.id) {
+                continue;
+            }
+            const color = laneColors[li] ?? li % 8;
+            edges.push({ fromLane: li, toLane: li, color, type: 'pass-through' });
+        }
+        for (let pi = 0; pi < parentIds.length; pi++) {
+            const toLane = parentLanes[pi];
+            const isExisting = parentIsExisting[pi];
+            if (toLane === myLane) {
+                // First parent continues in the same lane — no edge is emitted.
+                // The vertical connection is represented by hasContinuation:true on
+                // this row and hasTopLine:true on the parent's row; the SVG renderer
+                // draws the top/bottom line segments around the commit circle instead.
+                continue;
+            }
+            if (isExisting) {
+                // Merge-in: an existing lane at the top of the row curves into
+                // the commit position at mid-row.
+                const color = laneColors[toLane] ?? toLane % 8;
+                edges.push({ fromLane: toLane, toLane: myLane, color, type: 'merge-in' });
+            }
+            else {
+                // Branch-out: the commit spawns a new lane below mid-row.
+                const color = laneColors[toLane] ?? toLane % 8;
+                edges.push({ fromLane: myLane, toLane, color, type: 'branch-out' });
+            }
+        }
+        // Merge-in edges for duplicate lane occupants (sibling branch tips
+        // converging into this commit's lane).
+        for (const dl of duplicateLanes) {
+            edges.push({ fromLane: dl.lane, toLane: myLane, color: dl.color, type: 'merge-in' });
+        }
+        // hasContinuation: true if the first parent continues in the same lane,
+        // OR if this is a sibling branch tip whose lane was kept alive (pointing
+        // at the parent) so it persists as a pass-through to the parent row.
+        const hasContinuation = parentIds.length > 0 && (parentLanes[0] === myLane || lanes[myLane] === parentIds[0]);
+        rows.push({ lane: myLane, color: myColor, edges, hasContinuation, hasTopLine });
+    }
+    return rows;
+}
+/** Returns the index of the first undefined slot, or lanes.length if full. */
+function firstFreeLane(lanes) {
+    const idx = lanes.indexOf(undefined);
+    return idx === -1 ? lanes.length : idx;
+}
+//# sourceMappingURL=scm-history-graph-lanes.js.map

package/lib/browser/scm-history-graph-lanes.js.map

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

package/lib/browser/scm-history-graph-lanes.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=scm-history-graph-lanes.spec.d.ts.map

package/lib/browser/scm-history-graph-lanes.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scm-history-graph-lanes.spec.d.ts","sourceRoot":"","sources":["../../src/browser/scm-history-graph-lanes.spec.ts"],"names":[],"mappings":""}