@pierre/diffs 1.3.0-beta.8 → 1.3.0-rc.1

package/dist/worker/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","names":[],"sources":["../../src/worker/types.ts"],"mappings":"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"}
+{"version":3,"file":"types.d.ts","names":[],"sources":["../../src/worker/types.ts"],"mappings":"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"}

package/dist/worker/worker-portable.js

@@ -12536,7 +12536,14 @@ function getLineNodes(nodes) {
 	throw new Error("getLineNodes: Unable to find children");
 }
 //#endregion
-//#region src/utils/virtualDiffLayout.ts
+//#region src/utils/getHunkSideBoundaries.ts
+/** Converts a unified hunk side's start/count into its consumed-file range. */
+function getHunkSideStartBoundary(start, count) {
+	return start - (count === 0 ? 0 : 1);
+}
+function getHunkSideEndBoundary(start, count) {
+	return getHunkSideStartBoundary(start, count) + count;
+}
 function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, collapsedContextThreshold }) {
 	const normalizedRangeSize = Math.max(rangeSize, 0);
 	if (normalizedRangeSize === 0 || isPartial) return {
@@ -12569,8 +12576,8 @@ function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, col
 function getTrailingContextRangeSize({ fileDiff, errorPrefix }) {
 	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
 	if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) return 0;
-	const additionRemaining = fileDiff.additionLines.length - (lastHunk.additionLineIndex + lastHunk.additionCount);
-	const deletionRemaining = fileDiff.deletionLines.length - (lastHunk.deletionLineIndex + lastHunk.deletionCount);
+	const additionRemaining = fileDiff.additionLines.length - getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount);
+	const deletionRemaining = fileDiff.deletionLines.length - getHunkSideEndBoundary(lastHunk.deletionStart, lastHunk.deletionCount);
 	if (additionRemaining <= 0 && deletionRemaining <= 0) return 0;
 	if (additionRemaining !== deletionRemaining) throw new Error(`${errorPrefix}: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${fileDiff.name}`);
 	return Math.min(additionRemaining, deletionRemaining);
@@ -12661,6 +12668,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		const hunk = diff.hunks[hunkIndex];
 		if (hunk == null) throw new Error("iterateOverDiff: invalid hunk index");
 		if (state.shouldBreak()) break;
+		const deletionBoundary = getHunkSideStartBoundary(hunk.deletionStart, hunk.deletionCount);
+		const additionBoundary = getHunkSideStartBoundary(hunk.additionStart, hunk.additionCount);
+		const deletionStartIndex = !diff.isPartial && hunk.deletionCount === 0 ? deletionBoundary : hunk.deletionLineIndex;
+		const additionStartIndex = !diff.isPartial && hunk.additionCount === 0 ? additionBoundary : hunk.additionLineIndex;
 		const leadingRegion = getExpandedRegion({
 			isPartial: diff.isPartial,
 			rangeSize: hunk.collapsedBefore,
@@ -12690,10 +12701,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		if (!state.shouldSkip(expandedLineCount, expandedLineCount)) {
 			let unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.rangeSize;
 			let splitLineIndex = hunk.splitLineStart - leadingRegion.rangeSize;
-			let deletionLineIndex = hunk.deletionLineIndex - leadingRegion.rangeSize;
-			let additionLineIndex = hunk.additionLineIndex - leadingRegion.rangeSize;
-			let deletionLineNumber = hunk.deletionStart - leadingRegion.rangeSize;
-			let additionLineNumber = hunk.additionStart - leadingRegion.rangeSize;
+			let deletionLineIndex = deletionStartIndex - leadingRegion.rangeSize;
+			let additionLineIndex = additionStartIndex - leadingRegion.rangeSize;
+			let deletionLineNumber = deletionBoundary + 1 - leadingRegion.rangeSize;
+			let additionLineNumber = additionBoundary + 1 - leadingRegion.rangeSize;
 			if (walkContextLines(state, leadingRegion.fromStart, diffStyle, (index) => {
 				return state.emit({
 					hunkIndex,
@@ -12719,10 +12730,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			})) break hunkIterator;
 			unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.fromEnd;
 			splitLineIndex = hunk.splitLineStart - leadingRegion.fromEnd;
-			deletionLineIndex = hunk.deletionLineIndex - leadingRegion.fromEnd;
-			additionLineIndex = hunk.additionLineIndex - leadingRegion.fromEnd;
-			deletionLineNumber = hunk.deletionStart - leadingRegion.fromEnd;
-			additionLineNumber = hunk.additionStart - leadingRegion.fromEnd;
+			deletionLineIndex = deletionStartIndex - leadingRegion.fromEnd;
+			additionLineIndex = additionStartIndex - leadingRegion.fromEnd;
+			deletionLineNumber = deletionBoundary + 1 - leadingRegion.fromEnd;
+			additionLineNumber = additionBoundary + 1 - leadingRegion.fromEnd;
 			if (walkContextLines(state, leadingRegion.fromEnd, diffStyle, (index) => {
 				return state.emit({
 					hunkIndex,
@@ -12754,10 +12765,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		}
 		let unifiedLineIndex = hunk.unifiedLineStart;
 		let splitLineIndex = hunk.splitLineStart;
-		let deletionLineIndex = hunk.deletionLineIndex;
-		let additionLineIndex = hunk.additionLineIndex;
-		let deletionLineNumber = hunk.deletionStart;
-		let additionLineNumber = hunk.additionStart;
+		let deletionLineIndex = deletionStartIndex;
+		let additionLineIndex = additionStartIndex;
+		let deletionLineNumber = deletionBoundary + 1;
+		let additionLineNumber = additionBoundary + 1;
 		const lastContent = hunk.hunkContent.at(-1);
 		for (const content of hunk.hunkContent) {
 			if (state.shouldBreak()) break hunkIterator;
@@ -13366,16 +13377,45 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
 //#region src/utils/computeFileOffsets.ts
 const LINE_FEED = 10;
 const CARRIAGE_RETURN = 13;
+const DENSE_LINE_BREAK_BLOCK_SIZE = 4;
+const DENSE_LINE_BREAK_BLOCK_SPAN = 40;
 /**
 * Computes line start offsets for a string.
 */
 function computeLineOffsets(contents) {
 	const offsets = [0];
-	for (let i = 0; i < contents.length; i++) {
-		const char = contents.charCodeAt(i);
-		if (char === LINE_FEED || char === CARRIAGE_RETURN) {
-			if (char === CARRIAGE_RETURN && i + 1 < contents.length && contents.charCodeAt(i + 1) === LINE_FEED) i++;
-			offsets.push(i + 1);
+	let carriageReturn = contents.indexOf("\r");
+	let lineFeed = contents.indexOf("\n");
+	let blockStart = 0;
+	let blockBreaks = 0;
+	while (carriageReturn !== -1 || lineFeed !== -1) {
+		let nextOffset;
+		if (carriageReturn !== -1 && (lineFeed === -1 || carriageReturn < lineFeed)) if (lineFeed === carriageReturn + 1) {
+			nextOffset = lineFeed + 1;
+			carriageReturn = contents.indexOf("\r", nextOffset);
+			lineFeed = contents.indexOf("\n", nextOffset);
+		} else {
+			nextOffset = carriageReturn + 1;
+			carriageReturn = contents.indexOf("\r", nextOffset);
+		}
+		else {
+			nextOffset = lineFeed + 1;
+			lineFeed = contents.indexOf("\n", nextOffset);
+		}
+		offsets.push(nextOffset);
+		if (++blockBreaks === DENSE_LINE_BREAK_BLOCK_SIZE) {
+			if (nextOffset - blockStart <= DENSE_LINE_BREAK_BLOCK_SPAN) {
+				for (let i = nextOffset; i < contents.length; i++) {
+					const char = contents.charCodeAt(i);
+					if (char === LINE_FEED || char === CARRIAGE_RETURN) {
+						if (char === CARRIAGE_RETURN && i + 1 < contents.length && contents.charCodeAt(i + 1) === LINE_FEED) i++;
+						offsets.push(i + 1);
+					}
+				}
+				return offsets;
+			}
+			blockStart = nextOffset;
+			blockBreaks = 0;
 		}
 	}
 	return offsets;