@xynogen/pix-pretty 1.7.6 → 1.7.7

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-pretty",
-	"version": "1.7.6",
+	"version": "1.7.7",
 	"description": "Enhanced tool output rendering with syntax highlighting, file icons, tree views, FFF search, and paste chip formatting",
 	"type": "module",
 	"main": "src/index.ts",

package/src/diff.test.ts

@@ -0,0 +1,23 @@
+import { describe, expect, it } from "bun:test";
+
+import { parseDiff } from "./diff.js";
+
+const OLD = "line1\nline2\nline3";
+const NEW = "line1\nCHANGED\nline3";
+
+describe("parseDiff baseLine", () => {
+	it("is snippet-relative when baseLine omitted (default 0)", () => {
+		const { lines } = parseDiff(OLD, NEW);
+		const del = lines.find((l) => l.type === "del");
+		expect(del?.oldNum).toBe(2); // line2 is the 2nd line of the snippet
+	});
+
+	it("shifts gutter numbers to absolute when baseLine given", () => {
+		// Snippet begins at file line 84 → snippet line 2 becomes file line 85.
+		const { lines } = parseDiff(OLD, NEW, 3, 84);
+		const del = lines.find((l) => l.type === "del");
+		const add = lines.find((l) => l.type === "add");
+		expect(del?.oldNum).toBe(85);
+		expect(add?.newNum).toBe(85);
+	});
+});

package/src/diff.ts

@@ -22,6 +22,9 @@ export function parseDiff(
 	oldContent: string,
 	newContent: string,
 	ctx = 3,
+	// 1-based file line where the snippet begins; shifts gutter numbers from
+	// snippet-relative to absolute. 0 = no shift (snippet-relative, the default).
+	baseLine = 0,
 ): ParsedDiff {
 	const patch = Diff.structuredPatch("", "", oldContent, newContent, "", "", {
 		context: ctx,
@@ -42,8 +45,9 @@ export function parseDiff(
 			});
 		}
 		const h = patch.hunks[hi];
-		let oL = h.oldStart;
-		let nL = h.newStart;
+		const shift = baseLine > 0 ? baseLine - 1 : 0;
+		let oL = h.oldStart + shift;
+		let nL = h.newStart + shift;
 		for (const raw of h.lines) {
 			if (raw === "\") continue;
 			const ch = raw[0];