@pierre/diffs 1.3.0-beta.2 → 1.3.0-beta.4

package/dist/worker/worker-portable.js

@@ -10,7 +10,7 @@ var __export = (all$1) => {
 };
 
 //#endregion
-//#region ../../node_modules/shiki/dist/chunk-CtajNgzt.mjs
+//#region ../../node_modules/.bun/shiki@4.0.2/node_modules/shiki/dist/chunk-CtajNgzt.mjs
 var __defProp$1 = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -45,7 +45,7 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 
 //#endregion
-//#region ../../node_modules/@shikijs/types/dist/index.mjs
+//#region ../../node_modules/.bun/@shikijs+types@4.0.2/node_modules/@shikijs/types/dist/index.mjs
 var ShikiError$1 = class extends Error {
 	constructor(message) {
 		super(message);
@@ -54,7 +54,7 @@ var ShikiError$1 = class extends Error {
 };
 
 //#endregion
-//#region ../../node_modules/@shikijs/vscode-textmate/dist/index.js
+//#region ../../node_modules/.bun/@shikijs+vscode-textmate@10.0.2/node_modules/@shikijs/vscode-textmate/dist/index.js
 function clone(something) {
 	return doClone(something);
 }
@@ -2911,7 +2911,7 @@ var Registry = class {
 var INITIAL = StateStackImpl.NULL;
 
 //#endregion
-//#region ../../node_modules/@shikijs/primitive/dist/index.mjs
+//#region ../../node_modules/.bun/@shikijs+primitive@4.0.2/node_modules/@shikijs/primitive/dist/index.mjs
 function resolveColorReplacements(theme, options) {
 	const replacements = typeof theme === "string" ? {} : { ...theme.colorReplacements };
 	const themeName = typeof theme === "string" ? theme : theme.name;
@@ -3710,7 +3710,7 @@ function alignThemesTokenization(...themes) {
 }
 
 //#endregion
-//#region ../../node_modules/html-void-elements/index.js
+//#region ../../node_modules/.bun/html-void-elements@3.0.0/node_modules/html-void-elements/index.js
 /**
 * List of HTML void tag names.
 *
@@ -3740,7 +3740,7 @@ const htmlVoidElements = [
 ];
 
 //#endregion
-//#region ../../node_modules/property-information/lib/util/schema.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/util/schema.js
 /**
 * @import {Schema as SchemaType, Space} from 'property-information'
 */
@@ -3769,7 +3769,7 @@ Schema.prototype.property = {};
 Schema.prototype.space = undefined;
 
 //#endregion
-//#region ../../node_modules/property-information/lib/util/merge.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/util/merge.js
 /**
 * @param {ReadonlyArray<Schema>} definitions
 *   Definitions.
@@ -3791,7 +3791,7 @@ function merge(definitions, space) {
 }
 
 //#endregion
-//#region ../../node_modules/property-information/lib/normalize.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/normalize.js
 /**
 * Get the cleaned case insensitive form of an attribute or property.
 *
@@ -3806,7 +3806,7 @@ function normalize(value) {
 }
 
 //#endregion
-//#region ../../node_modules/property-information/lib/util/info.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/util/info.js
 /**
 * @import {Info as InfoType} from 'property-information'
 */
@@ -3839,7 +3839,7 @@ Info.prototype.spaceSeparated = false;
 Info.prototype.space = undefined;
 
 //#endregion
-//#region ../../node_modules/property-information/lib/util/types.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/util/types.js
 var types_exports = /* @__PURE__ */ __export({
 	boolean: () => boolean,
 	booleanish: () => booleanish,
@@ -3862,7 +3862,7 @@ function increment() {
 }
 
 //#endregion
-//#region ../../node_modules/property-information/lib/util/defined-info.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/util/defined-info.js
 const checks = Object.keys(types_exports);
 var DefinedInfo = class extends Info {
 	/**
@@ -3910,7 +3910,7 @@ function mark(values, key$1, value) {
 }
 
 //#endregion
-//#region ../../node_modules/property-information/lib/util/create.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/util/create.js
 /**
 * @param {Definition} definition
 *   Definition.
@@ -3935,7 +3935,7 @@ function create(definition) {
 }
 
 //#endregion
-//#region ../../node_modules/property-information/lib/aria.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/aria.js
 const aria = create({
 	properties: {
 		ariaActiveDescendant: null,
@@ -3994,7 +3994,7 @@ const aria = create({
 });
 
 //#endregion
-//#region ../../node_modules/property-information/lib/util/case-sensitive-transform.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/util/case-sensitive-transform.js
 /**
 * @param {Record<string, string>} attributes
 *   Attributes.
@@ -4008,7 +4008,7 @@ function caseSensitiveTransform(attributes, attribute) {
 }
 
 //#endregion
-//#region ../../node_modules/property-information/lib/util/case-insensitive-transform.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/util/case-insensitive-transform.js
 /**
 * @param {Record<string, string>} attributes
 *   Attributes.
@@ -4022,7 +4022,7 @@ function caseInsensitiveTransform(attributes, property) {
 }
 
 //#endregion
-//#region ../../node_modules/property-information/lib/html.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/html.js
 const html$3 = create({
 	attributes: {
 		acceptcharset: "accept-charset",
@@ -4335,7 +4335,7 @@ const html$3 = create({
 });
 
 //#endregion
-//#region ../../node_modules/property-information/lib/svg.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/svg.js
 const svg$1 = create({
 	attributes: {
 		accentHeight: "accent-height",
@@ -4894,7 +4894,7 @@ const svg$1 = create({
 });
 
 //#endregion
-//#region ../../node_modules/property-information/lib/xlink.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/xlink.js
 const xlink = create({
 	properties: {
 		xLinkActuate: null,
@@ -4912,7 +4912,7 @@ const xlink = create({
 });
 
 //#endregion
-//#region ../../node_modules/property-information/lib/xmlns.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/xmlns.js
 const xmlns = create({
 	attributes: { xmlnsxlink: "xmlns:xlink" },
 	properties: {
@@ -4924,7 +4924,7 @@ const xmlns = create({
 });
 
 //#endregion
-//#region ../../node_modules/property-information/lib/xml.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/xml.js
 const xml = create({
 	properties: {
 		xmlBase: null,
@@ -4938,7 +4938,7 @@ const xml = create({
 });
 
 //#endregion
-//#region ../../node_modules/property-information/lib/hast-to-react.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/hast-to-react.js
 /**
 * Special cases for React (`Record<string, string>`).
 *
@@ -4971,7 +4971,7 @@ const hastToReact = {
 };
 
 //#endregion
-//#region ../../node_modules/property-information/lib/find.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/lib/find.js
 const cap = /[A-Z]/g;
 const dash = /-[a-z]/g;
 const valid = /^data[-\w.:]+$/i;
@@ -5050,7 +5050,7 @@ function camelcase($0) {
 }
 
 //#endregion
-//#region ../../node_modules/property-information/index.js
+//#region ../../node_modules/.bun/property-information@7.1.0/node_modules/property-information/index.js
 const html = merge([
 	aria,
 	html$3,
@@ -5067,7 +5067,7 @@ const svg = merge([
 ], "svg");
 
 //#endregion
-//#region ../../node_modules/zwitch/index.js
+//#region ../../node_modules/.bun/zwitch@2.0.4/node_modules/zwitch/index.js
 /**
 * @callback Handler
 *   Handle a value, with a certain ID field set to a certain value.
@@ -5175,7 +5175,7 @@ function zwitch(key$1, options) {
 }
 
 //#endregion
-//#region ../../node_modules/stringify-entities/lib/core.js
+//#region ../../node_modules/.bun/stringify-entities@4.0.4/node_modules/stringify-entities/lib/core.js
 /**
 * @typedef CoreOptions
 * @property {ReadonlyArray<string>} [subset=[]]
@@ -5257,7 +5257,7 @@ function charactersToExpression(subset) {
 }
 
 //#endregion
-//#region ../../node_modules/stringify-entities/lib/util/to-hexadecimal.js
+//#region ../../node_modules/.bun/stringify-entities@4.0.4/node_modules/stringify-entities/lib/util/to-hexadecimal.js
 const hexadecimalRegex = /[\dA-Fa-f]/;
 /**
 * Configurable ways to encode characters as hexadecimal references.
@@ -5273,7 +5273,7 @@ function toHexadecimal(code, next, omit) {
 }
 
 //#endregion
-//#region ../../node_modules/stringify-entities/lib/util/to-decimal.js
+//#region ../../node_modules/.bun/stringify-entities@4.0.4/node_modules/stringify-entities/lib/util/to-decimal.js
 const decimalRegex = /\d/;
 /**
 * Configurable ways to encode characters as decimal references.
@@ -5289,7 +5289,7 @@ function toDecimal(code, next, omit) {
 }
 
 //#endregion
-//#region ../../node_modules/character-entities-legacy/index.js
+//#region ../../node_modules/.bun/character-entities-legacy@3.0.0/node_modules/character-entities-legacy/index.js
 /**
 * List of legacy HTML named character references that don’t need a trailing semicolon.
 *
@@ -5405,7 +5405,7 @@ const characterEntitiesLegacy = [
 ];
 
 //#endregion
-//#region ../../node_modules/character-entities-html4/index.js
+//#region ../../node_modules/.bun/character-entities-html4@2.1.0/node_modules/character-entities-html4/index.js
 /**
 * Map of named character references from HTML 4.
 *
@@ -5667,7 +5667,7 @@ const characterEntitiesHtml4 = {
 };
 
 //#endregion
-//#region ../../node_modules/stringify-entities/lib/constant/dangerous.js
+//#region ../../node_modules/.bun/stringify-entities@4.0.4/node_modules/stringify-entities/lib/constant/dangerous.js
 /**
 * List of legacy (that don’t need a trailing `;`) named references which could,
 * depending on what follows them, turn into a different meaning
@@ -5686,7 +5686,7 @@ const dangerous = [
 ];
 
 //#endregion
-//#region ../../node_modules/stringify-entities/lib/util/to-named.js
+//#region ../../node_modules/.bun/stringify-entities@4.0.4/node_modules/stringify-entities/lib/util/to-named.js
 const own$1 = {}.hasOwnProperty;
 /**
 * `characterEntitiesHtml4` but inverted.
@@ -5725,7 +5725,7 @@ function toNamed(code, next, omit, attribute) {
 }
 
 //#endregion
-//#region ../../node_modules/stringify-entities/lib/util/format-smart.js
+//#region ../../node_modules/.bun/stringify-entities@4.0.4/node_modules/stringify-entities/lib/util/format-smart.js
 /**
 * Configurable ways to encode a character yielding pretty or small results.
 *
@@ -5751,7 +5751,7 @@ function formatSmart(code, next, options) {
 }
 
 //#endregion
-//#region ../../node_modules/stringify-entities/lib/util/format-basic.js
+//#region ../../node_modules/.bun/stringify-entities@4.0.4/node_modules/stringify-entities/lib/util/format-basic.js
 /**
 * The smallest way to encode a character.
 *
@@ -5763,7 +5763,7 @@ function formatBasic(code) {
 }
 
 //#endregion
-//#region ../../node_modules/stringify-entities/lib/index.js
+//#region ../../node_modules/.bun/stringify-entities@4.0.4/node_modules/stringify-entities/lib/index.js
 /**
 * Encode special characters in `value`.
 *
@@ -5792,7 +5792,7 @@ function stringifyEntitiesLight(value, options) {
 }
 
 //#endregion
-//#region ../../node_modules/hast-util-to-html/lib/handle/comment.js
+//#region ../../node_modules/.bun/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/lib/handle/comment.js
 const htmlCommentRegex = /^>|^->|<!--|-->|--!>|<!-$/g;
 const bogusCommentEntitySubset = [">"];
 const commentEntitySubset = ["<", ">"];
@@ -5821,7 +5821,7 @@ function comment(node, _1, _2, state) {
 }
 
 //#endregion
-//#region ../../node_modules/hast-util-to-html/lib/handle/doctype.js
+//#region ../../node_modules/.bun/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/lib/handle/doctype.js
 /**
 * @import {Doctype, Parents} from 'hast'
 * @import {State} from '../index.js'
@@ -5845,7 +5845,7 @@ function doctype(_1, _2, _3, state) {
 }
 
 //#endregion
-//#region ../../node_modules/ccount/index.js
+//#region ../../node_modules/.bun/ccount@2.0.1/node_modules/ccount/index.js
 /**
 * Count how often a character (or substring) is used in a string.
 *
@@ -5871,7 +5871,7 @@ function ccount(value, character) {
 }
 
 //#endregion
-//#region ../../node_modules/comma-separated-tokens/index.js
+//#region ../../node_modules/.bun/comma-separated-tokens@2.0.3/node_modules/comma-separated-tokens/index.js
 /**
 * @typedef Options
 *   Configuration for `stringify`.
@@ -5931,7 +5931,7 @@ function stringify$1(values, options) {
 }
 
 //#endregion
-//#region ../../node_modules/space-separated-tokens/index.js
+//#region ../../node_modules/.bun/space-separated-tokens@2.0.2/node_modules/space-separated-tokens/index.js
 /**
 * Parse space-separated tokens to an array of strings.
 *
@@ -5957,7 +5957,7 @@ function stringify$2(values) {
 }
 
 //#endregion
-//#region ../../node_modules/hast-util-whitespace/lib/index.js
+//#region ../../node_modules/.bun/hast-util-whitespace@3.0.0/node_modules/hast-util-whitespace/lib/index.js
 /**
 * @typedef {import('hast').Nodes} Nodes
 */
@@ -5985,7 +5985,7 @@ function empty(value) {
 }
 
 //#endregion
-//#region ../../node_modules/hast-util-to-html/lib/omission/util/siblings.js
+//#region ../../node_modules/.bun/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/lib/omission/util/siblings.js
 const siblingAfter = siblings(1);
 const siblingBefore = siblings(-1);
 /** @type {Array<RootContent>} */
@@ -6026,7 +6026,7 @@ function siblings(increment$1) {
 }
 
 //#endregion
-//#region ../../node_modules/hast-util-to-html/lib/omission/omission.js
+//#region ../../node_modules/.bun/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/lib/omission/omission.js
 /**
 * @import {Element, Parents} from 'hast'
 */
@@ -6066,7 +6066,7 @@ function omission(handlers) {
 }
 
 //#endregion
-//#region ../../node_modules/hast-util-to-html/lib/omission/closing.js
+//#region ../../node_modules/.bun/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/lib/omission/closing.js
 const closing = omission({
 	body: body$1,
 	caption: headOrColgroupOrCaption,
@@ -6329,7 +6329,7 @@ function cells(_$2, index, parent) {
 }
 
 //#endregion
-//#region ../../node_modules/hast-util-to-html/lib/omission/opening.js
+//#region ../../node_modules/.bun/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/lib/omission/opening.js
 const opening = omission({
 	body,
 	colgroup,
@@ -6426,7 +6426,7 @@ function tbody(node, index, parent) {
 }
 
 //#endregion
-//#region ../../node_modules/hast-util-to-html/lib/handle/element.js
+//#region ../../node_modules/.bun/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/lib/handle/element.js
 /**
 * Maps of subsets.
 *
@@ -6559,7 +6559,7 @@ function serializeAttribute(state, key$1, value) {
 }
 
 //#endregion
-//#region ../../node_modules/hast-util-to-html/lib/handle/text.js
+//#region ../../node_modules/.bun/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/lib/handle/text.js
 const textEntitySubset = ["<", "&"];
 /**
 * Serialize a text node.
@@ -6580,7 +6580,7 @@ function text(node, _$2, parent, state) {
 }
 
 //#endregion
-//#region ../../node_modules/hast-util-to-html/lib/handle/raw.js
+//#region ../../node_modules/.bun/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/lib/handle/raw.js
 /**
 * Serialize a raw node.
 *
@@ -6600,7 +6600,7 @@ function raw(node, index, parent, state) {
 }
 
 //#endregion
-//#region ../../node_modules/hast-util-to-html/lib/handle/root.js
+//#region ../../node_modules/.bun/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/lib/handle/root.js
 /**
 * @import {Parents, Root} from 'hast'
 * @import {State} from '../index.js'
@@ -6624,7 +6624,7 @@ function root(node, _1, _2, state) {
 }
 
 //#endregion
-//#region ../../node_modules/hast-util-to-html/lib/handle/index.js
+//#region ../../node_modules/.bun/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/lib/handle/index.js
 /**
 * @type {(node: Nodes, index: number | undefined, parent: Parents | undefined, state: State) => string}
 */
@@ -6665,7 +6665,7 @@ function unknown(node_) {
 }
 
 //#endregion
-//#region ../../node_modules/hast-util-to-html/lib/index.js
+//#region ../../node_modules/.bun/hast-util-to-html@9.0.5/node_modules/hast-util-to-html/lib/index.js
 /** @type {Options} */
 const emptyOptions = {};
 /** @type {CharacterReferences} */
@@ -6759,7 +6759,7 @@ function all(parent) {
 }
 
 //#endregion
-//#region ../../node_modules/@shikijs/core/dist/index.mjs
+//#region ../../node_modules/.bun/@shikijs+core@4.0.2/node_modules/@shikijs/core/dist/index.mjs
 /**
 * Utility to append class to a hast node
 *
@@ -8126,18 +8126,18 @@ function createCssVariablesTheme(options = {}) {
 }
 
 //#endregion
-//#region ../../node_modules/@shikijs/engine-javascript/dist/scanner-BFcBmQR1.mjs
+//#region ../../node_modules/.bun/@shikijs+engine-javascript@4.0.2/node_modules/@shikijs/engine-javascript/dist/scanner-BFcBmQR1.mjs
 const MAX = 4294967295;
 var JavaScriptScanner = class {
 	regexps;
 	constructor(patterns, options = {}) {
 		this.patterns = patterns;
 		this.options = options;
-		const { forgiving = false, cache, regexConstructor } = options;
+		const { forgiving = false, cache: cache$1, regexConstructor } = options;
 		if (!regexConstructor) throw new Error("Option `regexConstructor` is not provided");
 		this.regexps = patterns.map((p$1) => {
 			if (typeof p$1 !== "string") return p$1;
-			const cached = cache?.get(p$1);
+			const cached = cache$1?.get(p$1);
 			if (cached) {
 				if (cached instanceof RegExp) return cached;
 				if (forgiving) return null;
@@ -8145,10 +8145,10 @@ var JavaScriptScanner = class {
 			}
 			try {
 				const regex = regexConstructor(p$1);
-				cache?.set(p$1, regex);
+				cache$1?.set(p$1, regex);
 				return regex;
 			} catch (e) {
-				cache?.set(p$1, e);
+				cache$1?.set(p$1, e);
 				if (forgiving) return null;
 				throw e;
 			}
@@ -8201,7 +8201,7 @@ var JavaScriptScanner = class {
 };
 
 //#endregion
-//#region ../../node_modules/oniguruma-parser/dist/utils.js
+//#region ../../node_modules/.bun/oniguruma-parser@0.12.1/node_modules/oniguruma-parser/dist/utils.js
 function r$2(e) {
 	if ([...e].length !== 1) throw new Error(`Expected "${e}" to be a single code point`);
 	return e.codePointAt(0);
@@ -8231,7 +8231,7 @@ function u(e, t) {
 }
 
 //#endregion
-//#region ../../node_modules/oniguruma-parser/dist/tokenizer/tokenize.js
+//#region ../../node_modules/.bun/oniguruma-parser@0.12.1/node_modules/oniguruma-parser/dist/tokenizer/tokenize.js
 const m$1 = o$1`\[\^?`, b$1 = `c.? | C(?:-.?)?|${o$1`[pP]\{(?:\^?[-\x20_]*[A-Za-z][-\x20\w]*\})?`}|${o$1`x[89A-Fa-f]\p{AHex}(?:\\x[89A-Fa-f]\p{AHex})*`}|${o$1`u(?:\p{AHex}{4})? | x\{[^\}]*\}? | x\p{AHex}{0,2}`}|${o$1`o\{[^\}]*\}?`}|${o$1`\d{1,3}`}`, y$1 = /[?*+][?+]?|\{(?:\d+(?:,\d*)?|,\d+)\}\??/, C$1 = new RegExp(o$1`
   \\ (?:
     ${b$1}
@@ -8728,7 +8728,7 @@ function te$1(e) {
 }
 
 //#endregion
-//#region ../../node_modules/oniguruma-parser/dist/parser/node-utils.js
+//#region ../../node_modules/.bun/oniguruma-parser@0.12.1/node_modules/oniguruma-parser/dist/parser/node-utils.js
 function o(e, t) {
 	if (!Array.isArray(e.body)) throw new Error("Expected node with body array");
 	if (e.body.length !== 1) return !1;
@@ -8761,7 +8761,7 @@ const y = new Set([
 ]);
 
 //#endregion
-//#region ../../node_modules/oniguruma-parser/dist/parser/parse.js
+//#region ../../node_modules/.bun/oniguruma-parser@0.12.1/node_modules/oniguruma-parser/dist/parser/parse.js
 function J(e, r$3 = {}) {
 	const n = {
 		flags: "",
@@ -9182,7 +9182,7 @@ function D(e) {
 }
 
 //#endregion
-//#region ../../node_modules/oniguruma-parser/dist/traverser/traverse.js
+//#region ../../node_modules/.bun/oniguruma-parser@0.12.1/node_modules/oniguruma-parser/dist/traverser/traverse.js
 function S(a$1, v$1, N = null) {
 	function u$1(e, s$1) {
 		for (let t = 0; t < e.length; t++) {
@@ -9270,7 +9270,7 @@ function l(a$1) {
 }
 
 //#endregion
-//#region ../../node_modules/regex/src/utils-internals.js
+//#region ../../node_modules/.bun/regex@6.1.0/node_modules/regex/src/utils-internals.js
 const noncapturingDelim = String.raw`\(\?(?:[:=!>A-Za-z\-]|<[=!]|\(DEFINE\))`;
 /**
 Updates the array in place by incrementing each value greater than or equal to the threshold.
@@ -9296,7 +9296,7 @@ function spliceStr(str, pos, oldValue, newValue) {
 }
 
 //#endregion
-//#region ../../node_modules/regex-utilities/src/index.js
+//#region ../../node_modules/.bun/regex-utilities@2.3.0/node_modules/regex-utilities/src/index.js
 const Context = Object.freeze({
 	DEFAULT: "DEFAULT",
 	CHAR_CLASS: "CHAR_CLASS"
@@ -9458,7 +9458,7 @@ function getGroupContents(expression, contentsStartPos) {
 }
 
 //#endregion
-//#region ../../node_modules/regex/src/atomic.js
+//#region ../../node_modules/.bun/regex@6.1.0/node_modules/regex/src/atomic.js
 /**
 @import {PluginData, PluginResult} from './regex.js';
 */
@@ -9634,7 +9634,7 @@ function possessive(expression) {
 }
 
 //#endregion
-//#region ../../node_modules/regex/src/subclass.js
+//#region ../../node_modules/.bun/regex@6.1.0/node_modules/regex/src/subclass.js
 /**
 Works the same as JavaScript's native `RegExp` constructor in all contexts, but automatically
 adjusts subpattern matches and indices (with flag `d`) to account for captures added as part of
@@ -9724,7 +9724,7 @@ function createCaptureMap$1(hiddenCaptures) {
 }
 
 //#endregion
-//#region ../../node_modules/regex-recursion/src/index.js
+//#region ../../node_modules/.bun/regex-recursion@6.0.2/node_modules/regex-recursion/src/index.js
 const r$1 = String.raw;
 const gRToken = r$1`\\g<(?<gRNameOrNum>[^>&]+)&R=(?<gRDepth>[^>]+)>`;
 const recursiveToken = r$1`\(\?R=(?<rDepth>[^\)]+)\)|${gRToken}`;
@@ -9981,7 +9981,7 @@ function mapCaptureTransfers(captureTransfers, left, reps, numCapturesAddedInExp
 }
 
 //#endregion
-//#region ../../node_modules/oniguruma-to-es/dist/esm/index.js
+//#region ../../node_modules/.bun/oniguruma-to-es@4.3.4/node_modules/oniguruma-to-es/dist/esm/index.js
 var cp = String.fromCodePoint;
 var r = String.raw;
 var envFlags = {
@@ -11636,7 +11636,7 @@ function toRegExpDetails(pattern, options) {
 }
 
 //#endregion
-//#region ../../node_modules/@shikijs/engine-javascript/dist/engine-compile.mjs
+//#region ../../node_modules/.bun/@shikijs+engine-javascript@4.0.2/node_modules/@shikijs/engine-javascript/dist/engine-compile.mjs
 /**
 * The default regex constructor for the JavaScript RegExp engine.
 */
@@ -11680,7 +11680,7 @@ function createJavaScriptRegexEngine(options = {}) {
 }
 
 //#endregion
-//#region ../../node_modules/@shikijs/engine-javascript/dist/engine-raw.mjs
+//#region ../../node_modules/.bun/@shikijs+engine-javascript@4.0.2/node_modules/@shikijs/engine-javascript/dist/engine-raw.mjs
 /**
 * Raw JavaScript regex engine that only supports precompiled grammars.
 *
@@ -11706,7 +11706,7 @@ function createJavaScriptRawEngine() {
 }
 
 //#endregion
-//#region ../../node_modules/@shikijs/engine-oniguruma/dist/index.mjs
+//#region ../../node_modules/.bun/@shikijs+engine-oniguruma@4.0.2/node_modules/@shikijs/engine-oniguruma/dist/index.mjs
 var dist_exports = /* @__PURE__ */ __export({
 	createOnigurumaEngine: () => createOnigurumaEngine,
 	getDefaultWasmLoader: () => getDefaultWasmLoader,
@@ -12130,7 +12130,7 @@ async function createOnigurumaEngine(options) {
 }
 
 //#endregion
-//#region ../../node_modules/shiki/dist/engine-oniguruma.mjs
+//#region ../../node_modules/.bun/shiki@4.0.2/node_modules/shiki/dist/engine-oniguruma.mjs
 var engine_oniguruma_exports = /* @__PURE__ */ __exportAll({});
 __reExport(engine_oniguruma_exports, dist_exports);
 
@@ -12234,11 +12234,500 @@ function attachResolvedLanguages(resolvedLanguages, highlighter$1) {
 
 //#endregion
 //#region src/highlighter/themes/constants.ts
-const ResolvedThemes = new Map();
-const ResolvingThemes = new Map();
-const RegisteredCustomThemes = new Map();
 const AttachedThemes = new Set();
 
+//#endregion
+//#region ../theming/dist/modules/createThemeCollection.js
+function createThemeCollection(options) {
+	const descriptors = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const entry of getCollectionEntries(options.themes)) {
+		const themes = isThemeCollectionSource(entry) ? entry.getThemes() : [entry];
+		for (const descriptor of themes) {
+			if (seen.has(descriptor.name)) throw new Error(`Theme collection already contains theme "${descriptor.name}"`);
+			seen.add(descriptor.name);
+			descriptors.push(descriptor);
+		}
+	}
+	const allThemes = Object.freeze([...descriptors]);
+	const lightThemes = Object.freeze(allThemes.filter((descriptor) => descriptor.colorScheme === "light"));
+	const darkThemes = Object.freeze(allThemes.filter((descriptor) => descriptor.colorScheme === "dark"));
+	const themesByName = new Map(allThemes.map((descriptor) => [descriptor.name, descriptor]));
+	const allNames = Object.freeze(allThemes.map((descriptor) => descriptor.name));
+	const lightNames = Object.freeze(lightThemes.map((descriptor) => descriptor.name));
+	const darkNames = Object.freeze(darkThemes.map((descriptor) => descriptor.name));
+	function filteredThemes(filterOptions) {
+		if (filterOptions == null) return allThemes;
+		const { colorScheme, collection } = filterOptions;
+		if (collection == null) {
+			if (colorScheme === "light") return lightThemes;
+			if (colorScheme === "dark") return darkThemes;
+			return allThemes;
+		}
+		return allThemes.filter((descriptor) => {
+			if (descriptor.collection !== collection) return false;
+			return colorScheme == null || descriptor.colorScheme === colorScheme;
+		});
+	}
+	return {
+		getTheme(name) {
+			return themesByName.get(name);
+		},
+		getThemes(themeOptions) {
+			return filteredThemes(themeOptions);
+		},
+		getThemeNames(namesOptions) {
+			if (namesOptions?.collection == null) {
+				if (namesOptions?.colorScheme === "light") return lightNames;
+				if (namesOptions?.colorScheme === "dark") return darkNames;
+				return allNames;
+			}
+			return filteredThemes(namesOptions).map((descriptor) => descriptor.name);
+		},
+		hasTheme(name) {
+			return themesByName.has(name);
+		},
+		orderBy(compare) {
+			return createThemeCollection({ themes: allThemes.map((descriptor, index) => ({
+				descriptor,
+				index
+			})).sort((a$1, b$2) => {
+				const result = compare(a$1.descriptor, b$2.descriptor);
+				if (result !== 0) return result;
+				return a$1.index - b$2.index;
+			}).map((entry) => entry.descriptor) });
+		},
+		pick(names) {
+			const picked = [];
+			const pickedNames = /* @__PURE__ */ new Set();
+			for (const name of names) {
+				if (pickedNames.has(name)) throw new Error(`Theme collection pick already includes theme "${name}"`);
+				pickedNames.add(name);
+				const descriptor = themesByName.get(name);
+				if (descriptor == null) throw new Error(`Theme collection does not contain theme "${name}"`);
+				picked.push(descriptor);
+			}
+			return createThemeCollection({ themes: picked });
+		},
+		registerInto(resolver) {
+			for (const descriptor of allThemes) resolver.registerThemeIfAbsent(descriptor.name, descriptor.load);
+		}
+	};
+}
+function getCollectionEntries(input) {
+	if (isThemeCollectionEntry(input)) return [input];
+	return input;
+}
+function isThemeCollectionEntry(input) {
+	return isThemeCollectionSource(input) || isThemeDescriptor(input);
+}
+function isThemeDescriptor(input) {
+	return typeof input.name === "string" && typeof input.load === "function";
+}
+function isThemeCollectionSource(entry) {
+	return typeof entry.getThemes === "function";
+}
+
+//#endregion
+//#region ../theming/dist/modules/createThemeCatalog.js
+function createThemeCatalog(options) {
+	const collection = createThemeCollection({ themes: options.themes });
+	if (!collection.hasTheme(options.defaultLightThemeName)) throw new Error(`Default light theme "${options.defaultLightThemeName}" is not in the catalog`);
+	if (!collection.hasTheme(options.defaultDarkThemeName)) throw new Error(`Default dark theme "${options.defaultDarkThemeName}" is not in the catalog`);
+	return {
+		...collection,
+		defaultLightThemeName: options.defaultLightThemeName,
+		defaultDarkThemeName: options.defaultDarkThemeName
+	};
+}
+
+//#endregion
+//#region ../theming/dist/modules/unwrapDefault.js
+function unwrapDefault(value) {
+	return value !== null && typeof value === "object" && "default" in value ? value.default : value;
+}
+
+//#endregion
+//#region ../theming/dist/modules/createThemeResolver.js
+var DuplicateThemeError = class extends Error {
+	constructor(name) {
+		super(`Theme "${name}" is already registered`);
+		this.name = "DuplicateThemeError";
+	}
+};
+var UnregisteredThemeError = class extends Error {
+	constructor(name) {
+		super(`No loader registered for theme "${name}"`);
+		this.name = "UnregisteredThemeError";
+	}
+};
+var UnresolvedThemeError = class extends Error {
+	constructor(name) {
+		super(`Theme "${name}" has not been resolved`);
+		this.name = "UnresolvedThemeError";
+	}
+};
+function createThemeResolver() {
+	const loaders = /* @__PURE__ */ new Map();
+	const resolved = /* @__PURE__ */ new Map();
+	const inflight = /* @__PURE__ */ new Map();
+	let cacheGeneration = 0;
+	function registerTheme(name, loader) {
+		if (loaders.has(name)) throw new DuplicateThemeError(name);
+		loaders.set(name, loader);
+	}
+	function registerThemeIfAbsent(name, loader) {
+		if (loaders.has(name)) return false;
+		loaders.set(name, loader);
+		return true;
+	}
+	function hasRegisteredTheme(name) {
+		return loaders.has(name);
+	}
+	function resolveTheme(name) {
+		const cached = resolved.get(name);
+		if (cached !== void 0) return Promise.resolve(cached);
+		const existing = inflight.get(name);
+		if (existing !== void 0) return existing;
+		const loader = loaders.get(name);
+		if (loader === void 0) return Promise.reject(new UnregisteredThemeError(name));
+		const generation = cacheGeneration;
+		const promise = loader().then((result) => {
+			const theme = unwrapDefault(result);
+			if (generation === cacheGeneration) resolved.set(name, theme);
+			if (inflight.get(name) === promise) inflight.delete(name);
+			return theme;
+		}).catch((err) => {
+			if (inflight.get(name) === promise) inflight.delete(name);
+			throw err;
+		});
+		inflight.set(name, promise);
+		return promise;
+	}
+	function resolveThemes$1(names) {
+		return Promise.all(names.map((name) => resolveTheme(name)));
+	}
+	function seedResolvedTheme(name, theme) {
+		resolved.set(name, theme);
+	}
+	function seedResolvedThemes(entries) {
+		for (const [name, theme] of entries) seedResolvedTheme(name, theme);
+	}
+	function getResolvedTheme(name) {
+		return resolved.get(name);
+	}
+	function getResolvedThemes(names) {
+		const themes = [];
+		for (const name of names) {
+			const theme = resolved.get(name);
+			if (theme === void 0) throw new UnresolvedThemeError(name);
+			themes.push(theme);
+		}
+		return themes;
+	}
+	function hasResolvedTheme(name) {
+		return resolved.has(name);
+	}
+	function hasResolvedThemes(names) {
+		for (const name of names) if (!resolved.has(name)) return false;
+		return true;
+	}
+	function getResolvedOrResolveTheme(name) {
+		const cached = resolved.get(name);
+		if (cached !== void 0) return cached;
+		return resolveTheme(name);
+	}
+	function clearResolvedThemes() {
+		cacheGeneration++;
+		resolved.clear();
+		inflight.clear();
+	}
+	return {
+		clearResolvedThemes,
+		getResolvedOrResolveTheme,
+		getResolvedTheme,
+		getResolvedThemes,
+		hasRegisteredTheme,
+		hasResolvedTheme,
+		hasResolvedThemes,
+		registerTheme,
+		registerThemeIfAbsent,
+		resolveTheme,
+		resolveThemes: resolveThemes$1,
+		seedResolvedTheme,
+		seedResolvedThemes
+	};
+}
+
+//#endregion
+//#region ../theming/dist/modules/createThemeController.js
+const FALLBACK_LIGHT_THEME = "pierre-light";
+const FALLBACK_DARK_THEME = "pierre-dark";
+function getStorage() {
+	try {
+		if (typeof globalThis !== "undefined" && globalThis.localStorage != null) return globalThis.localStorage;
+	} catch {}
+}
+function createLocalStorageAdapter(storageKey, defaults) {
+	return {
+		load() {
+			const raw$1 = getStorage()?.getItem(storageKey);
+			if (raw$1 == null) return null;
+			try {
+				const parsed = JSON.parse(raw$1);
+				if (parsed.mode == null) return null;
+				return {
+					darkThemeName: parsed.darkThemeName ?? defaults.darkThemeName,
+					lightThemeName: parsed.lightThemeName ?? defaults.lightThemeName,
+					mode: parsed.mode
+				};
+			} catch {
+				return null;
+			}
+		},
+		save(selection) {
+			const storage = getStorage();
+			try {
+				storage?.setItem(storageKey, JSON.stringify(selection));
+			} catch {}
+		}
+	};
+}
+function systemPrefersDark() {
+	try {
+		if (typeof globalThis !== "undefined" && globalThis.matchMedia != null) return globalThis.matchMedia("(prefers-color-scheme: dark)").matches;
+	} catch {}
+	return false;
+}
+function resolveColorScheme(mode) {
+	if (mode === "dark") return "dark";
+	if (mode === "light") return "light";
+	return systemPrefersDark() ? "dark" : "light";
+}
+function createThemeController(options) {
+	const { storageKey, preloadInactive = false } = options;
+	const catalog = "catalog" in options && options.catalog != null ? options.catalog : void 0;
+	const selectedResolver = options.resolver ?? (catalog != null ? createThemeResolver() : void 0);
+	if (selectedResolver == null) throw new Error("createThemeController requires a catalog or resolver");
+	const resolver = selectedResolver;
+	catalog?.registerInto(resolver);
+	const defaultDarkThemeName = options.defaultDarkThemeName ?? catalog?.defaultDarkThemeName ?? FALLBACK_DARK_THEME;
+	const defaultLightThemeName = options.defaultLightThemeName ?? catalog?.defaultLightThemeName ?? FALLBACK_LIGHT_THEME;
+	const persistence = options.persistence ?? (storageKey != null ? createLocalStorageAdapter(storageKey, {
+		darkThemeName: defaultDarkThemeName,
+		lightThemeName: defaultLightThemeName
+	}) : void 0);
+	const initialMode = options.defaultMode ?? "system";
+	let state = {
+		darkThemeName: defaultDarkThemeName,
+		lightThemeName: defaultLightThemeName,
+		mode: initialMode,
+		resolvedTheme: void 0,
+		resolvedColorScheme: resolveColorScheme(initialMode)
+	};
+	const listeners = /* @__PURE__ */ new Set();
+	let activeResolutionId = 0;
+	let pendingSelectionPatch;
+	function notify() {
+		for (const listener of listeners) listener();
+	}
+	function hydrateFromStorage() {
+		const loaded = persistence?.load();
+		if (loaded == null) return;
+		state = {
+			...state,
+			darkThemeName: loaded.darkThemeName,
+			lightThemeName: loaded.lightThemeName,
+			mode: loaded.mode,
+			resolvedColorScheme: resolveColorScheme(loaded.mode)
+		};
+	}
+	function persist() {
+		persistence?.save({
+			darkThemeName: state.darkThemeName,
+			lightThemeName: state.lightThemeName,
+			mode: state.mode
+		});
+	}
+	function activeThemeNameFor(selection) {
+		return selection.resolvedColorScheme === "dark" ? selection.darkThemeName : selection.lightThemeName;
+	}
+	function intendedState(patch = {}) {
+		return {
+			...state,
+			...pendingSelectionPatch,
+			...patch
+		};
+	}
+	function reportResolutionError(error, context) {
+		if (options.onResolutionError != null) {
+			options.onResolutionError(error, context);
+			return;
+		}
+		console.error(`[theming] Failed to resolve theme "${context.name}" for ${context.colorScheme} color scheme`, error);
+	}
+	function preloadInactiveFor(selection) {
+		if (!preloadInactive) return;
+		const activeName = activeThemeNameFor(selection);
+		const inactive = selection.resolvedColorScheme === "dark" ? selection.lightThemeName : selection.darkThemeName;
+		if (inactive !== activeName && resolver.getResolvedTheme(inactive) === void 0) resolver.resolveTheme(inactive).catch(() => {});
+	}
+	function resolveActive(patch = {}, { notifyPending = false, persistOnSuccess = false } = {}) {
+		const selectionPatch = {
+			...pendingSelectionPatch,
+			...patch
+		};
+		const next = intendedState(patch);
+		const name = activeThemeNameFor(next);
+		const colorScheme = next.resolvedColorScheme;
+		const cached = resolver.getResolvedTheme(name);
+		if (cached !== void 0) {
+			activeResolutionId++;
+			pendingSelectionPatch = void 0;
+			state = {
+				...state,
+				...selectionPatch,
+				pendingThemeResolution: void 0,
+				resolutionError: void 0,
+				resolvedTheme: cached
+			};
+			if (persistOnSuccess) persist();
+			notify();
+			preloadInactiveFor(state);
+			return;
+		}
+		const resolutionId = ++activeResolutionId;
+		pendingSelectionPatch = selectionPatch;
+		state = {
+			...state,
+			pendingThemeResolution: {
+				colorScheme,
+				name
+			},
+			resolutionError: void 0
+		};
+		if (notifyPending) notify();
+		resolver.resolveTheme(name).then((theme) => {
+			if (resolutionId !== activeResolutionId) return;
+			const latestIntended = intendedState();
+			if (latestIntended.resolvedColorScheme !== colorScheme || activeThemeNameFor(latestIntended) !== name) return;
+			const patchToCommit = pendingSelectionPatch ?? {};
+			pendingSelectionPatch = void 0;
+			state = {
+				...state,
+				...patchToCommit,
+				pendingThemeResolution: void 0,
+				resolutionError: void 0,
+				resolvedTheme: theme
+			};
+			if (persistOnSuccess) persist();
+			notify();
+			preloadInactiveFor(state);
+		}).catch((error) => {
+			if (resolutionId !== activeResolutionId) return;
+			pendingSelectionPatch = void 0;
+			state = {
+				...state,
+				pendingThemeResolution: void 0,
+				resolutionError: {
+					colorScheme,
+					error,
+					name
+				}
+			};
+			reportResolutionError(error, {
+				colorScheme,
+				name
+			});
+			notify();
+		});
+	}
+	function updateInactiveThemeName(key$1, name) {
+		state = {
+			...state,
+			[key$1]: name,
+			resolutionError: void 0
+		};
+		persist();
+		notify();
+		preloadInactiveFor(state);
+	}
+	function isSchemeActiveInIntendedState(scheme, patch = {}) {
+		return intendedState(patch).resolvedColorScheme === scheme;
+	}
+	function setActiveSelection(patch) {
+		resolveActive(patch, {
+			notifyPending: true,
+			persistOnSuccess: true
+		});
+	}
+	function setInactiveThemeName(scheme, key$1, name) {
+		if (isSchemeActiveInIntendedState(scheme, { [key$1]: name })) setActiveSelection({ [key$1]: name });
+		else updateInactiveThemeName(key$1, name);
+	}
+	function setMode(mode) {
+		setActiveSelection({
+			mode,
+			resolvedColorScheme: resolveColorScheme(mode)
+		});
+	}
+	function maybeUpdateSystemColorScheme() {
+		if (intendedState().mode !== "system") return;
+		const next = resolveColorScheme("system");
+		if (next !== intendedState().resolvedColorScheme) resolveActive({ resolvedColorScheme: next }, { notifyPending: true });
+	}
+	function isSelectedValue(key$1, value) {
+		return intendedState()[key$1] === value;
+	}
+	let mediaQuery;
+	const handleMediaChange = () => {
+		maybeUpdateSystemColorScheme();
+	};
+	function attachMediaListener() {
+		try {
+			if (typeof globalThis !== "undefined" && globalThis.matchMedia != null) {
+				mediaQuery = globalThis.matchMedia("(prefers-color-scheme: dark)");
+				mediaQuery.addEventListener("change", handleMediaChange);
+			}
+		} catch {}
+	}
+	hydrateFromStorage();
+	attachMediaListener();
+	resolveActive();
+	return {
+		resolver,
+		destroy() {
+			if (mediaQuery != null) {
+				mediaQuery.removeEventListener("change", handleMediaChange);
+				mediaQuery = void 0;
+			}
+			listeners.clear();
+		},
+		getState() {
+			return state;
+		},
+		setColorMode(mode) {
+			if (isSelectedValue("mode", mode)) return;
+			setMode(mode);
+		},
+		setThemeNameForScheme(scheme, name) {
+			const key$1 = scheme === "light" ? "lightThemeName" : "darkThemeName";
+			if (isSelectedValue(key$1, name)) return;
+			setInactiveThemeName(scheme, key$1, name);
+		},
+		subscribe(listener) {
+			listeners.add(listener);
+			return () => {
+				listeners.delete(listener);
+			};
+		}
+	};
+}
+
+//#endregion
+//#region src/highlighter/themes/themeResolver.ts
+const themeResolver = createThemeResolver();
+
 //#endregion
 //#region src/highlighter/themes/attachResolvedThemes.ts
 function attachResolvedThemes(themes, highlighter$1) {
@@ -12246,15 +12735,15 @@ function attachResolvedThemes(themes, highlighter$1) {
 	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;
@@ -12668,7 +13157,7 @@ function getCustomExtensionsMap() {
 }
 
 //#endregion
-//#region ../../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;
@@ -12892,7 +13381,7 @@ var Diff = class {
 };
 
 //#endregion
-//#region ../../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) {
@@ -12900,7 +13389,7 @@ function diffChars(oldStr, newStr, options) {
 }
 
 //#endregion
-//#region ../../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++) {
@@ -13009,7 +13498,7 @@ function leadingWs(string) {
 }
 
 //#endregion
-//#region ../../node_modules/diff/libesm/diff/word.js
+//#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 {
@@ -13163,7 +13652,7 @@ function diffWordsWithSpace(oldStr, newStr, options) {
 }
 
 //#endregion
-//#region ../../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;
@@ -13179,7 +13668,7 @@ function generateOptions(options, defaults) {
 }
 
 //#endregion
-//#region ../../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);
@@ -13232,7 +13721,7 @@ function tokenize(value, options) {
 }
 
 //#endregion
-//#region ../../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 == "?";
 }
@@ -13265,7 +13754,7 @@ function diffSentences(oldStr, newStr, options) {
 }
 
 //#endregion
-//#region ../../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+)/);
@@ -13277,7 +13766,7 @@ function diffCss(oldStr, newStr, options) {
 }
 
 //#endregion
-//#region ../../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);
@@ -13351,7 +13840,7 @@ function canonicalize(obj, stack, replacementStack, replacer, key$1) {
 }
 
 //#endregion
-//#region ../../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();
@@ -13369,7 +13858,7 @@ function diffArrays(oldArr, newArr, options) {
 }
 
 //#endregion
-//#region ../../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));
@@ -13409,7 +13898,7 @@ function isWin(patch) {
 }
 
 //#endregion
-//#region ../../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`.
 *
@@ -13520,7 +14009,7 @@ function parsePatch(uniDiff) {
 }
 
 //#endregion
-//#region ../../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() {
@@ -13550,7 +14039,7 @@ function distance_iterator_default(start, minLine, maxLine) {
 }
 
 //#endregion
-//#region ../../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.
 *
@@ -13769,7 +14258,7 @@ function applyPatches(uniDiff, options) {
 }
 
 //#endregion
-//#region ../../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();
@@ -13800,7 +14289,7 @@ function reversePatch(structuredPatch$1) {
 }
 
 //#endregion
-//#region ../../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,
@@ -14004,7 +14493,7 @@ function splitLines(text$1) {
 }
 
 //#endregion
-//#region ../../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
 */
@@ -14026,7 +14515,7 @@ function convertChangesToDMP(changes) {
 }
 
 //#endregion
-//#region ../../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
 */
@@ -14071,7 +14560,7 @@ function cleanLastNewline(contents) {
 }
 
 //#endregion
-//#region ../../node_modules/@shikijs/transformers/dist/index.mjs
+//#region ../../node_modules/.bun/@shikijs+transformers@4.0.2/node_modules/@shikijs/transformers/dist/index.mjs
 /**
 * some comment formats have to be located at the end of line
 * hence we can skip matching them for other tokens
@@ -15069,30 +15558,234 @@ function formatCSSVariablePrefix(type) {
 	return `--${type === "token" ? "diffs-token" : "diffs"}-`;
 }
 
+//#endregion
+//#region ../theming/dist/modules/color.js
+/**
+* Canonical color/contrast primitives
+*/
+const MIN_READABLE_RATIO = 3;
+const MIN_MUTED_RATIO = 4.5;
+const HEX_TRANSPARENT_RE = /^#(?:[0-9a-f]{3}0|[0-9a-f]{6}00)$/i;
+const ALPHA_ZERO_RE = /^0(?:\.0+)?%?$/;
+function getFunctionalAlpha(color) {
+	const openParen = color.indexOf("(");
+	if (openParen <= 0 || !color.endsWith(")")) return;
+	const fn = color.slice(0, openParen).trim();
+	if (!/^(?:rgb|rgba|hsl|hsla|hwb|lab|lch|oklab|oklch|color)$/i.test(fn)) return;
+	const inner = color.slice(openParen + 1, -1).trim();
+	if (inner.length === 0) return;
+	const slashIndex = inner.lastIndexOf("/");
+	if (slashIndex !== -1) return inner.slice(slashIndex + 1).trim();
+	if (/^(?:rgba|hsla)$/i.test(fn)) {
+		const parts = inner.split(",");
+		if (parts.length === 4) return parts[3]?.trim();
+	}
+}
+function parseHexRgba(color) {
+	const match = /^#([0-9a-f]{3}|[0-9a-f]{6}|[0-9a-f]{8})\b/i.exec(color.trim());
+	if (match == null) return null;
+	const hex = match[1];
+	let expanded;
+	let alpha = 1;
+	if (hex.length === 3) expanded = hex.split("").map((c) => c + c).join("");
+	else if (hex.length === 6) expanded = hex;
+	else {
+		expanded = hex.slice(0, 6);
+		alpha = parseInt(hex.slice(6, 8), 16) / 255;
+	}
+	return [
+		parseInt(expanded.slice(0, 2), 16),
+		parseInt(expanded.slice(2, 4), 16),
+		parseInt(expanded.slice(4, 6), 16),
+		alpha
+	];
+}
+function relativeLuminance(color) {
+	if (color == null) return null;
+	const rgba = parseHexRgba(color);
+	if (rgba == null) return null;
+	const r$3 = rgba[0] / 255;
+	const g = rgba[1] / 255;
+	const b$2 = rgba[2] / 255;
+	const channel = (v$1) => v$1 <= .03928 ? v$1 / 12.92 : ((v$1 + .055) / 1.055) ** 2.4;
+	return .2126 * channel(r$3) + .7152 * channel(g) + .0722 * channel(b$2);
+}
+function contrastRatio(a$1, b$2) {
+	const [hi, lo] = a$1 > b$2 ? [a$1, b$2] : [b$2, a$1];
+	return (hi + .05) / (lo + .05);
+}
+function compositeOverBg(fgColor, bgColor) {
+	if (bgColor == null) return void 0;
+	const fgParts = parseHexRgba(fgColor);
+	const bgParts = parseHexRgba(bgColor);
+	if (fgParts == null || bgParts == null) return void 0;
+	const [fr, fg, fb, fa] = fgParts;
+	const [br, bg, bb] = bgParts;
+	return "#" + [
+		Math.round(fr * fa + br * (1 - fa)),
+		Math.round(fg * fa + bg * (1 - fa)),
+		Math.round(fb * fa + bb * (1 - fa))
+	].map((v$1) => v$1.toString(16).padStart(2, "0")).join("");
+}
+function isFullyTransparent(color) {
+	if (color == null) return false;
+	const normalized = color.trim().toLowerCase();
+	if (normalized === "transparent") return true;
+	if (HEX_TRANSPARENT_RE.test(normalized)) return true;
+	const alpha = getFunctionalAlpha(normalized);
+	return alpha != null && ALPHA_ZERO_RE.test(alpha);
+}
+function isDarkSurface(bg, fgHint) {
+	const fromBg = relativeLuminance(bg);
+	if (fromBg != null) return fromBg < .4;
+	const fromFg = relativeLuminance(fgHint);
+	return fromFg != null ? fromFg > .6 : false;
+}
+function surfacesMatch(a$1, b$2) {
+	if (a$1 == null || b$2 == null) return false;
+	if (a$1.trim().toLowerCase() === b$2.trim().toLowerCase()) return true;
+	const la = relativeLuminance(a$1);
+	const lb = relativeLuminance(b$2);
+	if (la == null || lb == null) return false;
+	return Math.abs(la - lb) < .06;
+}
+function hoverWouldEraseText(hover, bg, fg) {
+	if (bg == null || fg == null) return false;
+	const hoverL = relativeLuminance(hover);
+	const bgL = relativeLuminance(bg);
+	const fgL = relativeLuminance(fg);
+	if (hoverL == null || bgL == null || fgL == null) return false;
+	return Math.abs(hoverL - fgL) < Math.abs(hoverL - bgL);
+}
+function pickReadableForeground(bg, candidates) {
+	const bgL = relativeLuminance(bg);
+	const firstDefined = candidates.find((candidate) => candidate != null && candidate !== "");
+	if (bgL == null) return firstDefined;
+	let best;
+	let bestRatio = -1;
+	for (const candidate of candidates) {
+		if (candidate == null || candidate === "") continue;
+		const candidateL = relativeLuminance(candidate);
+		if (candidateL == null) continue;
+		const ratio = contrastRatio(bgL, candidateL);
+		if (ratio >= MIN_READABLE_RATIO) return candidate;
+		if (ratio > bestRatio) {
+			best = candidate;
+			bestRatio = ratio;
+		}
+	}
+	return best ?? firstDefined;
+}
+function deriveMutedFg(primaryFg, bg) {
+	if (bg == null) return primaryFg;
+	const fgParts = parseHexRgba(primaryFg);
+	const bgParts = parseHexRgba(bg);
+	const bgL = relativeLuminance(bg);
+	if (fgParts == null || bgParts == null || bgL == null) return `color-mix(in srgb, ${primaryFg} 70%, ${bg})`;
+	const [fr, fg2, fb] = fgParts;
+	const [br, bg3, bb] = bgParts;
+	for (const weight of [
+		.6,
+		.7,
+		.8,
+		.9
+	]) {
+		const hex = "#" + [
+			Math.round(fr * weight + br * (1 - weight)),
+			Math.round(fg2 * weight + bg3 * (1 - weight)),
+			Math.round(fb * weight + bb * (1 - weight))
+		].map((v$1) => v$1.toString(16).padStart(2, "0")).join("");
+		const L$2 = relativeLuminance(hex);
+		if (L$2 != null && contrastRatio(bgL, L$2) >= MIN_MUTED_RATIO) return hex;
+	}
+	return primaryFg;
+}
+
+//#endregion
+//#region ../theming/dist/modules/normalizeThemeColors.js
+const cache = /* @__PURE__ */ new WeakMap();
+function normalizeThemeColors(theme) {
+	const cached = cache.get(theme);
+	if (cached != null) return cached;
+	const originalColors = theme.colors ?? {};
+	const colors = { ...originalColors };
+	const editorBackground = originalColors["editor.background"] ?? theme.bg;
+	const editorForeground = originalColors["editor.foreground"] ?? theme.fg;
+	const sidebarBackground = originalColors["sideBar.background"] ?? editorBackground;
+	const sidebarForeground = originalColors["sideBar.foreground"] ?? editorForeground;
+	fill(colors, "editor.background", editorBackground);
+	fill(colors, "editor.foreground", editorForeground);
+	fill(colors, "sideBar.background", sidebarBackground);
+	fill(colors, "sideBar.foreground", sidebarForeground);
+	fill(colors, "input.background", originalColors["input.background"] ?? sidebarBackground);
+	fill(colors, "sideBarSectionHeader.foreground", originalColors["sideBarSectionHeader.foreground"] ?? sidebarForeground);
+	fill(colors, "list.activeSelectionForeground", originalColors["list.activeSelectionForeground"] ?? sidebarForeground);
+	fill(colors, "gitDecoration.addedResourceForeground", firstColor(originalColors["gitDecoration.addedResourceForeground"], originalColors["terminal.ansiGreen"], originalColors["editorGutter.addedBackground"]));
+	fill(colors, "gitDecoration.modifiedResourceForeground", firstColor(originalColors["gitDecoration.modifiedResourceForeground"], originalColors["terminal.ansiBlue"], originalColors["editorGutter.modifiedBackground"]));
+	fill(colors, "gitDecoration.deletedResourceForeground", firstColor(originalColors["gitDecoration.deletedResourceForeground"], originalColors["terminal.ansiRed"], originalColors["editorGutter.deletedBackground"]));
+	const focusRing = (isFullyTransparent(originalColors["list.focusOutline"]) ? void 0 : originalColors["list.focusOutline"]) ?? (isFullyTransparent(originalColors["focusBorder"]) ? void 0 : originalColors["focusBorder"]);
+	if (focusRing != null) colors["list.focusOutline"] = focusRing;
+	else delete colors["list.focusOutline"];
+	const hover = originalColors["list.hoverBackground"];
+	if (hover != null && (matchesSurface(hover, sidebarBackground) || hoverWouldEraseText(hover, sidebarBackground, sidebarForeground))) delete colors["list.hoverBackground"];
+	const result = Object.freeze({
+		...theme,
+		colors: Object.freeze(colors)
+	});
+	cache.set(theme, result);
+	return result;
+}
+function fill(colors, key$1, value) {
+	if (value != null && value !== "") colors[key$1] = value;
+}
+function firstColor(...candidates) {
+	for (const candidate of candidates) if (candidate != null && candidate !== "") return candidate;
+}
+function matchesSurface(color, surface) {
+	return surface != null && color.toLowerCase() === surface.toLowerCase();
+}
+
+//#endregion
+//#region ../theming/dist/color.js
+const colorUtils = {
+	compositeOverBg,
+	contrastRatio,
+	deriveMutedFg,
+	hoverWouldEraseText,
+	isDarkSurface,
+	isFullyTransparent,
+	pickReadableForeground,
+	relativeLuminance,
+	surfacesMatch
+};
+
 //#endregion
 //#region src/utils/getHighlighterThemeStyles.ts
 function getHighlighterThemeStyles({ theme = DEFAULT_THEMES, highlighter: highlighter$1, 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 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");
+		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);
-		styles += `${formatCSSVariablePrefix("global")}light:${themeData.fg};`;
-		styles += `${formatCSSVariablePrefix("global")}light-bg:${themeData.bg};`;
-		styles += getThemeVariables(themeData, "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"];
@@ -15191,6 +15884,72 @@ function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, col
 		renderAll
 	};
 }
+function hasTrailingContext(fileDiff) {
+	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
+	if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) {
+		return false;
+	}
+	const additionRemaining = fileDiff.additionLines.length - (lastHunk.additionLineIndex + lastHunk.additionCount);
+	const deletionRemaining = fileDiff.deletionLines.length - (lastHunk.deletionLineIndex + lastHunk.deletionCount);
+	return additionRemaining > 0 || deletionRemaining > 0;
+}
+function hasTrailingContextMismatch(fileDiff) {
+	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
+	if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) {
+		return false;
+	}
+	const additionRemaining = fileDiff.additionLines.length - (lastHunk.additionLineIndex + lastHunk.additionCount);
+	const deletionRemaining = fileDiff.deletionLines.length - (lastHunk.deletionLineIndex + lastHunk.deletionCount);
+	if (additionRemaining <= 0 && deletionRemaining <= 0) {
+		return false;
+	}
+	return additionRemaining !== deletionRemaining;
+}
+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 undefined;
+	}
+	const trailingRangeSize = getTrailingContextRangeSize({
+		fileDiff,
+		errorPrefix
+	});
+	if (trailingRangeSize <= 0) {
+		return undefined;
+	}
+	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
+	};
+}
 function getHunkSeparatorHeight({ type, metrics }) {
 	return metrics.hunkSeparatorHeight ?? getDefaultHunkSeparatorHeight(type);
 }
@@ -15265,12 +16024,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;
@@ -15355,24 +16114,13 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			hunkIndex,
 			collapsedContextThreshold
 		});
-		const trailingRegion = (() => {
-			if (hunk !== state.finalHunk || !hasFinalCollapsedHunk(diff)) {
-				return undefined;
-			}
-			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"
+		}) : undefined;
 		const expandedLineCount = leadingRegion.fromStart + leadingRegion.fromEnd;
 		function getTrailingCollapsedAfter(unifiedLineIndex$1, splitLineIndex$1) {
 			if (trailingRegion == null || trailingRegion.collapsedLines <= 0 || trailingRegion.fromStart + trailingRegion.fromEnd > 0) {
@@ -15383,13 +16131,13 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			}
 			return splitLineIndex$1 === hunk.splitLineStart + hunk.splitLineCount - 1 ? trailingRegion.collapsedLines : 0;
 		}
-		function getPendingCollapsed() {
-			if (leadingRegion.collapsedLines === 0) {
+		let consumedCollapsed = leadingRegion.collapsedLines === 0;
+		function consumePendingCollapsed() {
+			if (consumedCollapsed) {
 				return 0;
 			}
-			const value = leadingRegion.collapsedLines;
-			leadingRegion.collapsedLines = 0;
-			return value;
+			consumedCollapsed = true;
+			return leadingRegion.collapsedLines;
 		}
 		if (!state.shouldSkip(expandedLineCount, expandedLineCount)) {
 			let unifiedLineIndex$1 = hunk.unifiedLineStart - leadingRegion.rangeSize;
@@ -15398,44 +16146,30 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			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;
+			if (walkContextLines(state, leadingRegion.fromStart, diffStyle, (index) => {
+				return 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
 					}
-				} else {
-					state.incrementCounts(1, 1);
-				}
-				index++;
+				});
+			})) {
+				break hunkIterator;
 			}
 			unifiedLineIndex$1 = hunk.unifiedLineStart - leadingRegion.fromEnd;
 			splitLineIndex$1 = hunk.splitLineStart - leadingRegion.fromEnd;
@@ -15443,48 +16177,36 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			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;
+			if (walkContextLines(state, leadingRegion.fromEnd, diffStyle, (index) => {
+				return state.emit({
+					hunkIndex,
+					hunk,
+					collapsedBefore: consumePendingCollapsed(),
+					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
 					}
-				} else {
-					state.incrementCounts(1, 1);
-				}
-				index++;
+				});
+			}, () => {
+				consumePendingCollapsed();
+			})) {
+				break hunkIterator;
 			}
 		} else {
 			state.incrementCounts(expandedLineCount, expandedLineCount);
-			getPendingCollapsed();
+			consumePendingCollapsed();
 		}
 		let unifiedLineIndex = hunk.unifiedLineStart;
 		let splitLineIndex = hunk.splitLineStart;
@@ -15500,51 +16222,39 @@ 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;
+					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
 							}
-						} else {
-							state.incrementCounts(1, 1);
-						}
-						index++;
+						});
+					}, () => {
+						consumePendingCollapsed();
+					})) {
+						break hunkIterator;
 					}
 				} else {
 					state.incrementCounts(content.lines, content.lines);
-					getPendingCollapsed();
+					consumePendingCollapsed();
 				}
 				unifiedLineIndex += content.lines;
 				splitLineIndex += content.lines;
@@ -15558,6 +16268,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 				const shouldSkipChange = state.shouldSkip(unifiedCount, splitCount);
 				if (!shouldSkipChange) {
 					const iterationRanges = getChangeIterationRanges(state, content, diffStyle);
+					const firstRangeStart = iterationRanges[0]?.[0] ?? 0;
+					if (firstRangeStart > 0) {
+						consumePendingCollapsed();
+					}
 					for (const [rangeStart, rangeEnd] of iterationRanges) {
 						for (let index = rangeStart; index < rangeEnd; index++) {
 							const unifiedRowIndex = unifiedLineIndex + index;
@@ -15566,7 +16280,7 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 							if (state.emit(getChangeLineData({
 								hunkIndex,
 								hunk,
-								collapsedBefore: getPendingCollapsed(),
+								collapsedBefore: consumePendingCollapsed(),
 								collapsedAfter,
 								diffStyle,
 								index,
@@ -15586,7 +16300,7 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 						}
 					}
 				}
-				getPendingCollapsed();
+				consumePendingCollapsed();
 				state.incrementCounts(unifiedCount, splitCount);
 				unifiedLineIndex += unifiedCount;
 				splitLineIndex += splitCount;
@@ -15599,48 +16313,31 @@ 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: undefined,
-						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;
+			if (walkContextLines(state, len, diffStyle, (index) => {
+				const isLastLine = index === len - 1;
+				return state.emit({
+					hunkIndex: diff.hunks.length,
+					hunk: undefined,
+					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
 					}
-				} else {
-					state.incrementCounts(1, 1);
-				}
-				index++;
+				});
+			}, undefined, () => state.shouldBreak())) {
+				break hunkIterator;
 			}
 		}
 	}
@@ -15719,15 +16416,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"
+		}) : undefined;
+		if (trailingRegion != null) {
 			const trailingCount = trailingRegion.fromStart + trailingRegion.fromEnd;
 			splitCount += trailingCount;
 			unifiedCount += trailingCount;
@@ -15739,7 +16435,7 @@ 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];
 	}
@@ -15769,20 +16465,31 @@ 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}`);
+function walkContextLines(state, count, diffStyle, callback, onSkippedStart, shouldBreak) {
+	const [startIndex, endIndex] = getContextLineIterationBounds(state, count, diffStyle);
+	if (startIndex > 0) {
+		state.incrementCounts(startIndex, startIndex);
+		onSkippedStart?.();
 	}
-	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;
+	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 lastHunk.additionLineIndex + lastHunk.additionCount < diff.additionLines.length || lastHunk.deletionLineIndex + lastHunk.deletionCount < diff.deletionLines.length;
+	return false;
 }
 function getChangeIterationRanges(state, content, diffStyle) {
 	if (!state.isWindowedHighlight) {
@@ -16424,7 +17131,7 @@ function getHighlighter(preferredHighlighter = "shiki-js") {
 	highlighter ??= createHighlighterCore({
 		themes: [],
 		langs: [],
-		engine: preferredHighlighter === "shiki-wasm" ? createOnigurumaEngine(import("./wasm-D4DU5jgR.js")) : createJavaScriptRegexEngine()
+		engine: preferredHighlighter === "shiki-wasm" ? createOnigurumaEngine(import("./wasm-BaDzIkIn.js")) : createJavaScriptRegexEngine()
 	});
 	return highlighter;
 }