@pierre/diffs 1.3.0-beta.5 → 1.3.0-beta.7

package/dist/worker/worker.js

@@ -5,9 +5,7 @@ import { createThemeResolver } from "@pierre/theming";
 import { diffChars, diffWordsWithSpace } from "diff";
 import { transformerStyleToClass } from "@shikijs/transformers";
 import { normalizeThemeColors } from "@pierre/theming/color";
-
-//#region src/constants.ts
-const DIFFS_DEVELOPMENT_BUILD = (() => {
+(() => {
 	try {
 		return process.env.NODE_ENV === "development";
 	} catch {
@@ -18,30 +16,17 @@ const DEFAULT_THEMES = {
 	dark: "pierre-dark",
 	light: "pierre-light"
 };
-const DEFAULT_COLLAPSED_CONTEXT_THRESHOLD = 1;
-const DEFAULT_VIRTUAL_FILE_METRICS = {
-	hunkLineCount: 50,
-	lineHeight: 20,
-	diffHeaderHeight: 44,
-	spacing: 8
-};
-const DEFAULT_CODE_VIEW_FILE_METRICS = {
-	...DEFAULT_VIRTUAL_FILE_METRICS,
-	hunkLineCount: 1
-};
-const DEFAULT_EXPANDED_REGION = Object.freeze({
+Object.freeze({
 	fromStart: 0,
 	fromEnd: 0
 });
-
 //#endregion
 //#region src/highlighter/languages/constants.ts
 const ResolvedLanguages = /* @__PURE__ */ new Map();
 const AttachedLanguages = /* @__PURE__ */ new Set();
-
 //#endregion
 //#region src/highlighter/languages/attachResolvedLanguages.ts
-function attachResolvedLanguages(resolvedLanguages, highlighter$1) {
+function attachResolvedLanguages(resolvedLanguages, highlighter) {
 	resolvedLanguages = Array.isArray(resolvedLanguages) ? resolvedLanguages : [resolvedLanguages];
 	for (const resolvedLang of resolvedLanguages) {
 		if (AttachedLanguages.has(resolvedLang.name)) continue;
@@ -51,21 +36,18 @@ function attachResolvedLanguages(resolvedLanguages, highlighter$1) {
 			ResolvedLanguages.set(resolvedLang.name, lang);
 		}
 		AttachedLanguages.add(lang.name);
-		highlighter$1.loadLanguageSync(lang.data);
+		highlighter.loadLanguageSync(lang.data);
 	}
 }
-
 //#endregion
 //#region src/highlighter/themes/constants.ts
 const AttachedThemes = /* @__PURE__ */ new Set();
-
 //#endregion
 //#region src/highlighter/themes/themeResolver.ts
 const themeResolver = createThemeResolver();
-
 //#endregion
 //#region src/highlighter/themes/attachResolvedThemes.ts
-function attachResolvedThemes(themes, highlighter$1) {
+function attachResolvedThemes(themes, highlighter) {
 	themes = Array.isArray(themes) ? themes : [themes];
 	for (let themeRef of themes) {
 		let resolvedTheme;
@@ -79,10 +61,9 @@ function attachResolvedThemes(themes, highlighter$1) {
 		}
 		if (AttachedThemes.has(themeRef)) continue;
 		AttachedThemes.add(themeRef);
-		highlighter$1.loadThemeSync(resolvedTheme);
+		highlighter.loadThemeSync(resolvedTheme);
 	}
 }
-
 //#endregion
 //#region src/utils/getFiletypeFromFileName.ts
 const CUSTOM_EXTENSION_TO_FILE_FORMAT = /* @__PURE__ */ new Map();
@@ -396,6 +377,8 @@ const EXTENSION_TO_FILE_FORMAT = {
 	tfvars: "tfvars",
 	toml: "toml",
 	ts: "typescript",
+	mts: "typescript",
+	cts: "typescript",
 	tsp: "typespec",
 	tsv: "tsv",
 	tsx: "tsx",
@@ -454,7 +437,6 @@ function replaceCustomExtensions(version, map) {
 	customExtensionsVersion = version;
 	return true;
 }
-
 //#endregion
 //#region src/utils/cleanLastNewline.ts
 function cleanLastNewline(contents) {
@@ -465,7 +447,6 @@ function cleanLastNewline(contents) {
 	}
 	return contents.slice(0, end);
 }
-
 //#endregion
 //#region src/utils/hast_utils.ts
 function createTextNodeElement(value) {
@@ -490,7 +471,6 @@ function findCodeElement(nodes) {
 		else firstChild = null;
 	}
 }
-
 //#endregion
 //#region src/utils/processLine.ts
 function processLine(node, line, state) {
@@ -512,7 +492,6 @@ function processLine(node, line, state) {
 	if (node.children.length === 0) node.children.push(createTextNodeElement("\n"));
 	return node;
 }
-
 //#endregion
 //#region src/utils/wrapTokenFragments.ts
 const NO_TOKEN = Symbol("no-token");
@@ -590,7 +569,6 @@ function stripTokenChar(node) {
 function setTokenChar(node, char) {
 	node.properties["data-char"] = char;
 }
-
 //#endregion
 //#region src/utils/createTransformerWithState.ts
 function createTransformerWithState(useTokenTransformer = false, useCSSClasses = false) {
@@ -673,19 +651,17 @@ const tokenStyleNormalizer = {
 		}
 	}
 };
-
 //#endregion
 //#region src/utils/formatCSSVariablePrefix.ts
 function formatCSSVariablePrefix(type) {
 	return `--${type === "token" ? "diffs-token" : "diffs"}-`;
 }
-
 //#endregion
 //#region src/utils/getHighlighterThemeStyles.ts
-function getHighlighterThemeStyles({ theme = DEFAULT_THEMES, highlighter: highlighter$1, prefix }) {
+function getHighlighterThemeStyles({ theme = DEFAULT_THEMES, highlighter, prefix }) {
 	let styles = "";
 	if (typeof theme === "string") {
-		const themeData = highlighter$1.getTheme(theme);
+		const themeData = highlighter.getTheme(theme);
 		const normalized = normalizeThemeColors(themeData);
 		styles += `color:${normalized.fg};`;
 		styles += `background-color:${normalized.bg};`;
@@ -693,12 +669,12 @@ function getHighlighterThemeStyles({ theme = DEFAULT_THEMES, highlighter: highli
 		styles += `${formatCSSVariablePrefix("global")}bg:${normalized.bg};`;
 		styles += getGitVariables(themeData, prefix);
 	} else {
-		let themeData = highlighter$1.getTheme(theme.dark);
+		let themeData = highlighter.getTheme(theme.dark);
 		let normalized = normalizeThemeColors(themeData);
 		styles += `${formatCSSVariablePrefix("global")}dark:${normalized.fg};`;
 		styles += `${formatCSSVariablePrefix("global")}dark-bg:${normalized.bg};`;
 		styles += getGitVariables(themeData, "dark");
-		themeData = highlighter$1.getTheme(theme.light);
+		themeData = highlighter.getTheme(theme.light);
 		normalized = normalizeThemeColors(themeData);
 		styles += `${formatCSSVariablePrefix("global")}light:${normalized.fg};`;
 		styles += `${formatCSSVariablePrefix("global")}light-bg:${normalized.bg};`;
@@ -717,7 +693,6 @@ function getGitVariables(themeData, modePrefix) {
 	if (modifiedBlue != null) styles += `${formatCSSVariablePrefix("global")}${modePrefix}modified-color:${modifiedBlue};`;
 	return styles;
 }
-
 //#endregion
 //#region src/utils/getLineNodes.ts
 function getLineNodes(nodes) {
@@ -730,7 +705,6 @@ function getLineNodes(nodes) {
 	console.error(nodes);
 	throw new Error("getLineNodes: Unable to find children");
 }
-
 //#endregion
 //#region src/utils/virtualDiffLayout.ts
 function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, collapsedContextThreshold }) {
@@ -795,10 +769,9 @@ function getTrailingExpandedRegion({ fileDiff, hunkIndex, expandedHunks, collaps
 		renderAll: fromStart >= trailingRangeSize
 	};
 }
-
 //#endregion
 //#region src/utils/iterateOverDiff.ts
-function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, callback }) {
+function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, collapsedContextThreshold = 1, callback }) {
 	const iterationStart = getIterationStartState({
 		diff,
 		diffStyle,
@@ -821,10 +794,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			else if (diffStyle === "split") return breakSplit;
 			else return breakUnified && breakSplit;
 		},
-		shouldSkip(unifiedHeight, splitHeight) {
+		shouldSkip(unifiedCount, splitCount) {
 			if (!state.isWindowedHighlight) return false;
-			const skipUnified = state.unifiedCount + unifiedHeight < startingLine;
-			const skipSplit = state.splitCount + splitHeight < startingLine;
+			const skipUnified = unifiedCount > 0 && state.unifiedCount + unifiedCount <= startingLine;
+			const skipSplit = splitCount > 0 && state.splitCount + splitCount <= startingLine;
 			if (diffStyle === "unified") return skipUnified;
 			else if (diffStyle === "split") return skipSplit;
 			else return skipUnified && skipSplit;
@@ -873,10 +846,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			errorPrefix: "iterateOverDiff"
 		}) : void 0;
 		const expandedLineCount = leadingRegion.fromStart + leadingRegion.fromEnd;
-		function getTrailingCollapsedAfter(unifiedLineIndex$1, splitLineIndex$1) {
+		function getTrailingCollapsedAfter(unifiedLineIndex, splitLineIndex) {
 			if (trailingRegion == null || trailingRegion.collapsedLines <= 0 || trailingRegion.fromStart + trailingRegion.fromEnd > 0) return 0;
-			if (diffStyle === "unified") return unifiedLineIndex$1 === hunk.unifiedLineStart + hunk.unifiedLineCount - 1 ? trailingRegion.collapsedLines : 0;
-			return splitLineIndex$1 === hunk.splitLineStart + hunk.splitLineCount - 1 ? trailingRegion.collapsedLines : 0;
+			if (diffStyle === "unified") return unifiedLineIndex === hunk.unifiedLineStart + hunk.unifiedLineCount - 1 ? trailingRegion.collapsedLines : 0;
+			return splitLineIndex === hunk.splitLineStart + hunk.splitLineCount - 1 ? trailingRegion.collapsedLines : 0;
 		}
 		let consumedCollapsed = leadingRegion.collapsedLines === 0;
 		function consumePendingCollapsed() {
@@ -885,12 +858,12 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			return leadingRegion.collapsedLines;
 		}
 		if (!state.shouldSkip(expandedLineCount, expandedLineCount)) {
-			let unifiedLineIndex$1 = hunk.unifiedLineStart - leadingRegion.rangeSize;
-			let splitLineIndex$1 = hunk.splitLineStart - leadingRegion.rangeSize;
-			let deletionLineIndex$1 = hunk.deletionLineIndex - leadingRegion.rangeSize;
-			let additionLineIndex$1 = hunk.additionLineIndex - leadingRegion.rangeSize;
-			let deletionLineNumber$1 = hunk.deletionStart - leadingRegion.rangeSize;
-			let additionLineNumber$1 = hunk.additionStart - leadingRegion.rangeSize;
+			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;
 			if (walkContextLines(state, leadingRegion.fromStart, diffStyle, (index) => {
 				return state.emit({
 					hunkIndex,
@@ -899,27 +872,27 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 					collapsedAfter: 0,
 					type: "context-expanded",
 					deletionLine: {
-						lineNumber: deletionLineNumber$1 + index,
-						lineIndex: deletionLineIndex$1 + index,
+						lineNumber: deletionLineNumber + index,
+						lineIndex: deletionLineIndex + index,
 						noEOFCR: false,
-						unifiedLineIndex: unifiedLineIndex$1 + index,
-						splitLineIndex: splitLineIndex$1 + index
+						unifiedLineIndex: unifiedLineIndex + index,
+						splitLineIndex: splitLineIndex + index
 					},
 					additionLine: {
-						unifiedLineIndex: unifiedLineIndex$1 + index,
-						splitLineIndex: splitLineIndex$1 + index,
-						lineIndex: additionLineIndex$1 + index,
-						lineNumber: additionLineNumber$1 + index,
+						unifiedLineIndex: unifiedLineIndex + index,
+						splitLineIndex: splitLineIndex + index,
+						lineIndex: additionLineIndex + index,
+						lineNumber: additionLineNumber + index,
 						noEOFCR: false
 					}
 				});
 			})) break hunkIterator;
-			unifiedLineIndex$1 = hunk.unifiedLineStart - leadingRegion.fromEnd;
-			splitLineIndex$1 = hunk.splitLineStart - leadingRegion.fromEnd;
-			deletionLineIndex$1 = hunk.deletionLineIndex - leadingRegion.fromEnd;
-			additionLineIndex$1 = hunk.additionLineIndex - leadingRegion.fromEnd;
-			deletionLineNumber$1 = hunk.deletionStart - leadingRegion.fromEnd;
-			additionLineNumber$1 = hunk.additionStart - leadingRegion.fromEnd;
+			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;
 			if (walkContextLines(state, leadingRegion.fromEnd, diffStyle, (index) => {
 				return state.emit({
 					hunkIndex,
@@ -928,17 +901,17 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 					collapsedAfter: 0,
 					type: "context-expanded",
 					deletionLine: {
-						lineNumber: deletionLineNumber$1 + index,
-						lineIndex: deletionLineIndex$1 + index,
+						lineNumber: deletionLineNumber + index,
+						lineIndex: deletionLineIndex + index,
 						noEOFCR: false,
-						unifiedLineIndex: unifiedLineIndex$1 + index,
-						splitLineIndex: splitLineIndex$1 + index
+						unifiedLineIndex: unifiedLineIndex + index,
+						splitLineIndex: splitLineIndex + index
 					},
 					additionLine: {
-						unifiedLineIndex: unifiedLineIndex$1 + index,
-						splitLineIndex: splitLineIndex$1 + index,
-						lineIndex: additionLineIndex$1 + index,
-						lineNumber: additionLineNumber$1 + index,
+						unifiedLineIndex: unifiedLineIndex + index,
+						splitLineIndex: splitLineIndex + index,
+						lineIndex: additionLineIndex + index,
+						lineNumber: additionLineNumber + index,
 						noEOFCR: false
 					}
 				});
@@ -1083,20 +1056,20 @@ function getIterationStartState({ diff, diffStyle, startingLine, expandedHunks,
 	let result = diff.hunks.length;
 	while (low <= high) {
 		const mid = low + high >> 1;
-		const counts$1 = prefixCounts[mid + 1];
-		if (counts$1 == null) throw new Error("iterateOverDiff: invalid hunk prefix index");
-		if ((diffStyle === "unified" ? counts$1.unifiedCount : counts$1.splitCount) > startingLine) {
+		const counts = prefixCounts[mid + 1];
+		if (counts == null) throw new Error("iterateOverDiff: invalid hunk prefix index");
+		if ((diffStyle === "unified" ? counts.unifiedCount : counts.splitCount) > startingLine) {
 			result = mid;
 			high = mid - 1;
 		} else low = mid + 1;
 	}
 	if (result >= diff.hunks.length) {
-		const counts$1 = prefixCounts[diff.hunks.length];
-		if (counts$1 == null) throw new Error("iterateOverDiff: invalid terminal hunk prefix index");
+		const counts = prefixCounts[diff.hunks.length];
+		if (counts == null) throw new Error("iterateOverDiff: invalid terminal hunk prefix index");
 		return {
 			hunkIndex: diff.hunks.length,
-			splitCount: counts$1.splitCount,
-			unifiedCount: counts$1.unifiedCount
+			splitCount: counts.splitCount,
+			unifiedCount: counts.unifiedCount
 		};
 	}
 	const counts = prefixCounts[result];
@@ -1151,9 +1124,9 @@ function getContextLineIterationBounds(state, count, diffStyle) {
 	if (!state.isWindowedHighlight || count <= 0) return [0, count];
 	const ranges = [];
 	function pushRange(currentCount) {
-		const start$1 = Math.max(0, state.viewportStart - currentCount);
-		const end$1 = Math.min(count, state.viewportEnd - currentCount);
-		if (end$1 > start$1) ranges.push([start$1, end$1]);
+		const start = Math.max(0, state.viewportStart - currentCount);
+		const end = Math.min(count, state.viewportEnd - currentCount);
+		if (end > start) ranges.push([start, end]);
 	}
 	if (diffStyle !== "split") pushRange(state.unifiedCount);
 	if (diffStyle !== "unified") pushRange(state.splitCount);
@@ -1279,7 +1252,6 @@ function getChangeLineData({ hunkIndex, hunk, collapsedAfter, collapsedBefore, d
 		additionLine
 	};
 }
-
 //#endregion
 //#region src/utils/parseDiffDecorations.ts
 function createDiffSpanDecoration({ line, spanStart, spanLength }) {
@@ -1309,11 +1281,10 @@ function pushOrJoinSpan({ item, arr, enableJoin, isNeutral = false, isLastItem =
 	}
 	arr.push([isNeutral ? 0 : 1, item.value]);
 }
-
 //#endregion
 //#region src/utils/renderDiffWithHighlighter.ts
 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) {
+function renderDiffWithHighlighter(diff, highlighter, options, { forcePlainText, startingLine, totalLines, expandedHunks, collapsedContextThreshold = 1 } = DEFAULT_PLAIN_TEXT_OPTIONS$1) {
 	if (forcePlainText) {
 		startingLine ??= 0;
 		totalLines ??= Infinity;
@@ -1322,10 +1293,10 @@ function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainTex
 		totalLines = Infinity;
 	}
 	const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;
-	const baseThemeType = typeof options.theme === "string" ? highlighter$1.getTheme(options.theme).type : void 0;
+	const baseThemeType = typeof options.theme === "string" ? highlighter.getTheme(options.theme).type : void 0;
 	const themeStyles = getHighlighterThemeStyles({
 		theme: options.theme,
-		highlighter: highlighter$1
+		highlighter
 	});
 	const lineDiffType = forcePlainText && !isWindowedHighlight && (diff.unifiedLineCount > 1e3 || diff.splitLineCount > 1e3) ? "none" : options.lineDiffType;
 	const code = {
@@ -1414,7 +1385,7 @@ function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainTex
 			additionFile,
 			additionInfo: bucket.additionInfo,
 			additionDecorations: bucket.additionDecorations,
-			highlighter: highlighter$1,
+			highlighter,
 			options,
 			languageOverride: forcePlainText ? "text" : diff.lang
 		});
@@ -1519,7 +1490,7 @@ function createBucket() {
 		additionSegments: []
 	};
 }
-function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo, highlighter: highlighter$1, deletionDecorations, additionDecorations, languageOverride, options: { theme: themeOrThemes = DEFAULT_THEMES,...options } }) {
+function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo, highlighter, deletionDecorations, additionDecorations, languageOverride, options: { theme: themeOrThemes = DEFAULT_THEMES, ...options } }) {
 	const deletionLang = languageOverride ?? getFiletypeFromFileName(deletionFile.name);
 	const additionLang = languageOverride ?? getFiletypeFromFileName(additionFile.name);
 	const { state, transformers } = createTransformerWithState(options.useTokenTransformer);
@@ -1550,18 +1521,17 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
 			hastConfig.lang = deletionLang;
 			state.lineInfo = deletionInfo;
 			hastConfig.decorations = deletionDecorations;
-			return getLineNodes(highlighter$1.codeToHast(cleanLastNewline(deletionFile.contents), hastConfig));
+			return getLineNodes(highlighter.codeToHast(cleanLastNewline(deletionFile.contents), hastConfig));
 		})(),
 		additionLines: (() => {
 			if (additionFile.contents === "") return [];
 			hastConfig.lang = additionLang;
 			hastConfig.decorations = additionDecorations;
 			state.lineInfo = additionInfo;
-			return getLineNodes(highlighter$1.codeToHast(cleanLastNewline(additionFile.contents), hastConfig));
+			return getLineNodes(highlighter.codeToHast(cleanLastNewline(additionFile.contents), hastConfig));
 		})()
 	};
 }
-
 //#endregion
 //#region src/utils/computeFileOffsets.ts
 const LINE_FEED = 10;
@@ -1592,11 +1562,10 @@ function linesFromFileContents(contents) {
 		return contents.slice(start, end);
 	});
 }
-
 //#endregion
 //#region src/utils/renderFileWithHighlighter.ts
 const DEFAULT_PLAIN_TEXT_OPTIONS = { forcePlainText: false };
-function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES, tokenizeMaxLineLength, useTokenTransformer }, { forcePlainText, startingLine, totalLines, lines } = DEFAULT_PLAIN_TEXT_OPTIONS) {
+function renderFileWithHighlighter(file, highlighter, { theme = DEFAULT_THEMES, tokenizeMaxLineLength, useTokenTransformer }, { forcePlainText, startingLine, totalLines, lines } = DEFAULT_PLAIN_TEXT_OPTIONS) {
 	if (forcePlainText) {
 		startingLine ??= 0;
 		totalLines ??= Infinity;
@@ -1607,10 +1576,10 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
 	const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;
 	const { state, transformers } = createTransformerWithState(useTokenTransformer);
 	const lang = forcePlainText ? "text" : file.lang ?? getFiletypeFromFileName(file.name);
-	const baseThemeType = typeof theme === "string" ? highlighter$1.getTheme(theme).type : void 0;
+	const baseThemeType = typeof theme === "string" ? highlighter.getTheme(theme).type : void 0;
 	const themeStyles = getHighlighterThemeStyles({
 		theme,
-		highlighter: highlighter$1
+		highlighter
 	});
 	state.lineInfo = (shikiLineNumber) => ({
 		type: "context",
@@ -1637,7 +1606,7 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
 			tokenizeTimeLimit: 0
 		};
 	})();
-	const highlightedLines = getLineNodes(highlighter$1.codeToHast(isWindowedHighlight ? extractWindowedFileContent(lines ?? linesFromFileContents(file.contents), startingLine, totalLines) : file.contents, hastConfig));
+	const highlightedLines = getLineNodes(highlighter.codeToHast(isWindowedHighlight ? extractWindowedFileContent(lines ?? linesFromFileContents(file.contents), startingLine, totalLines) : file.contents, hastConfig));
 	const code = isWindowedHighlight ? new Array(startingLine) : highlightedLines;
 	if (isWindowedHighlight) code.push(...highlightedLines);
 	return {
@@ -1651,7 +1620,6 @@ function extractWindowedFileContent(lines, startingLine, totalLines) {
 	const endLine = Math.min(startingLine + totalLines, lines.length);
 	return lines.slice(startingLine, endLine).join("");
 }
-
 //#endregion
 //#region src/worker/worker.ts
 let highlighter;
@@ -1693,15 +1661,15 @@ async function handleMessage(request) {
 		EMPTY_REGEXP.exec("");
 	}
 }
-async function handleInitialize({ id, renderOptions: options, preferredHighlighter, resolvedThemes, resolvedLanguages, customExtensionsVersion: customExtensionsVersion$1, customExtensionMap }) {
-	let highlighter$1 = getHighlighter(preferredHighlighter);
-	if ("then" in highlighter$1) highlighter$1 = await highlighter$1;
+async function handleInitialize({ id, renderOptions: options, preferredHighlighter, resolvedThemes, resolvedLanguages, customExtensionsVersion, customExtensionMap }) {
+	let highlighter = getHighlighter(preferredHighlighter);
+	if ("then" in highlighter) highlighter = await highlighter;
 	syncCustomExtensionsFromRequest({
-		customExtensionsVersion: customExtensionsVersion$1,
+		customExtensionsVersion,
 		customExtensionMap
 	});
-	attachResolvedThemes(resolvedThemes, highlighter$1);
-	if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter$1);
+	attachResolvedThemes(resolvedThemes, highlighter);
+	if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter);
 	renderOptions = options;
 	postMessage({
 		type: "success",
@@ -1711,9 +1679,9 @@ async function handleInitialize({ id, renderOptions: options, preferredHighlight
 	});
 }
 async function handleSetRenderOptions({ id, renderOptions: options, resolvedThemes }) {
-	let highlighter$1 = getHighlighter();
-	if ("then" in highlighter$1) highlighter$1 = await highlighter$1;
-	attachResolvedThemes(resolvedThemes, highlighter$1);
+	let highlighter = getHighlighter();
+	if ("then" in highlighter) highlighter = await highlighter;
+	attachResolvedThemes(resolvedThemes, highlighter);
 	renderOptions = options;
 	postMessage({
 		type: "success",
@@ -1722,30 +1690,30 @@ async function handleSetRenderOptions({ id, renderOptions: options, resolvedThem
 		sentAt: Date.now()
 	});
 }
-async function handleRenderFile({ id, file, resolvedLanguages, customExtensionsVersion: customExtensionsVersion$1, customExtensionMap }) {
-	let highlighter$1 = getHighlighter();
-	if ("then" in highlighter$1) highlighter$1 = await highlighter$1;
+async function handleRenderFile({ id, file, resolvedLanguages, customExtensionsVersion, customExtensionMap }) {
+	let highlighter = getHighlighter();
+	if ("then" in highlighter) highlighter = await highlighter;
 	syncCustomExtensionsFromRequest({
-		customExtensionsVersion: customExtensionsVersion$1,
+		customExtensionsVersion,
 		customExtensionMap
 	});
-	if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter$1);
+	if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter);
 	const fileOptions = {
 		theme: renderOptions.theme,
 		useTokenTransformer: renderOptions.useTokenTransformer,
 		tokenizeMaxLineLength: renderOptions.tokenizeMaxLineLength
 	};
-	sendFileSuccess(id, renderFileWithHighlighter(file, highlighter$1, fileOptions), fileOptions);
+	sendFileSuccess(id, renderFileWithHighlighter(file, highlighter, fileOptions), fileOptions);
 }
-async function handleRenderDiff({ id, diff, resolvedLanguages, customExtensionsVersion: customExtensionsVersion$1, customExtensionMap }) {
-	let highlighter$1 = getHighlighter();
-	if ("then" in highlighter$1) highlighter$1 = await highlighter$1;
+async function handleRenderDiff({ id, diff, resolvedLanguages, customExtensionsVersion, customExtensionMap }) {
+	let highlighter = getHighlighter();
+	if ("then" in highlighter) highlighter = await highlighter;
 	syncCustomExtensionsFromRequest({
-		customExtensionsVersion: customExtensionsVersion$1,
+		customExtensionsVersion,
 		customExtensionMap
 	});
-	if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter$1);
-	sendDiffSuccess(id, renderDiffWithHighlighter(diff, highlighter$1, renderOptions), renderOptions);
+	if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter);
+	sendDiffSuccess(id, renderDiffWithHighlighter(diff, highlighter, renderOptions), renderOptions);
 }
 function getHighlighter(preferredHighlighter = "shiki-js") {
 	highlighter ??= createHighlighterCore({
@@ -1755,10 +1723,10 @@ function getHighlighter(preferredHighlighter = "shiki-js") {
 	});
 	return highlighter;
 }
-function syncCustomExtensionsFromRequest({ customExtensionsVersion: customExtensionsVersion$1, customExtensionMap }) {
-	if (customExtensionsVersion$1 == null && customExtensionMap == null) return;
-	if (customExtensionsVersion$1 == null || customExtensionMap == null) throw new Error("Worker request must include both customExtensionsVersion and customExtensionMap");
-	replaceCustomExtensions(customExtensionsVersion$1, customExtensionMap);
+function syncCustomExtensionsFromRequest({ customExtensionsVersion, customExtensionMap }) {
+	if (customExtensionsVersion == null && customExtensionMap == null) return;
+	if (customExtensionsVersion == null || customExtensionMap == null) throw new Error("Worker request must include both customExtensionsVersion and customExtensionMap");
+	replaceCustomExtensions(customExtensionsVersion, customExtensionMap);
 }
 function sendFileSuccess(id, result, options) {
 	postMessage({
@@ -1789,6 +1757,6 @@ function sendError(id, error) {
 	};
 	postMessage(response);
 }
-
 //#endregion
+
 //# sourceMappingURL=worker.js.map