@pierre/diffs 1.1.0-beta.1 → 1.1.0-beta.10

package/dist/worker/worker-portable.js

@@ -11672,7 +11672,7 @@ const SPLIT_WITH_NEWLINES = /(?<=\n)/;
 const FILENAME_HEADER_REGEX = /^(---|\+\+\+)\s+([^\t\r\n]+)/;
 const FILENAME_HEADER_REGEX_GIT = /^(---|\+\+\+)\s+[ab]\/([^\t\r\n]+)/;
 const ALTERNATE_FILE_NAMES_GIT = /^diff --git (?:"a\/(.+?)"|a\/(.+?)) (?:"b\/(.+?)"|b\/(.+?))$/;
-const FILE_MODE_FROM_INDEX = /^index (?:[0-9a-f]+)\.\.(?:[0-9a-f]+)(?: (\d+))?/;
+const INDEX_LINE_METADATA = /^index ([0-9a-f]+)\.\.([0-9a-f]+)(?: (\d+))?$/i;
 const HEADER_METADATA_SLOT_ID = "header-metadata";
 const DEFAULT_THEMES = {
 	dark: "pierre-dark",
@@ -11680,20 +11680,30 @@ const DEFAULT_THEMES = {
 };
 const UNSAFE_CSS_ATTRIBUTE = "data-unsafe-css";
 const CORE_CSS_ATTRIBUTE = "data-core-css";
-const LINE_HUNK_COUNT = 10;
-const LINE_HEIGHT = 20;
-const DIFF_HEADER_HEIGHT = 44;
-const HUNK_SEPARATOR_HEIGHT = 32;
-const FILE_GAP = 8;
+const DEFAULT_COLLAPSED_CONTEXT_THRESHOLD = 1;
+const DEFAULT_VIRTUAL_FILE_METRICS = {
+	hunkLineCount: 50,
+	lineHeight: 20,
+	diffHeaderHeight: 44,
+	hunkSeparatorHeight: 32,
+	fileGap: 8
+};
 const DEFAULT_EXPANDED_REGION = Object.freeze({
 	fromStart: 0,
 	fromEnd: 0
 });
+const DEFAULT_RENDER_RANGE = {
+	startingLine: 0,
+	totalLines: Infinity,
+	bufferBefore: 0,
+	bufferAfter: 0
+};
 
 //#endregion
 //#region src/highlighter/languages/constants.ts
 const ResolvedLanguages = new Map();
 const ResolvingLanguages = new Map();
+const RegisteredCustomLanguages = new Map();
 const AttachedLanguages = new Set();
 
 //#endregion
@@ -11744,7 +11754,7 @@ function attachResolvedThemes(themes, highlighter$1) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/base.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/base.js
 var Diff = class {
 	diff(oldStr, newStr, options = {}) {
 		let callback;
@@ -11968,7 +11978,7 @@ var Diff = class {
 };
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/character.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/character.js
 var CharacterDiff = class extends Diff {};
 const characterDiff = new CharacterDiff();
 function diffChars(oldStr, newStr, options) {
@@ -11976,7 +11986,7 @@ function diffChars(oldStr, newStr, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/util/string.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/util/string.js
 function longestCommonPrefix(str1, str2) {
 	let i$2;
 	for (i$2 = 0; i$2 < str1.length && i$2 < str2.length; i$2++) {
@@ -12085,8 +12095,8 @@ function leadingWs(string) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/word.js
-const extendedWordChars = "a-zA-Z0-9_\\u{C0}-\\u{FF}\\u{D8}-\\u{F6}\\u{F8}-\\u{2C6}\\u{2C8}-\\u{2D7}\\u{2DE}-\\u{2FF}\\u{1E00}-\\u{1EFF}";
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/word.js
+const extendedWordChars = "a-zA-Z0-9_\\u{AD}\\u{C0}-\\u{D6}\\u{D8}-\\u{F6}\\u{F8}-\\u{2C6}\\u{2C8}-\\u{2D7}\\u{2DE}-\\u{2FF}\\u{1E00}-\\u{1EFF}";
 const tokenizeIncludingWhitespace = new RegExp(`[${extendedWordChars}]+|\\s+|[^${extendedWordChars}]`, "ug");
 var WordDiff = class extends Diff {
 	equals(left, right, options) {
@@ -12103,7 +12113,15 @@ var WordDiff = class extends Diff {
 			if (segmenter.resolvedOptions().granularity != "word") {
 				throw new Error("The segmenter passed must have a granularity of \"word\"");
 			}
-			parts = Array.from(segmenter.segment(value), (segment) => segment.segment);
+			parts = [];
+			for (const segmentObj of Array.from(segmenter.segment(value))) {
+				const segment = segmentObj.segment;
+				if (parts.length && /\s/.test(parts[parts.length - 1]) && /\s/.test(segment)) {
+					parts[parts.length - 1] += segment;
+				} else {
+					parts.push(segment);
+				}
+			}
 		} else {
 			parts = value.match(tokenizeIncludingWhitespace) || [];
 		}
@@ -12231,7 +12249,7 @@ function diffWordsWithSpace(oldStr, newStr, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/util/params.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/util/params.js
 function generateOptions(options, defaults) {
 	if (typeof options === "function") {
 		defaults.callback = options;
@@ -12247,7 +12265,7 @@ function generateOptions(options, defaults) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/line.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/line.js
 var LineDiff = class extends Diff {
 	constructor() {
 		super(...arguments);
@@ -12300,7 +12318,7 @@ function tokenize(value, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/sentence.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/sentence.js
 function isSentenceEndPunct(char) {
 	return char == "." || char == "!" || char == "?";
 }
@@ -12333,7 +12351,7 @@ function diffSentences(oldStr, newStr, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/css.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/css.js
 var CssDiff = class extends Diff {
 	tokenize(value) {
 		return value.split(/([{}:;,]|\s+)/);
@@ -12345,7 +12363,7 @@ function diffCss(oldStr, newStr, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/json.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/json.js
 var JsonDiff = class extends Diff {
 	constructor() {
 		super(...arguments);
@@ -12419,7 +12437,7 @@ function canonicalize(obj, stack, replacementStack, replacer, key$1) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/diff/array.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/diff/array.js
 var ArrayDiff = class extends Diff {
 	tokenize(value) {
 		return value.slice();
@@ -12437,7 +12455,7 @@ function diffArrays(oldArr, newArr, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/patch/line-endings.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/patch/line-endings.js
 function unixToWin(patch) {
 	if (Array.isArray(patch)) {
 		return patch.map((p$1) => unixToWin(p$1));
@@ -12477,7 +12495,7 @@ function isWin(patch) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/patch/parse.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/patch/parse.js
 /**
 * Parses a patch into structured data, in the same structure returned by `structuredPatch`.
 *
@@ -12494,9 +12512,9 @@ function parsePatch(uniDiff) {
 			if (/^(---|\+\+\+|@@)\s/.test(line)) {
 				break;
 			}
-			const header = /^(?:Index:|diff(?: -r \w+)+)\s+(.+?)\s*$/.exec(line);
-			if (header) {
-				index.index = header[1];
+			const headerMatch = /^(?:Index:|diff(?: -r \w+)+)\s+/.exec(line);
+			if (headerMatch) {
+				index.index = line.substring(headerMatch[0].length).trim();
 			}
 			i$2++;
 		}
@@ -12517,14 +12535,14 @@ function parsePatch(uniDiff) {
 		}
 	}
 	function parseFileHeader(index) {
-		const fileHeader = /^(---|\+\+\+)\s+(.*)\r?$/.exec(diffstr[i$2]);
-		if (fileHeader) {
-			const data = fileHeader[2].split("	", 2), header = (data[1] || "").trim();
+		const fileHeaderMatch = /^(---|\+\+\+)\s+/.exec(diffstr[i$2]);
+		if (fileHeaderMatch) {
+			const prefix = fileHeaderMatch[1], data = diffstr[i$2].substring(3).trim().split("	", 2), header = (data[1] || "").trim();
 			let fileName = data[0].replace(/\\\\/g, "\\");
-			if (/^".*"$/.test(fileName)) {
+			if (fileName.startsWith("\"") && fileName.endsWith("\"")) {
 				fileName = fileName.substr(1, fileName.length - 2);
 			}
-			if (fileHeader[1] === "---") {
+			if (prefix === "---") {
 				index.oldFileName = fileName;
 				index.oldHeader = header;
 			} else {
@@ -12588,7 +12606,7 @@ function parsePatch(uniDiff) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/util/distance-iterator.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/util/distance-iterator.js
 function distance_iterator_default(start, minLine, maxLine) {
 	let wantForward = true, backwardExhausted = false, forwardExhausted = false, localOffset = 1;
 	return function iterator() {
@@ -12618,7 +12636,7 @@ function distance_iterator_default(start, minLine, maxLine) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/patch/apply.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/patch/apply.js
 /**
 * attempts to apply a unified diff patch.
 *
@@ -12837,7 +12855,7 @@ function applyPatches(uniDiff, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/patch/reverse.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/patch/reverse.js
 function reversePatch(structuredPatch$1) {
 	if (Array.isArray(structuredPatch$1)) {
 		return structuredPatch$1.map((patch) => reversePatch(patch)).reverse();
@@ -12868,7 +12886,22 @@ function reversePatch(structuredPatch$1) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/patch/create.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/patch/create.js
+const INCLUDE_HEADERS = {
+	includeIndex: true,
+	includeUnderline: true,
+	includeFileHeaders: true
+};
+const FILE_HEADERS_ONLY = {
+	includeIndex: false,
+	includeUnderline: false,
+	includeFileHeaders: true
+};
+const OMIT_HEADERS = {
+	includeIndex: false,
+	includeUnderline: false,
+	includeFileHeaders: false
+};
 function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {
 	let optionsObj;
 	if (!options) {
@@ -12982,17 +13015,27 @@ function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, ne
 * creates a unified diff patch.
 * @param patch either a single structured patch object (as returned by `structuredPatch`) or an array of them (as returned by `parsePatch`)
 */
-function formatPatch(patch) {
+function formatPatch(patch, headerOptions) {
+	if (!headerOptions) {
+		headerOptions = INCLUDE_HEADERS;
+	}
 	if (Array.isArray(patch)) {
-		return patch.map(formatPatch).join("\n");
+		if (patch.length > 1 && !headerOptions.includeFileHeaders) {
+			throw new Error("Cannot omit file headers on a multi-file patch. " + "(The result would be unparseable; how would a tool trying to apply " + "the patch know which changes are to which file?)");
+		}
+		return patch.map((p$1) => formatPatch(p$1, headerOptions)).join("\n");
 	}
 	const ret = [];
-	if (patch.oldFileName == patch.newFileName) {
+	if (headerOptions.includeIndex && patch.oldFileName == patch.newFileName) {
 		ret.push("Index: " + patch.oldFileName);
 	}
-	ret.push("===================================================================");
-	ret.push("--- " + patch.oldFileName + (typeof patch.oldHeader === "undefined" ? "" : "	" + patch.oldHeader));
-	ret.push("+++ " + patch.newFileName + (typeof patch.newHeader === "undefined" ? "" : "	" + patch.newHeader));
+	if (headerOptions.includeUnderline) {
+		ret.push("===================================================================");
+	}
+	if (headerOptions.includeFileHeaders) {
+		ret.push("--- " + patch.oldFileName + (typeof patch.oldHeader === "undefined" ? "" : "	" + patch.oldHeader));
+		ret.push("+++ " + patch.newFileName + (typeof patch.newHeader === "undefined" ? "" : "	" + patch.newHeader));
+	}
 	for (let i$2 = 0; i$2 < patch.hunks.length; i$2++) {
 		const hunk = patch.hunks[i$2];
 		if (hunk.oldLines === 0) {
@@ -13017,14 +13060,14 @@ function createTwoFilesPatch(oldFileName, newFileName, oldStr, newStr, oldHeader
 		if (!patchObj) {
 			return;
 		}
-		return formatPatch(patchObj);
+		return formatPatch(patchObj, options === null || options === void 0 ? void 0 : options.headerOptions);
 	} else {
 		const { callback } = options;
 		structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, Object.assign(Object.assign({}, options), { callback: (patchObj) => {
 			if (!patchObj) {
 				callback(undefined);
 			} else {
-				callback(formatPatch(patchObj));
+				callback(formatPatch(patchObj, options.headerOptions));
 			}
 		} }));
 	}
@@ -13047,7 +13090,7 @@ function splitLines(text$1) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/convert/dmp.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/convert/dmp.js
 /**
 * converts a list of change objects to the format returned by Google's [diff-match-patch](https://github.com/google/diff-match-patch) library
 */
@@ -13069,7 +13112,7 @@ function convertChangesToDMP(changes) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/convert/xml.js
+//#region ../../node_modules/.bun/diff@8.0.3/node_modules/diff/libesm/convert/xml.js
 /**
 * converts a list of change objects to a serialized XML format
 */
@@ -13822,12 +13865,36 @@ function findCodeElement(nodes) {
 	}
 	return undefined;
 }
-function createBufferElement(type, height) {
+function createGutterWrapper(children) {
+	return createHastElement({
+		tagName: "div",
+		properties: { "data-gutter": "" },
+		children
+	});
+}
+function createGutterItem(lineType, lineNumber, lineIndex) {
 	return createHastElement({
 		tagName: "div",
 		properties: {
-			"data-virtualized-buffer": type,
-			style: `height: ${height}px`
+			"data-line-type": lineType,
+			"data-column-number": lineNumber,
+			"data-line-index": lineIndex
+		},
+		children: lineNumber != null ? [createHastElement({
+			tagName: "span",
+			properties: { "data-line-number-content": "" },
+			children: [createTextNodeElement(`${lineNumber}`)]
+		})] : undefined
+	});
+}
+function createGutterGap(type, bufferType, size) {
+	return createHastElement({
+		tagName: "div",
+		properties: {
+			"data-gutter-buffer": bufferType,
+			"data-buffer-size": size,
+			"data-line-type": bufferType === "annotation" ? undefined : type,
+			style: bufferType === "annotation" ? `grid-row: span ${size};` : `grid-row: span ${size};min-height:calc(${size} * 1lh);`
 		}
 	});
 }
@@ -13845,33 +13912,15 @@ function processLine(node, line, state) {
 		});
 		throw new Error(errorMessage);
 	}
-	node.tagName = "span";
-	node.properties["data-column-content"] = "";
+	node.tagName = "div";
+	node.properties["data-line"] = lineInfo.lineNumber;
+	node.properties["data-alt-line"] = lineInfo.altLineNumber;
+	node.properties["data-line-type"] = lineInfo.type;
+	node.properties["data-line-index"] = lineInfo.lineIndex;
 	if (node.children.length === 0) {
 		node.children.push(createTextNodeElement("\n"));
 	}
-	const children = [createHastElement({
-		tagName: "span",
-		children: [createHastElement({
-			tagName: "span",
-			children: [{
-				type: "text",
-				value: `${lineInfo.lineNumber}`
-			}],
-			properties: { "data-line-number-content": "" }
-		})],
-		properties: { "data-column-number": "" }
-	}), node];
-	return createHastElement({
-		tagName: "div",
-		children,
-		properties: {
-			"data-line": lineInfo.lineNumber,
-			"data-alt-line": lineInfo.altLineNumber,
-			"data-line-type": lineInfo.type,
-			"data-line-index": lineInfo.lineIndex
-		}
-	});
+	return node;
 }
 
 //#endregion
@@ -13948,6 +13997,7 @@ function formatCSSVariablePrefix(type) {
 
 //#endregion
 //#region src/utils/getFiletypeFromFileName.ts
+const CUSTOM_EXTENSION_TO_FILE_FORMAT = new Map();
 const EXTENSION_TO_FILE_FORMAT = {
 	"1c": "1c",
 	abap: "abap",
@@ -14278,19 +14328,33 @@ const EXTENSION_TO_FILE_FORMAT = {
 	sty: "tex"
 };
 function getFiletypeFromFileName(fileName) {
+	if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(fileName)) {
+		return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(fileName) ?? "text";
+	}
 	if (EXTENSION_TO_FILE_FORMAT[fileName] != null) {
 		return EXTENSION_TO_FILE_FORMAT[fileName];
 	}
 	const compoundMatch = fileName.match(/\.([^/\\]+\.[^/\\]+)$/);
-	if (compoundMatch != null && EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] != null) {
-		return EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] ?? "text";
+	if (compoundMatch != null) {
+		if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(compoundMatch[1])) {
+			return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(compoundMatch[1]) ?? "text";
+		}
+		if (EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] != null) {
+			return EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] ?? "text";
+		}
+	}
+	const simpleMatch = fileName.match(/\.([^.]+)$/)?.[1] ?? "";
+	if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(simpleMatch)) {
+		return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(simpleMatch) ?? "text";
 	}
-	const simpleMatch = fileName.match(/\.([^.]+)$/);
-	return EXTENSION_TO_FILE_FORMAT[simpleMatch?.[1] ?? ""] ?? "text";
+	return EXTENSION_TO_FILE_FORMAT[simpleMatch] ?? "text";
 }
 function extendFileFormatMap(map) {
 	for (const key$1 in map) {
-		EXTENSION_TO_FILE_FORMAT[key$1] = map[key$1];
+		const lang = map[key$1];
+		if (lang != null) {
+			CUSTOM_EXTENSION_TO_FILE_FORMAT.set(key$1, lang);
+		}
 	}
 }
 
@@ -14355,7 +14419,7 @@ function getLineNodes(nodes) {
 
 //#endregion
 //#region src/utils/iterateOverDiff.ts
-function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, callback }) {
+function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, callback }) {
 	const state = {
 		finalHunk: diff.hunks.at(-1),
 		viewportStart: startingLine,
@@ -14436,7 +14500,7 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		if (state.shouldBreak()) {
 			break;
 		}
-		const leadingRegion = getExpandedRegion(diff.isPartial, hunk.collapsedBefore, expandedHunks, hunkIndex);
+		const leadingRegion = getExpandedRegion(diff.isPartial, hunk.collapsedBefore, expandedHunks, hunkIndex, collapsedContextThreshold);
 		const trailingRegion = (() => {
 			if (hunk !== state.finalHunk || !hasFinalCollapsedHunk(diff)) {
 				return undefined;
@@ -14447,7 +14511,7 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 				throw new Error(`iterateOverDiff: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${diff.name}`);
 			}
 			const trailingRangeSize = Math.min(additionRemaining, deletionRemaining);
-			return getExpandedRegion(diff.isPartial, trailingRangeSize, expandedHunks, diff.hunks.length);
+			return getExpandedRegion(diff.isPartial, trailingRangeSize, expandedHunks, diff.hunks.length, collapsedContextThreshold);
 		})();
 		const expandedLineCount = leadingRegion.fromStart + leadingRegion.fromEnd;
 		function getTrailingCollapsedAfter(unifiedLineIndex$1, splitLineIndex$1) {
@@ -14482,16 +14546,21 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 						hunk,
 						collapsedBefore: 0,
 						collapsedAfter: 0,
-						unifiedDeletionLineIndex: unifiedLineIndex$1 + index,
-						unifiedAdditionLineIndex: unifiedLineIndex$1 + index,
-						splitLineIndex: splitLineIndex$1 + index,
-						deletionLineIndex: deletionLineIndex$1 + index,
-						additionLineIndex: additionLineIndex$1 + index,
-						deletionLineNumber: deletionLineNumber$1 + index,
-						additionLineNumber: additionLineNumber$1 + index,
 						type: "context-expanded",
-						noEOFCRAddition: false,
-						noEOFCRDeletion: false
+						deletionLine: {
+							lineNumber: deletionLineNumber$1 + index,
+							lineIndex: deletionLineIndex$1 + index,
+							noEOFCR: false,
+							unifiedLineIndex: unifiedLineIndex$1 + index,
+							splitLineIndex: splitLineIndex$1 + index
+						},
+						additionLine: {
+							unifiedLineIndex: unifiedLineIndex$1 + index,
+							splitLineIndex: splitLineIndex$1 + index,
+							lineIndex: additionLineIndex$1 + index,
+							lineNumber: additionLineNumber$1 + index,
+							noEOFCR: false
+						}
 					})) {
 						break hunkIterator;
 					}
@@ -14514,16 +14583,21 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 						hunk,
 						collapsedBefore: getPendingCollapsed(),
 						collapsedAfter: 0,
-						unifiedDeletionLineIndex: unifiedLineIndex$1 + index,
-						unifiedAdditionLineIndex: unifiedLineIndex$1 + index,
-						splitLineIndex: splitLineIndex$1 + index,
-						deletionLineIndex: deletionLineIndex$1 + index,
-						additionLineIndex: additionLineIndex$1 + index,
-						deletionLineNumber: deletionLineNumber$1 + index,
-						additionLineNumber: additionLineNumber$1 + index,
 						type: "context-expanded",
-						noEOFCRAddition: false,
-						noEOFCRDeletion: false
+						deletionLine: {
+							lineNumber: deletionLineNumber$1 + index,
+							lineIndex: deletionLineIndex$1 + index,
+							noEOFCR: false,
+							unifiedLineIndex: unifiedLineIndex$1 + index,
+							splitLineIndex: splitLineIndex$1 + index
+						},
+						additionLine: {
+							unifiedLineIndex: unifiedLineIndex$1 + index,
+							splitLineIndex: splitLineIndex$1 + index,
+							lineIndex: additionLineIndex$1 + index,
+							lineNumber: additionLineNumber$1 + index,
+							noEOFCR: false
+						}
 					})) {
 						break hunkIterator;
 					}
@@ -14561,16 +14635,21 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 								hunk,
 								collapsedBefore: getPendingCollapsed(),
 								collapsedAfter: getTrailingCollapsedAfter(unifiedRowIndex, splitRowIndex),
-								unifiedDeletionLineIndex: unifiedRowIndex,
-								unifiedAdditionLineIndex: unifiedRowIndex,
-								splitLineIndex: splitRowIndex,
-								deletionLineIndex: deletionLineIndex + index,
-								additionLineIndex: additionLineIndex + index,
-								deletionLineNumber: deletionLineNumber + index,
-								additionLineNumber: additionLineNumber + index,
 								type: "context",
-								noEOFCRAddition: isLastLine && hunk.noEOFCRAdditions,
-								noEOFCRDeletion: isLastLine && hunk.noEOFCRDeletions
+								deletionLine: {
+									lineNumber: deletionLineNumber + index,
+									lineIndex: deletionLineIndex + index,
+									noEOFCR: isLastLine && hunk.noEOFCRDeletions,
+									unifiedLineIndex: unifiedRowIndex,
+									splitLineIndex: splitRowIndex
+								},
+								additionLine: {
+									unifiedLineIndex: unifiedRowIndex,
+									splitLineIndex: splitRowIndex,
+									lineIndex: additionLineIndex + index,
+									lineNumber: additionLineNumber + index,
+									noEOFCR: isLastLine && hunk.noEOFCRAdditions
+								}
 							})) {
 								break hunkIterator;
 							}
@@ -14648,16 +14727,21 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 						hunk: undefined,
 						collapsedBefore: 0,
 						collapsedAfter: isLastLine ? collapsedLines : 0,
-						unifiedDeletionLineIndex: unifiedLineIndex + index,
-						unifiedAdditionLineIndex: unifiedLineIndex + index,
-						splitLineIndex: splitLineIndex + index,
-						additionLineIndex: additionLineIndex + index,
-						deletionLineIndex: deletionLineIndex + index,
-						additionLineNumber: additionLineNumber + index,
-						deletionLineNumber: deletionLineNumber + index,
 						type: "context-expanded",
-						noEOFCRAddition: false,
-						noEOFCRDeletion: false
+						deletionLine: {
+							lineNumber: deletionLineNumber + index,
+							lineIndex: deletionLineIndex + index,
+							noEOFCR: false,
+							unifiedLineIndex: unifiedLineIndex + index,
+							splitLineIndex: splitLineIndex + index
+						},
+						additionLine: {
+							unifiedLineIndex: unifiedLineIndex + index,
+							splitLineIndex: splitLineIndex + index,
+							lineIndex: additionLineIndex + index,
+							lineNumber: additionLineNumber + index,
+							noEOFCR: false
+						}
 					})) {
 						break hunkIterator;
 					}
@@ -14669,7 +14753,7 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		}
 	}
 }
-function getExpandedRegion(isPartial, rangeSize, expandedHunks, hunkIndex) {
+function getExpandedRegion(isPartial, rangeSize, expandedHunks, hunkIndex, collapsedContextThreshold) {
 	rangeSize = Math.max(rangeSize, 0);
 	if (rangeSize === 0 || isPartial) {
 		return {
@@ -14679,7 +14763,7 @@ function getExpandedRegion(isPartial, rangeSize, expandedHunks, hunkIndex) {
 			collapsedLines: Math.max(rangeSize, 0)
 		};
 	}
-	if (expandedHunks === true) {
+	if (expandedHunks === true || rangeSize <= collapsedContextThreshold) {
 		return {
 			fromStart: rangeSize,
 			fromEnd: 0,
@@ -14762,23 +14846,52 @@ function getChangeIterationRanges(state, content, diffStyle) {
 	return merged;
 }
 function getChangeLineData({ hunkIndex, hunk, collapsedAfter, collapsedBefore, diffStyle, index, unifiedLineIndex, splitLineIndex, additionLineIndex, deletionLineIndex, additionLineNumber, deletionLineNumber, content, isLastContent, unifiedCount, splitCount }) {
-	if (diffStyle === "unified") {
+	const unifiedDeletionLineIndex = index < content.deletions ? unifiedLineIndex + index : undefined;
+	const unifiedAdditionLineIndex = diffStyle === "unified" ? index >= content.deletions ? unifiedLineIndex + index : undefined : index < content.additions ? unifiedLineIndex + content.deletions + index : undefined;
+	const resolvedSplitLineIndex = diffStyle === "unified" ? splitLineIndex + (index < content.deletions ? index : index - content.deletions) : splitLineIndex + index;
+	const deletionLineIndexValue = index < content.deletions ? deletionLineIndex + index : undefined;
+	const deletionLineNumberValue = index < content.deletions ? deletionLineNumber + index : undefined;
+	const additionLineIndexValue = diffStyle === "unified" ? index >= content.deletions ? additionLineIndex + (index - content.deletions) : undefined : index < content.additions ? additionLineIndex + index : undefined;
+	const additionLineNumberValue = diffStyle === "unified" ? index >= content.deletions ? additionLineNumber + (index - content.deletions) : undefined : index < content.additions ? additionLineNumber + index : undefined;
+	const noEOFCRDeletion = diffStyle === "unified" ? isLastContent && index === content.deletions - 1 && hunk.noEOFCRDeletions : isLastContent && index === splitCount - 1 && hunk.noEOFCRDeletions;
+	const noEOFCRAddition = diffStyle === "unified" ? isLastContent && index === unifiedCount - 1 && hunk.noEOFCRAdditions : isLastContent && index === splitCount - 1 && hunk.noEOFCRAdditions;
+	const deletionLine = deletionLineIndexValue != null && deletionLineNumberValue != null && unifiedDeletionLineIndex != null ? {
+		lineNumber: deletionLineNumberValue,
+		lineIndex: deletionLineIndexValue,
+		noEOFCR: noEOFCRDeletion,
+		unifiedLineIndex: unifiedDeletionLineIndex,
+		splitLineIndex: resolvedSplitLineIndex
+	} : undefined;
+	const additionLine = additionLineIndexValue != null && additionLineNumberValue != null && unifiedAdditionLineIndex != null ? {
+		unifiedLineIndex: unifiedAdditionLineIndex,
+		splitLineIndex: resolvedSplitLineIndex,
+		lineIndex: additionLineIndexValue,
+		lineNumber: additionLineNumberValue,
+		noEOFCR: noEOFCRAddition
+	} : undefined;
+	if (deletionLine == null && additionLine != null) {
 		return {
 			type: "change",
 			hunkIndex,
 			hunk,
 			collapsedAfter,
 			collapsedBefore,
-			unifiedDeletionLineIndex: index < content.deletions ? unifiedLineIndex + index : undefined,
-			unifiedAdditionLineIndex: index >= content.deletions ? unifiedLineIndex + index : undefined,
-			splitLineIndex: splitLineIndex + (index < content.deletions ? index : index - content.deletions),
-			additionLineIndex: index >= content.deletions ? additionLineIndex + (index - content.deletions) : undefined,
-			additionLineNumber: index >= content.deletions ? additionLineNumber + (index - content.deletions) : undefined,
-			deletionLineIndex: index < content.deletions ? deletionLineIndex + index : undefined,
-			deletionLineNumber: index < content.deletions ? deletionLineNumber + index : undefined,
-			noEOFCRDeletion: isLastContent && index === content.deletions - 1 && hunk.noEOFCRDeletions,
-			noEOFCRAddition: isLastContent && index === unifiedCount - 1 && hunk.noEOFCRAdditions
+			deletionLine: undefined,
+			additionLine
 		};
+	} else if (deletionLine != null && additionLine == null) {
+		return {
+			type: "change",
+			hunkIndex,
+			hunk,
+			collapsedAfter,
+			collapsedBefore,
+			deletionLine,
+			additionLine: undefined
+		};
+	}
+	if (deletionLine == null || additionLine == null) {
+		throw new Error("iterateOverDiff: missing change line data");
 	}
 	return {
 		type: "change",
@@ -14786,15 +14899,8 @@ function getChangeLineData({ hunkIndex, hunk, collapsedAfter, collapsedBefore, d
 		hunk,
 		collapsedAfter,
 		collapsedBefore,
-		unifiedDeletionLineIndex: index < content.deletions ? unifiedLineIndex + index : undefined,
-		unifiedAdditionLineIndex: index < content.additions ? unifiedLineIndex + content.deletions + index : undefined,
-		splitLineIndex: splitLineIndex + index,
-		additionLineIndex: index < content.additions ? additionLineIndex + index : undefined,
-		additionLineNumber: index < content.additions ? additionLineNumber + index : undefined,
-		deletionLineIndex: index < content.deletions ? deletionLineIndex + index : undefined,
-		deletionLineNumber: index < content.deletions ? deletionLineNumber + index : undefined,
-		noEOFCRDeletion: isLastContent && index === splitCount - 1 && hunk.noEOFCRDeletions,
-		noEOFCRAddition: isLastContent && index === splitCount - 1 && hunk.noEOFCRAdditions
+		deletionLine,
+		additionLine
 	};
 }
 
@@ -14830,8 +14936,8 @@ function pushOrJoinSpan({ item, arr, enableJoin, isNeutral = false, isLastItem =
 
 //#endregion
 //#region src/utils/renderDiffWithHighlighter.ts
-const DEFAULT_PLAIN_TEXT_OPTIONS = { forcePlainText: false };
-function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainText, startingLine, totalLines, expandedHunks } = DEFAULT_PLAIN_TEXT_OPTIONS) {
+const DEFAULT_PLAIN_TEXT_OPTIONS$1 = { forcePlainText: false };
+function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainText, startingLine, totalLines, expandedHunks, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = DEFAULT_PLAIN_TEXT_OPTIONS$1) {
 	if (forcePlainText) {
 		startingLine ??= 0;
 		totalLines ??= Infinity;
@@ -14886,12 +14992,14 @@ function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainTex
 		startingLine,
 		totalLines,
 		expandedHunks: isWindowedHighlight ? expandedHunksForIteration : true,
-		callback: ({ hunkIndex, additionLineIndex, deletionLineIndex, additionLineNumber, deletionLineNumber, unifiedAdditionLineIndex, unifiedDeletionLineIndex, splitLineIndex, type }) => {
+		collapsedContextThreshold,
+		callback: ({ hunkIndex, additionLine, deletionLine, type }) => {
 			const bucket = getBucketForHunk(hunkIndex);
-			if (type === "change" && lineDiffType !== "none" && additionLineIndex != null && deletionLineIndex != null) {
+			const splitLineIndex = additionLine != null ? additionLine.splitLineIndex : deletionLine.splitLineIndex;
+			if (type === "change" && additionLine != null && deletionLine != null) {
 				computeLineDiffDecorations({
-					additionLine: diff.additionLines[additionLineIndex],
-					deletionLine: diff.deletionLines[deletionLineIndex],
+					additionLine: diff.additionLines[additionLine.lineIndex],
+					deletionLine: diff.deletionLines[deletionLine.lineIndex],
 					deletionLineIndex: bucket.deletionContent.length,
 					additionLineIndex: bucket.additionContent.length,
 					deletionDecorations: bucket.deletionDecorations,
@@ -14899,22 +15007,22 @@ function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainTex
 					lineDiffType
 				});
 			}
-			if (deletionLineIndex != null && deletionLineNumber != null && unifiedDeletionLineIndex != null) {
-				appendContent(diff.deletionLines[deletionLineIndex], deletionLineIndex, bucket.deletionSegments, bucket.deletionContent);
+			if (deletionLine != null) {
+				appendContent(diff.deletionLines[deletionLine.lineIndex], deletionLine.lineIndex, bucket.deletionSegments, bucket.deletionContent);
 				bucket.deletionInfo.push({
 					type: type === "change" ? "change-deletion" : type,
-					lineNumber: deletionLineNumber,
-					altLineNumber: type === "change" ? undefined : additionLineNumber ?? undefined,
-					lineIndex: `${unifiedDeletionLineIndex},${splitLineIndex}`
+					lineNumber: deletionLine.lineNumber,
+					altLineNumber: type === "change" ? undefined : additionLine.lineNumber ?? undefined,
+					lineIndex: `${deletionLine.unifiedLineIndex},${splitLineIndex}`
 				});
 			}
-			if (additionLineIndex != null && additionLineNumber != null && unifiedAdditionLineIndex != null) {
-				appendContent(diff.additionLines[additionLineIndex], additionLineIndex, bucket.additionSegments, bucket.additionContent);
+			if (additionLine != null) {
+				appendContent(diff.additionLines[additionLine.lineIndex], additionLine.lineIndex, bucket.additionSegments, bucket.additionContent);
 				bucket.additionInfo.push({
 					type: type === "change" ? "change-addition" : type,
-					lineNumber: additionLineNumber,
-					altLineNumber: type === "change" ? undefined : deletionLineNumber ?? undefined,
-					lineIndex: `${unifiedAdditionLineIndex},${splitLineIndex}`
+					lineNumber: additionLine.lineNumber,
+					altLineNumber: type === "change" ? undefined : deletionLine.lineNumber ?? undefined,
+					lineIndex: `${additionLine.unifiedLineIndex},${splitLineIndex}`
 				});
 			}
 		}
@@ -15112,9 +15220,82 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
 	};
 }
 
+//#endregion
+//#region src/utils/iterateOverFile.ts
+/**
+* Iterates over lines in a file with optional windowing support.
+*
+* Similar to `iterateOverDiff` but simplified for linear file content.
+* Supports viewport windowing for virtualization scenarios.
+*
+* @param props - Configuration for iteration
+* @param props.lines - Pre-split array of lines (use splitFileContents() to create from string)
+* @param props.startingLine - Optional starting line index (0-based, default: 0)
+* @param props.totalLines - Optional max lines to iterate (default: Infinity)
+* @param props.callback - Callback invoked for each line in the window.
+*                         Return `true` to stop iteration early.
+*
+* @example
+* ```typescript
+* const lines = splitFileContents('line1\nline2\nline3');
+* iterateOverFile({
+*   lines,
+*   startingLine: 0,
+*   totalLines: 10,
+*   callback: ({ lineIndex, lineNumber, content, isLastLine }) => {
+*     console.log(`Line ${lineNumber}: ${content}`);
+*     if (content.includes('stop')) return true; // Stop iteration
+*   }
+* });
+* ```
+*/
+function iterateOverFile({ lines, startingLine = 0, totalLines = Infinity, callback }) {
+	const len = Math.min(startingLine + totalLines, lines.length);
+	const lastLineIndex = (() => {
+		const lastLine = lines.at(-1);
+		if (lastLine === "" || lastLine === "\n" || lastLine === "\r\n" || lastLine === "\r") {
+			return Math.max(0, lines.length - 2);
+		}
+		return lines.length - 1;
+	})();
+	for (let lineIndex = startingLine; lineIndex < len; lineIndex++) {
+		const isLastLine = lineIndex === lastLineIndex;
+		if (callback({
+			lineIndex,
+			lineNumber: lineIndex + 1,
+			content: lines[lineIndex],
+			isLastLine
+		}) === true || isLastLine) {
+			break;
+		}
+	}
+}
+
+//#endregion
+//#region src/utils/splitFileContents.ts
+/**
+* Splits file contents into lines using the same logic as diff parsing.
+* - Preserves trailing newlines on each line
+*
+* @param contents - The raw file contents string
+* @returns Array of lines with newlines preserved
+*/
+function splitFileContents(contents) {
+	return contents !== "" ? contents.split(SPLIT_WITH_NEWLINES) : [];
+}
+
 //#endregion
 //#region src/utils/renderFileWithHighlighter.ts
-function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES, tokenizeMaxLineLength }, forcePlainText = false) {
+const DEFAULT_PLAIN_TEXT_OPTIONS = { forcePlainText: false };
+function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES, tokenizeMaxLineLength }, { forcePlainText, startingLine, totalLines, lines } = DEFAULT_PLAIN_TEXT_OPTIONS) {
+	if (forcePlainText) {
+		startingLine ??= 0;
+		totalLines ??= Infinity;
+	} else {
+		startingLine = 0;
+		totalLines = Infinity;
+	}
+	const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;
 	const { state, transformers } = createTransformerWithState();
 	const lang = forcePlainText ? "text" : file.lang ?? getFiletypeFromFileName(file.name);
 	const baseThemeType = (() => {
@@ -15129,8 +15310,8 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
 	});
 	state.lineInfo = (shikiLineNumber) => ({
 		type: "context",
-		lineIndex: shikiLineNumber - 1,
-		lineNumber: shikiLineNumber
+		lineIndex: shikiLineNumber - 1 + startingLine,
+		lineNumber: shikiLineNumber + startingLine
 	});
 	const hastConfig = (() => {
 		if (typeof theme === "string") {
@@ -15152,12 +15333,29 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
 			tokenizeMaxLineLength
 		};
 	})();
+	const highlightedLines = getLineNodes(highlighter$1.codeToHast(isWindowedHighlight ? extractWindowedFileContent(lines ?? splitFileContents(file.contents), startingLine, totalLines) : cleanLastNewline(file.contents), hastConfig));
+	const code = isWindowedHighlight ? new Array(startingLine) : highlightedLines;
+	if (isWindowedHighlight) {
+		code.push(...highlightedLines);
+	}
 	return {
-		code: getLineNodes(highlighter$1.codeToHast(cleanLastNewline(file.contents), hastConfig)),
+		code,
 		themeStyles,
 		baseThemeType
 	};
 }
+function extractWindowedFileContent(lines, startingLine, totalLines) {
+	let windowContent = "";
+	iterateOverFile({
+		lines,
+		startingLine,
+		totalLines,
+		callback({ content }) {
+			windowContent += content;
+		}
+	});
+	return windowContent;
+}
 
 //#endregion
 //#region src/worker/worker.ts