@pierre/diffs 1.3.0-beta.1 → 1.3.0-beta.11

package/dist/worker/worker.js

@@ -1,11 +1,11 @@
 import { createHighlighterCore } from "shiki/core";
 import { createJavaScriptRegexEngine } from "shiki/engine/javascript";
 import { createOnigurumaEngine } from "shiki/engine/oniguruma";
+import { createThemeResolver } from "@pierre/theming";
 import { diffChars, diffWordsWithSpace } from "diff";
 import { transformerStyleToClass } from "@shikijs/transformers";
-
-//#region src/constants.ts
-const DIFFS_DEVELOPMENT_BUILD = (() => {
+import { normalizeThemeColors } from "@pierre/theming/color";
+(() => {
 	try {
 		return process.env.NODE_ENV === "development";
 	} catch {
@@ -16,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;
@@ -49,35 +36,34 @@ 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 ResolvedThemes = /* @__PURE__ */ new Map();
 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;
 		if (typeof themeRef === "string") {
-			resolvedTheme = ResolvedThemes.get(themeRef);
+			resolvedTheme = themeResolver.getResolvedTheme(themeRef);
 			if (resolvedTheme == null) throw new Error(`loadResolvedThemes: ${themeRef} is not resolved, you must resolve it before calling loadResolvedThemes`);
 		} else {
 			resolvedTheme = themeRef;
 			themeRef = themeRef.name;
-			if (!ResolvedThemes.has(themeRef)) ResolvedThemes.set(themeRef, resolvedTheme);
+			if (themeResolver.getResolvedTheme(themeRef) == null) themeResolver.seedResolvedTheme(themeRef, resolvedTheme);
 		}
 		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();
@@ -391,6 +377,8 @@ const EXTENSION_TO_FILE_FORMAT = {
 	tfvars: "tfvars",
 	toml: "toml",
 	ts: "typescript",
+	mts: "typescript",
+	cts: "typescript",
 	tsp: "typespec",
 	tsv: "tsv",
 	tsx: "tsx",
@@ -449,7 +437,6 @@ function replaceCustomExtensions(version, map) {
 	customExtensionsVersion = version;
 	return true;
 }
-
 //#endregion
 //#region src/utils/cleanLastNewline.ts
 function cleanLastNewline(contents) {
@@ -460,7 +447,6 @@ function cleanLastNewline(contents) {
 	}
 	return contents.slice(0, end);
 }
-
 //#endregion
 //#region src/utils/hast_utils.ts
 function createTextNodeElement(value) {
@@ -485,7 +471,6 @@ function findCodeElement(nodes) {
 		else firstChild = null;
 	}
 }
-
 //#endregion
 //#region src/utils/processLine.ts
 function processLine(node, line, state) {
@@ -507,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");
@@ -585,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) {
@@ -668,37 +651,38 @@ 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);
-		styles += `color:${themeData.fg};`;
-		styles += `background-color:${themeData.bg};`;
-		styles += `${formatCSSVariablePrefix("global")}fg:${themeData.fg};`;
-		styles += `${formatCSSVariablePrefix("global")}bg:${themeData.bg};`;
-		styles += getThemeVariables(themeData, prefix);
+		const themeData = highlighter.getTheme(theme);
+		const normalized = normalizeThemeColors(themeData);
+		styles += `color:${normalized.fg};`;
+		styles += `background-color:${normalized.bg};`;
+		styles += `${formatCSSVariablePrefix("global")}fg:${normalized.fg};`;
+		styles += `${formatCSSVariablePrefix("global")}bg:${normalized.bg};`;
+		styles += getGitVariables(themeData, prefix);
 	} else {
-		let themeData = highlighter$1.getTheme(theme.dark);
-		styles += `${formatCSSVariablePrefix("global")}dark:${themeData.fg};`;
-		styles += `${formatCSSVariablePrefix("global")}dark-bg:${themeData.bg};`;
-		styles += getThemeVariables(themeData, "dark");
-		themeData = highlighter$1.getTheme(theme.light);
-		styles += `${formatCSSVariablePrefix("global")}light:${themeData.fg};`;
-		styles += `${formatCSSVariablePrefix("global")}light-bg:${themeData.bg};`;
-		styles += getThemeVariables(themeData, "light");
+		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.getTheme(theme.light);
+		normalized = normalizeThemeColors(themeData);
+		styles += `${formatCSSVariablePrefix("global")}light:${normalized.fg};`;
+		styles += `${formatCSSVariablePrefix("global")}light-bg:${normalized.bg};`;
+		styles += getGitVariables(themeData, "light");
 	}
 	return styles;
 }
-function getThemeVariables(themeData, modePrefix) {
+function getGitVariables(themeData, modePrefix) {
 	modePrefix = modePrefix != null ? `${modePrefix}-` : "";
 	let styles = "";
 	const additionGreen = themeData.colors?.["gitDecoration.addedResourceForeground"] ?? themeData.colors?.["terminal.ansiGreen"];
@@ -709,7 +693,6 @@ function getThemeVariables(themeData, modePrefix) {
 	if (modifiedBlue != null) styles += `${formatCSSVariablePrefix("global")}${modePrefix}modified-color:${modifiedBlue};`;
 	return styles;
 }
-
 //#endregion
 //#region src/utils/getLineNodes.ts
 function getLineNodes(nodes) {
@@ -722,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 }) {
@@ -754,10 +736,42 @@ function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, col
 		renderAll
 	};
 }
-
+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);
+	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);
+}
+function getTrailingExpandedRegion({ fileDiff, hunkIndex, expandedHunks, collapsedContextThreshold, errorPrefix }) {
+	if (hunkIndex !== fileDiff.hunks.length - 1) return;
+	const trailingRangeSize = getTrailingContextRangeSize({
+		fileDiff,
+		errorPrefix
+	});
+	if (trailingRangeSize <= 0) return;
+	if (expandedHunks === true || trailingRangeSize <= collapsedContextThreshold) return {
+		fromStart: trailingRangeSize,
+		fromEnd: 0,
+		rangeSize: trailingRangeSize,
+		collapsedLines: 0,
+		renderAll: true
+	};
+	const region = expandedHunks?.get(fileDiff.hunks.length);
+	const fromStart = Math.min(Math.max(region?.fromStart ?? 0, 0), trailingRangeSize);
+	return {
+		fromStart,
+		fromEnd: 0,
+		rangeSize: trailingRangeSize,
+		collapsedLines: trailingRangeSize - fromStart,
+		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,
@@ -766,12 +780,12 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		collapsedContextThreshold
 	});
 	const state = {
-		finalHunk: diff.hunks.at(-1),
 		viewportStart: startingLine,
 		viewportEnd: startingLine + totalLines,
 		isWindowedHighlight: startingLine > 0 || totalLines < Infinity,
 		splitCount: iterationStart.splitCount,
 		unifiedCount: iterationStart.unifiedCount,
+		finalHunkIndex: diff.hunks.length - 1,
 		shouldBreak() {
 			if (!state.isWindowedHighlight) return false;
 			const breakUnified = state.unifiedCount >= startingLine + totalLines;
@@ -780,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;
@@ -824,114 +838,89 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			hunkIndex,
 			collapsedContextThreshold
 		});
-		const trailingRegion = (() => {
-			if (hunk !== state.finalHunk || !hasFinalCollapsedHunk(diff)) return;
-			const additionRemaining = diff.additionLines.length - (hunk.additionLineIndex + hunk.additionCount);
-			const deletionRemaining = diff.deletionLines.length - (hunk.deletionLineIndex + hunk.deletionCount);
-			if (additionRemaining !== deletionRemaining) throw new Error(`iterateOverDiff: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${diff.name}`);
-			const trailingRangeSize = Math.min(additionRemaining, deletionRemaining);
-			return getExpandedRegion({
-				isPartial: diff.isPartial,
-				rangeSize: trailingRangeSize,
-				expandedHunks,
-				hunkIndex: diff.hunks.length,
-				collapsedContextThreshold
-			});
-		})();
+		const trailingRegion = hunkIndex === state.finalHunkIndex ? getTrailingExpandedRegion({
+			fileDiff: diff,
+			hunkIndex,
+			expandedHunks,
+			collapsedContextThreshold,
+			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;
 		}
-		function getPendingCollapsed() {
-			if (leadingRegion.collapsedLines === 0) return 0;
-			const value = leadingRegion.collapsedLines;
-			leadingRegion.collapsedLines = 0;
-			return value;
+		let consumedCollapsed = leadingRegion.collapsedLines === 0;
+		function consumePendingCollapsed() {
+			if (consumedCollapsed) return 0;
+			consumedCollapsed = true;
+			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;
-			const [startIndex, endIndex] = getEqualLineIterationRange(state, leadingRegion.fromStart, diffStyle);
-			if (startIndex > 0) state.incrementCounts(startIndex, startIndex);
-			let index = startIndex;
-			while (index < leadingRegion.fromStart) {
-				if (index >= endIndex) {
-					state.incrementCounts(leadingRegion.fromStart - index, leadingRegion.fromStart - index);
-					break;
-				}
-				if (state.isInWindow(0, 0)) {
-					if (state.emit({
-						hunkIndex,
-						hunk,
-						collapsedBefore: 0,
-						collapsedAfter: 0,
-						type: "context-expanded",
-						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;
-				} else state.incrementCounts(1, 1);
-				index++;
-			}
-			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;
-			const [fromEndStartIndex, fromEndEndIndex] = getEqualLineIterationRange(state, leadingRegion.fromEnd, diffStyle);
-			if (fromEndStartIndex > 0) state.incrementCounts(fromEndStartIndex, fromEndStartIndex);
-			index = fromEndStartIndex;
-			while (index < leadingRegion.fromEnd) {
-				if (index >= fromEndEndIndex) {
-					state.incrementCounts(leadingRegion.fromEnd - index, leadingRegion.fromEnd - index);
-					break;
-				}
-				if (state.isInWindow(0, 0)) {
-					if (state.emit({
-						hunkIndex,
-						hunk,
-						collapsedBefore: getPendingCollapsed(),
-						collapsedAfter: 0,
-						type: "context-expanded",
-						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;
-				} else state.incrementCounts(1, 1);
-				index++;
-			}
+			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,
+					hunk,
+					collapsedBefore: 0,
+					collapsedAfter: 0,
+					type: "context-expanded",
+					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;
+			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,
+					hunk,
+					collapsedBefore: consumePendingCollapsed(),
+					collapsedAfter: 0,
+					type: "context-expanded",
+					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
+					}
+				});
+			}, () => {
+				consumePendingCollapsed();
+			})) break hunkIterator;
 		} else {
 			state.incrementCounts(expandedLineCount, expandedLineCount);
-			getPendingCollapsed();
+			consumePendingCollapsed();
 		}
 		let unifiedLineIndex = hunk.unifiedLineStart;
 		let splitLineIndex = hunk.splitLineStart;
@@ -945,45 +934,37 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			const isLastContent = content === lastContent;
 			if (content.type === "context") {
 				if (!state.shouldSkip(content.lines, content.lines)) {
-					const [startIndex, endIndex] = getEqualLineIterationRange(state, content.lines, diffStyle);
-					if (startIndex > 0) state.incrementCounts(startIndex, startIndex);
-					let index = startIndex;
-					while (index < content.lines) {
-						if (index >= endIndex) {
-							state.incrementCounts(content.lines - index, content.lines - index);
-							break;
-						}
-						if (state.isInWindow(0, 0)) {
-							const isLastLine = isLastContent && index === content.lines - 1;
-							const unifiedRowIndex = unifiedLineIndex + index;
-							const splitRowIndex = splitLineIndex + index;
-							if (state.emit({
-								hunkIndex,
-								hunk,
-								collapsedBefore: getPendingCollapsed(),
-								collapsedAfter: getTrailingCollapsedAfter(unifiedRowIndex, splitRowIndex),
-								type: "context",
-								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;
-						} else state.incrementCounts(1, 1);
-						index++;
-					}
+					if (walkContextLines(state, content.lines, diffStyle, (index) => {
+						const isLastLine = isLastContent && index === content.lines - 1;
+						const unifiedRowIndex = unifiedLineIndex + index;
+						const splitRowIndex = splitLineIndex + index;
+						return state.emit({
+							hunkIndex,
+							hunk,
+							collapsedBefore: consumePendingCollapsed(),
+							collapsedAfter: getTrailingCollapsedAfter(unifiedRowIndex, splitRowIndex),
+							type: "context",
+							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
+							}
+						});
+					}, () => {
+						consumePendingCollapsed();
+					})) break hunkIterator;
 				} else {
 					state.incrementCounts(content.lines, content.lines);
-					getPendingCollapsed();
+					consumePendingCollapsed();
 				}
 				unifiedLineIndex += content.lines;
 				splitLineIndex += content.lines;
@@ -996,12 +977,13 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 				const unifiedCount = content.deletions + content.additions;
 				if (!state.shouldSkip(unifiedCount, splitCount)) {
 					const iterationRanges = getChangeIterationRanges(state, content, diffStyle);
+					if ((iterationRanges[0]?.[0] ?? 0) > 0) consumePendingCollapsed();
 					for (const [rangeStart, rangeEnd] of iterationRanges) for (let index = rangeStart; index < rangeEnd; index++) {
 						const collapsedAfter = getTrailingCollapsedAfter(unifiedLineIndex + index, diffStyle === "unified" ? splitLineIndex + (index < content.deletions ? index : index - content.deletions) : splitLineIndex + index);
 						if (state.emit(getChangeLineData({
 							hunkIndex,
 							hunk,
-							collapsedBefore: getPendingCollapsed(),
+							collapsedBefore: consumePendingCollapsed(),
 							collapsedAfter,
 							diffStyle,
 							index,
@@ -1018,7 +1000,7 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 						}), true)) break hunkIterator;
 					}
 				}
-				getPendingCollapsed();
+				consumePendingCollapsed();
 				state.incrementCounts(unifiedCount, splitCount);
 				unifiedLineIndex += unifiedCount;
 				splitLineIndex += splitCount;
@@ -1031,41 +1013,30 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		if (trailingRegion != null) {
 			const { collapsedLines, fromStart, fromEnd } = trailingRegion;
 			const len = fromStart + fromEnd;
-			const [startIndex, endIndex] = getEqualLineIterationRange(state, len, diffStyle);
-			if (startIndex > 0) state.incrementCounts(startIndex, startIndex);
-			let index = startIndex;
-			while (index < len) {
-				if (state.shouldBreak()) break hunkIterator;
-				if (index >= endIndex) {
-					state.incrementCounts(len - index, len - index);
-					break;
-				}
-				if (state.isInWindow(0, 0)) {
-					const isLastLine = index === len - 1;
-					if (state.emit({
-						hunkIndex: diff.hunks.length,
-						hunk: void 0,
-						collapsedBefore: 0,
-						collapsedAfter: isLastLine ? collapsedLines : 0,
-						type: "context-expanded",
-						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;
-				} else state.incrementCounts(1, 1);
-				index++;
-			}
+			if (walkContextLines(state, len, diffStyle, (index) => {
+				const isLastLine = index === len - 1;
+				return state.emit({
+					hunkIndex: diff.hunks.length,
+					hunk: void 0,
+					collapsedBefore: 0,
+					collapsedAfter: isLastLine ? collapsedLines : 0,
+					type: "context-expanded",
+					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
+					}
+				});
+			}, void 0, () => state.shouldBreak())) break hunkIterator;
 		}
 	}
 }
@@ -1085,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];
@@ -1130,15 +1101,14 @@ function getHunkPrefixCounts({ diff, expandedHunks, collapsedContextThreshold })
 		const leadingCount = leadingRegion.fromStart + leadingRegion.fromEnd;
 		splitCount += leadingCount + hunk.splitLineCount;
 		unifiedCount += leadingCount + hunk.unifiedLineCount;
-		if (index === finalHunkIndex && hasFinalCollapsedHunk(diff)) {
-			const trailingRangeSize = getTrailingRangeSize(diff, hunk);
-			const trailingRegion = getExpandedRegion({
-				isPartial: diff.isPartial,
-				rangeSize: trailingRangeSize,
-				expandedHunks,
-				hunkIndex: diff.hunks.length,
-				collapsedContextThreshold
-			});
+		const trailingRegion = index === finalHunkIndex ? getTrailingExpandedRegion({
+			fileDiff: diff,
+			hunkIndex: index,
+			expandedHunks,
+			collapsedContextThreshold,
+			errorPrefix: "iterateOverDiff"
+		}) : void 0;
+		if (trailingRegion != null) {
 			const trailingCount = trailingRegion.fromStart + trailingRegion.fromEnd;
 			splitCount += trailingCount;
 			unifiedCount += trailingCount;
@@ -1150,13 +1120,13 @@ function getHunkPrefixCounts({ diff, expandedHunks, collapsedContextThreshold })
 	}
 	return prefixCounts;
 }
-function getEqualLineIterationRange(state, count, diffStyle) {
+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);
@@ -1170,16 +1140,25 @@ function getEqualLineIterationRange(state, count, diffStyle) {
 	}
 	return [start, end];
 }
-function getTrailingRangeSize(diff, hunk) {
-	const additionRemaining = diff.additionLines.length - (hunk.additionLineIndex + hunk.additionCount);
-	const deletionRemaining = diff.deletionLines.length - (hunk.deletionLineIndex + hunk.deletionCount);
-	if (additionRemaining !== deletionRemaining) throw new Error(`iterateOverDiff: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${diff.name}`);
-	return Math.min(additionRemaining, deletionRemaining);
-}
-function hasFinalCollapsedHunk(diff) {
-	const lastHunk = diff.hunks.at(-1);
-	if (lastHunk == null || diff.isPartial || diff.additionLines.length === 0 || diff.deletionLines.length === 0) return false;
-	return lastHunk.additionLineIndex + lastHunk.additionCount < diff.additionLines.length || lastHunk.deletionLineIndex + lastHunk.deletionCount < diff.deletionLines.length;
+function walkContextLines(state, count, diffStyle, callback, onSkippedStart, shouldBreak) {
+	const [startIndex, endIndex] = getContextLineIterationBounds(state, count, diffStyle);
+	if (startIndex > 0) {
+		state.incrementCounts(startIndex, startIndex);
+		onSkippedStart?.();
+	}
+	let index = startIndex;
+	while (index < count) {
+		if (shouldBreak?.() === true) return true;
+		if (index >= endIndex) {
+			state.incrementCounts(count - index, count - index);
+			break;
+		}
+		if (state.isInWindow(0, 0)) {
+			if (callback(index) === true) return true;
+		} else state.incrementCounts(1, 1);
+		index++;
+	}
+	return false;
 }
 function getChangeIterationRanges(state, content, diffStyle) {
 	if (!state.isWindowedHighlight) return [[0, diffStyle === "unified" ? content.deletions + content.additions : Math.max(content.deletions, content.additions)]];
@@ -1273,7 +1252,6 @@ function getChangeLineData({ hunkIndex, hunk, collapsedAfter, collapsedBefore, d
 		additionLine
 	};
 }
-
 //#endregion
 //#region src/utils/parseDiffDecorations.ts
 function createDiffSpanDecoration({ line, spanStart, spanLength }) {
@@ -1303,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;
@@ -1316,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 = {
@@ -1408,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
 		});
@@ -1513,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);
@@ -1525,7 +1502,8 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
 			transformers,
 			decorations: void 0,
 			defaultColor: false,
-			cssVariablePrefix: formatCSSVariablePrefix("token")
+			cssVariablePrefix: formatCSSVariablePrefix("token"),
+			tokenizeTimeLimit: 0
 		} : {
 			...options,
 			lang: "text",
@@ -1533,7 +1511,8 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
 			transformers,
 			decorations: void 0,
 			defaultColor: false,
-			cssVariablePrefix: formatCSSVariablePrefix("token")
+			cssVariablePrefix: formatCSSVariablePrefix("token"),
+			tokenizeTimeLimit: 0
 		};
 	})();
 	return {
@@ -1542,32 +1521,60 @@ 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;
 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;
@@ -1584,11 +1591,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;
@@ -1599,10 +1605,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",
@@ -1616,7 +1622,8 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
 			transformers,
 			defaultColor: false,
 			cssVariablePrefix: formatCSSVariablePrefix("token"),
-			tokenizeMaxLineLength
+			tokenizeMaxLineLength,
+			tokenizeTimeLimit: 0
 		};
 		return {
 			lang,
@@ -1624,10 +1631,11 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
 			transformers,
 			defaultColor: false,
 			cssVariablePrefix: formatCSSVariablePrefix("token"),
-			tokenizeMaxLineLength
+			tokenizeMaxLineLength,
+			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 {
@@ -1641,7 +1649,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;
@@ -1683,15 +1690,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",
@@ -1701,9 +1708,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",
@@ -1712,30 +1719,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({
@@ -1745,10 +1752,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({
@@ -1779,6 +1786,6 @@ function sendError(id, error) {
 	};
 	postMessage(response);
 }
-
 //#endregion
+
 //# sourceMappingURL=worker.js.map