@openclaw/diffs 2026.9.4 → 2026.9.6

package/node_modules/@pierre/diffs/dist/worker/worker-portable.js

@@ -272,9 +272,7 @@ function parseTheme(source) {
 				case "underline":
 					fontStyle = fontStyle | 4;
 					break;
-				case "strikethrough":
-					fontStyle = fontStyle | 8;
-					break;
+				case "strikethrough": fontStyle = fontStyle | 8;
 			}
 		}
 		let foreground = null;
@@ -774,7 +772,6 @@ function collectExternalReferencesInRules(rules, context, result) {
 					else collectExternalReferencesInTopLevelRule(newContext, result);
 				} else if (reference.kind === 4) result.add(new TopLevelRepositoryRuleReference(reference.scopeName, reference.ruleName));
 				else result.add(new TopLevelRuleReference(reference.scopeName));
-				break;
 		}
 	}
 }
@@ -988,8 +985,10 @@ var BeginEndRule = class extends Rule {
 			if (this.applyEndPatternLast) this._cachedCompiledPatterns.push(this._end.hasBackReferences ? this._end.clone() : this._end);
 			else this._cachedCompiledPatterns.unshift(this._end.hasBackReferences ? this._end.clone() : this._end);
 		}
-		if (this._end.hasBackReferences) if (this.applyEndPatternLast) this._cachedCompiledPatterns.setSource(this._cachedCompiledPatterns.length() - 1, endRegexSource);
-		else this._cachedCompiledPatterns.setSource(0, endRegexSource);
+		if (this._end.hasBackReferences) {
+			if (this.applyEndPatternLast) this._cachedCompiledPatterns.setSource(this._cachedCompiledPatterns.length() - 1, endRegexSource);
+			else this._cachedCompiledPatterns.setSource(0, endRegexSource);
+		}
 		return this._cachedCompiledPatterns;
 	}
 };
@@ -1127,11 +1126,12 @@ var RuleFactory = class _RuleFactory {
 						const externalGrammarName = reference.scopeName;
 						const externalGrammarInclude = reference.kind === 4 ? reference.ruleName : null;
 						const externalGrammar = helper.getExternalGrammar(externalGrammarName, repository);
-						if (externalGrammar) if (externalGrammarInclude) {
-							let externalIncludedRule = externalGrammar.repository[externalGrammarInclude];
-							if (externalIncludedRule) ruleId = _RuleFactory.getCompiledRuleId(externalIncludedRule, helper, externalGrammar.repository);
-						} else ruleId = _RuleFactory.getCompiledRuleId(externalGrammar.repository.$self, helper, externalGrammar.repository);
-						break;
+						if (externalGrammar) {
+							if (externalGrammarInclude) {
+								let externalIncludedRule = externalGrammar.repository[externalGrammarInclude];
+								if (externalIncludedRule) ruleId = _RuleFactory.getCompiledRuleId(externalIncludedRule, helper, externalGrammar.repository);
+							} else ruleId = _RuleFactory.getCompiledRuleId(externalGrammar.repository.$self, helper, externalGrammar.repository);
+						}
 				}
 			} else ruleId = _RuleFactory.getCompiledRuleId(pattern, helper, repository);
 			if (ruleId !== -1) {
@@ -1252,9 +1252,10 @@ var RegExpSource = class _RegExpSource {
 	}
 	resolveAnchors(allowA, allowG) {
 		if (!this.hasAnchor || !this._anchorCache || typeof this.source !== "string") return this.source;
-		if (allowA) if (allowG) return this._anchorCache.A1_G1;
-		else return this._anchorCache.A1_G0;
-		else if (allowG) return this._anchorCache.A0_G1;
+		if (allowA) {
+			if (allowG) return this._anchorCache.A1_G1;
+			else return this._anchorCache.A1_G0;
+		} else if (allowG) return this._anchorCache.A0_G1;
 		else return this._anchorCache.A0_G0;
 	}
 };
@@ -1325,14 +1326,15 @@ var RegExpSourceList = class {
 	}
 	compileAG(onigLib, allowA, allowG) {
 		if (!this._hasAnchors) return this.compile(onigLib);
-		else if (allowA) if (allowG) {
-			if (!this._anchorCache.A1_G1) this._anchorCache.A1_G1 = this._resolveAnchors(onigLib, allowA, allowG);
-			return this._anchorCache.A1_G1;
-		} else {
-			if (!this._anchorCache.A1_G0) this._anchorCache.A1_G0 = this._resolveAnchors(onigLib, allowA, allowG);
-			return this._anchorCache.A1_G0;
-		}
-		else if (allowG) {
+		else if (allowA) {
+			if (allowG) {
+				if (!this._anchorCache.A1_G1) this._anchorCache.A1_G1 = this._resolveAnchors(onigLib, allowA, allowG);
+				return this._anchorCache.A1_G1;
+			} else {
+				if (!this._anchorCache.A1_G0) this._anchorCache.A1_G0 = this._resolveAnchors(onigLib, allowA, allowG);
+				return this._anchorCache.A1_G0;
+			}
+		} else if (allowG) {
 			if (!this._anchorCache.A0_G1) this._anchorCache.A0_G1 = this._resolveAnchors(onigLib, allowA, allowG);
 			return this._anchorCache.A0_G1;
 		} else {
@@ -1922,7 +1924,8 @@ var AttributedScopeStack = class _AttributedScopeStack {
 		const rawRootMetadata = grammar.getMetadataForScope(scopeName);
 		const scopePath = new ScopeStack(null, scopeName);
 		const rootStyle = grammar.themeProvider.themeMatch(scopePath);
-		return new _AttributedScopeStack(null, scopePath, _AttributedScopeStack.mergeAttributes(tokenAttributes, rawRootMetadata, rootStyle));
+		const resolvedTokenAttributes = _AttributedScopeStack.mergeAttributes(tokenAttributes, rawRootMetadata, rootStyle);
+		return new _AttributedScopeStack(null, scopePath, resolvedTokenAttributes);
 	}
 	get scopeName() {
 		return this.scopePath.scopeName;
@@ -1966,7 +1969,8 @@ var AttributedScopeStack = class _AttributedScopeStack {
 		const rawMetadata = grammar.getMetadataForScope(scopeName);
 		const newPath = target.scopePath.push(scopeName);
 		const scopeThemeMatchResult = grammar.themeProvider.themeMatch(newPath);
-		return new _AttributedScopeStack(target, newPath, _AttributedScopeStack.mergeAttributes(target.tokenAttributes, rawMetadata, scopeThemeMatchResult));
+		const metadata = _AttributedScopeStack.mergeAttributes(target.tokenAttributes, rawMetadata, scopeThemeMatchResult);
+		return new _AttributedScopeStack(target, newPath, metadata);
 	}
 	getScopeNames() {
 		return this.scopePath.getSegments();
@@ -6348,7 +6352,9 @@ function flatTokenVariants(merged, variantsOrder, cssVariablePrefix, defaultColo
 				const lightIndex = variantsOrder.findIndex((t) => t === "light");
 				const darkIndex = variantsOrder.findIndex((t) => t === "dark");
 				if (lightIndex === -1 || darkIndex === -1) throw new ShikiError$1("When using `defaultColor: \"light-dark()\"`, you must provide both `light` and `dark` themes");
-				mergedStyles[key] = `light-dark(${styles[lightIndex][key] || "inherit"}, ${styles[darkIndex][key] || "inherit"})`;
+				const lightValue = styles[lightIndex][key] || "inherit";
+				const darkValue = styles[darkIndex][key] || "inherit";
+				mergedStyles[key] = `light-dark(${lightValue}, ${darkValue})`;
 				if (colorsRendering === "css-vars") mergedStyles[varKey(idx, key)] = value;
 			} else mergedStyles[key] = value;
 			else if (colorsRendering === "css-vars") mergedStyles[varKey(idx, key)] = value;
@@ -7321,14 +7327,18 @@ const i$1 = /* @__PURE__ */ new Set([
 	"upper",
 	"word",
 	"xdigit"
-]), o$1 = String.raw;
+]);
+const o$1 = String.raw;
 function u(e, t) {
 	if (e == null) throw new Error(t ?? "Value expected");
 	return e;
 }
 //#endregion
 //#region ../../node_modules/.pnpm/oniguruma-parser@0.12.2/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`
+const m$1 = o$1`\[\^?`;
+const 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}`}`;
+const y$1 = /[?*+][?+]?|\{(?:\d+(?:,\d*)?|,\d+)\}\??/;
+const C$1 = new RegExp(o$1`
   \\ (?:
     ${b$1}
     | [gk]<[^>]*>?
@@ -7350,7 +7360,8 @@ const m$1 = o$1`\[\^?`, b$1 = `c.? | C(?:-.?)?|${o$1`[pP]\{(?:\^?[-\x20_]*[A-Za-
   | (?:${y$1.source})+
   | ${m$1}
   | .
-`.replace(/\s+/g, ""), "gsu"), T$1 = new RegExp(o$1`
+`.replace(/\s+/g, ""), "gsu");
+const T$1 = new RegExp(o$1`
   \\ (?:
     ${b$1}
     | .
@@ -7657,7 +7668,8 @@ const B$1 = /* @__PURE__ */ new Set([
 	"MISMATCH",
 	"SKIP",
 	"TOTAL_COUNT"
-]), $$1 = /* @__PURE__ */ new Map([
+]);
+const $$1 = /* @__PURE__ */ new Map([
 	["a", 7],
 	["b", 8],
 	["e", 27],
@@ -7723,11 +7735,11 @@ function O$1(e) {
 	if (e[0] === "{") {
 		const { minStr: s, maxStr: a } = /^\{(?<minStr>\d*)(?:,(?<maxStr>\d*))?/.exec(e).groups, r = 1e5;
 		if (+s > r || a && +a > r) throw new Error("Quantifier value unsupported in Oniguruma");
-		if (t = +s, o = a === void 0 ? +s : a === "" ? Infinity : +a, t > o && (n = "possessive", [t, o] = [o, t]), e.endsWith("?")) {
+		if (t = +s, o = a === void 0 ? +s : a === "" ? 1 / 0 : +a, t > o && (n = "possessive", [t, o] = [o, t]), e.endsWith("?")) {
 			if (n === "possessive") throw new Error("Unsupported possessive interval quantifier chain with \"?\"");
 			n = "lazy";
 		} else n || (n = "greedy");
-	} else t = e[0] === "+" ? 1 : 0, o = e[0] === "?" ? 1 : Infinity, n = e[1] === "+" ? "possessive" : e[1] === "?" ? "lazy" : "greedy";
+	} else t = e[0] === "+" ? 1 : 0, o = e[0] === "?" ? 1 : 1 / 0, n = e[1] === "+" ? "possessive" : e[1] === "?" ? "lazy" : "greedy";
 	return _$1(n, t, o, e);
 }
 function q(e) {
@@ -8554,12 +8566,13 @@ function atomic(expression, data) {
 					aGPos = index;
 					inAG = true;
 				} else if (inAG && noncapturingStart) numGroupsOpenInAG++;
-				else if (capturingStart) if (inAG) numGroupsOpenInAG++;
-				else {
-					numCapturesBeforeAG++;
-					captureNumMap.push(numCapturesBeforeAG + numAGs);
-				}
-				else if (m === ")" && inAG) {
+				else if (capturingStart) {
+					if (inAG) numGroupsOpenInAG++;
+					else {
+						numCapturesBeforeAG++;
+						captureNumMap.push(numCapturesBeforeAG + numAGs);
+					}
+				} else if (m === ")" && inAG) {
 					if (!numGroupsOpenInAG) {
 						numAGs++;
 						const addedCaptureNum = numCapturesBeforeAG + numAGs;
@@ -8635,9 +8648,10 @@ function possessive(expression) {
 		if (m === "[") {
 			if (!numCharClassesOpen) lastCharClassIndex = index;
 			numCharClassesOpen++;
-		} else if (m === "]") if (numCharClassesOpen) numCharClassesOpen--;
-		else lastCharClassIndex = null;
-		else if (!numCharClassesOpen) {
+		} else if (m === "]") {
+			if (numCharClassesOpen) numCharClassesOpen--;
+			else lastCharClassIndex = null;
+		} else if (!numCharClassesOpen) {
 			if (qMod === "+" && lastToken && !lastToken.startsWith("(")) {
 				if (invalidQ) throw new Error(`Invalid quantifier "${m}"`);
 				let charsAdded = -1;
@@ -9209,19 +9223,20 @@ var FirstPassVisitor = {
 		if (kind === "text_segment_boundary") throw new Error(`Unsupported text segment boundary "\\${negate ? "Y" : "y"}"`);
 		else if (kind === "line_end") replaceWith(setParentDeep(K({ body: [b({ body: [F("string_end")] }), b({ body: [m(10)] })] }), parent));
 		else if (kind === "line_start") replaceWith(setParentDeep(parseFragment(r`(?<=\A|\n(?!\z))`, { skipLookbehindValidation: true }), parent));
-		else if (kind === "search_start") if (supportedGNodes.has(node)) {
-			root.flags.sticky = true;
-			remove();
-		} else {
-			const prev = container[key - 1];
-			if (prev && isAlwaysNonZeroLength(prev)) replaceWith(setParentDeep(K({ negate: true }), parent));
-			else if (avoidSubclass) throw new Error(r`Uses "\G" in a way that requires a subclass`);
-			else {
-				replaceWith(setParent(F("string_start"), parent));
-				state.strategy = "clip_search";
+		else if (kind === "search_start") {
+			if (supportedGNodes.has(node)) {
+				root.flags.sticky = true;
+				remove();
+			} else {
+				const prev = container[key - 1];
+				if (prev && isAlwaysNonZeroLength(prev)) replaceWith(setParentDeep(K({ negate: true }), parent));
+				else if (avoidSubclass) throw new Error(r`Uses "\G" in a way that requires a subclass`);
+				else {
+					replaceWith(setParent(F("string_start"), parent));
+					state.strategy = "clip_search";
+				}
 			}
-		}
-		else if (kind === "string_end" || kind === "string_start") {} else if (kind === "string_end_newline") replaceWith(setParentDeep(parseFragment(r`(?=\n?\z)`), parent));
+		} else if (kind === "string_end" || kind === "string_start") {} else if (kind === "string_end_newline") replaceWith(setParentDeep(parseFragment(r`(?=\n?\z)`), parent));
 		else if (kind === "word_boundary") {
 			if (!wordIsAscii && !asciiWordBoundaries) {
 				const b = `(?:(?<=${defaultWordChar})(?!${defaultWordChar})|(?<!${defaultWordChar})(?=${defaultWordChar}))`;
@@ -9272,16 +9287,17 @@ var FirstPassVisitor = {
 			replaceWith(setParentDeep(parseFragment(r`(?>\r\n|${minTargetEs2024 ? r`\p{RGI_Emoji}` : emoji}|\P{M}\p{M}*)`, { skipPropertyNameValidation: true }), parent));
 		} else if (kind === "hex") replaceWith(setParent(Q("AHex", { negate }), parent));
 		else if (kind === "newline") replaceWith(setParentDeep(parseFragment(negate ? "[^\n]" : "(?>\r\n?|[\n\v\f…\u2028\u2029])"), parent));
-		else if (kind === "posix") if (!minTargetEs2024 && (value === "graph" || value === "print")) {
-			if (accuracy === "strict") throw new Error(`POSIX class "${value}" requires min target ES2024 or non-strict accuracy`);
-			let ascii = {
-				graph: "!-~",
-				print: " -~"
-			}[value];
-			if (negate) ascii = `\0-${cp(ascii.codePointAt(0) - 1)}${cp(ascii.codePointAt(2) + 1)}-\u{10FFFF}`;
-			replaceWith(setParentDeep(parseFragment(`[${ascii}]`), parent));
-		} else replaceWith(setParentDeep(setNegate(parseFragment(PosixClassMap.get(value)), negate), parent));
-		else if (kind === "property") {
+		else if (kind === "posix") {
+			if (!minTargetEs2024 && (value === "graph" || value === "print")) {
+				if (accuracy === "strict") throw new Error(`POSIX class "${value}" requires min target ES2024 or non-strict accuracy`);
+				let ascii = {
+					graph: "!-~",
+					print: " -~"
+				}[value];
+				if (negate) ascii = `\0-${cp(ascii.codePointAt(0) - 1)}${cp(ascii.codePointAt(2) + 1)}-\u{10FFFF}`;
+				replaceWith(setParentDeep(parseFragment(`[${ascii}]`), parent));
+			} else replaceWith(setParentDeep(setNegate(parseFragment(PosixClassMap.get(value)), negate), parent));
+		} else if (kind === "property") {
 			if (!JsUnicodePropertyMap.has(w(value))) node.key = "sc";
 		} else if (kind === "space") replaceWith(setParent(Q("space", { negate }), parent));
 		else if (kind === "word") replaceWith(setParentDeep(setNegate(parseFragment(defaultWordChar), negate), parent));
@@ -9289,13 +9305,14 @@ var FirstPassVisitor = {
 	},
 	Directive({ node, parent, root, remove, replaceWith, removeAllPrevSiblings, removeAllNextSiblings }) {
 		const { kind, flags } = node;
-		if (kind === "flags") if (!flags.enable && !flags.disable) remove();
-		else {
-			const flagGroup = A({ flags });
-			flagGroup.body[0].body = removeAllNextSiblings();
-			replaceWith(setParentDeep(flagGroup, parent), { traverse: true });
-		}
-		else if (kind === "keep") {
+		if (kind === "flags") {
+			if (!flags.enable && !flags.disable) remove();
+			else {
+				const flagGroup = A({ flags });
+				flagGroup.body[0].body = removeAllNextSiblings();
+				replaceWith(setParentDeep(flagGroup, parent), { traverse: true });
+			}
+		} else if (kind === "keep") {
 			const firstAlt = root.body[0];
 			const topLevel = root.body.length === 1 && o(firstAlt, { type: "Group" }) && firstAlt.body[0].body.length === 1 ? firstAlt.body[0] : root;
 			if (parent.parent !== topLevel || topLevel.body.length > 1) throw new Error(r`Uses "\K" in a way that's unsupported`);
@@ -10681,9 +10698,10 @@ function loadWasm(options) {
 			else if (isInstantiatorModule(instance)) instance = await instance.default(info);
 			else {
 				if (isDataOptionsObject(instance)) instance = instance.data;
-				if (isResponse(instance)) if (typeof WebAssembly.instantiateStreaming === "function") instance = await _makeResponseStreamingLoader(instance)(info);
-				else instance = await _makeResponseNonStreamingLoader(instance)(info);
-				else if (isArrayBuffer(instance)) instance = await _makeArrayBufferLoader(instance)(info);
+				if (isResponse(instance)) {
+					if (typeof WebAssembly.instantiateStreaming === "function") instance = await _makeResponseStreamingLoader(instance)(info);
+					else instance = await _makeResponseNonStreamingLoader(instance)(info);
+				} else if (isArrayBuffer(instance)) instance = await _makeArrayBufferLoader(instance)(info);
 				else if (instance instanceof WebAssembly.Module) instance = await _makeArrayBufferLoader(instance)(info);
 				else if ("default" in instance && instance.default instanceof WebAssembly.Module) instance = await _makeArrayBufferLoader(instance.default)(info);
 			}
@@ -10764,97 +10782,6 @@ function attachResolvedLanguages(resolvedLanguages, highlighter) {
 //#region src/highlighter/themes/constants.ts
 const AttachedThemes = /* @__PURE__ */ 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, b) => {
-				const result = compare(a.descriptor, b.descriptor);
-				if (result !== 0) return result;
-				return a.index - b.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/unwrapDefault.js
 function unwrapDefault(value) {
 	return value !== null && typeof value === "object" && "default" in value ? value.default : value;
@@ -11662,11 +11589,13 @@ var WordDiff = class extends Diff {
 		const tokens = [];
 		let prevPart = null;
 		parts.forEach((part) => {
-			if (/\s/.test(part)) if (prevPart == null) tokens.push(part);
-			else tokens.push(tokens.pop() + part);
-			else if (prevPart != null && /\s/.test(prevPart)) if (tokens[tokens.length - 1] == prevPart) tokens.push(tokens.pop() + part);
-			else tokens.push(prevPart + part);
-			else tokens.push(part);
+			if (/\s/.test(part)) {
+				if (prevPart == null) tokens.push(part);
+				else tokens.push(tokens.pop() + part);
+			} else if (prevPart != null && /\s/.test(prevPart)) {
+				if (tokens[tokens.length - 1] == prevPart) tokens.push(tokens.pop() + part);
+				else tokens.push(prevPart + part);
+			} else tokens.push(part);
 			prevPart = part;
 		});
 		return tokens;
@@ -11884,173 +11813,9 @@ var ArrayDiff = class extends Diff {
 };
 new ArrayDiff();
 //#endregion
-//#region ../../node_modules/.pnpm/diff@9.0.0/node_modules/diff/libesm/patch/line-endings.js
-function unixToWin(patch) {
-	if (Array.isArray(patch)) return patch.map((p) => unixToWin(p));
-	return Object.assign(Object.assign({}, patch), { hunks: patch.hunks.map((hunk) => Object.assign(Object.assign({}, hunk), { lines: hunk.lines.map((line, i) => {
-		var _a;
-		return line.startsWith("\\") || line.endsWith("\r") || ((_a = hunk.lines[i + 1]) === null || _a === void 0 ? void 0 : _a.startsWith("\\")) ? line : line + "\r";
-	}) })) });
-}
-function winToUnix(patch) {
-	if (Array.isArray(patch)) return patch.map((p) => winToUnix(p));
-	return Object.assign(Object.assign({}, patch), { hunks: patch.hunks.map((hunk) => Object.assign(Object.assign({}, hunk), { lines: hunk.lines.map((line) => line.endsWith("\r") ? line.substring(0, line.length - 1) : line) })) });
-}
-//#endregion
-//#region ../../node_modules/.pnpm/diff@9.0.0/node_modules/diff/libesm/patch/reverse.js
-function swapPrefix(fileName) {
-	if (fileName === void 0 || fileName === "/dev/null") return fileName;
-	if (fileName.startsWith("a/")) return "b/" + fileName.slice(2);
-	if (fileName.startsWith("b/")) return "a/" + fileName.slice(2);
-	return fileName;
-}
-function reversePatch(structuredPatch) {
-	if (Array.isArray(structuredPatch)) return structuredPatch.map((patch) => reversePatch(patch)).reverse();
-	const reversed = Object.assign(Object.assign({}, structuredPatch), {
-		oldFileName: structuredPatch.isGit ? swapPrefix(structuredPatch.newFileName) : structuredPatch.newFileName,
-		oldHeader: structuredPatch.newHeader,
-		newFileName: structuredPatch.isGit ? swapPrefix(structuredPatch.oldFileName) : structuredPatch.oldFileName,
-		newHeader: structuredPatch.oldHeader,
-		oldMode: structuredPatch.newMode,
-		newMode: structuredPatch.oldMode,
-		isCreate: structuredPatch.isDelete,
-		isDelete: structuredPatch.isCreate,
-		hunks: structuredPatch.hunks.map((hunk) => {
-			return {
-				oldLines: hunk.newLines,
-				oldStart: hunk.newStart,
-				newLines: hunk.oldLines,
-				newStart: hunk.oldStart,
-				lines: hunk.lines.map((l) => {
-					if (l.startsWith("-")) return `+${l.slice(1)}`;
-					if (l.startsWith("+")) return `-${l.slice(1)}`;
-					return l;
-				})
-			};
-		})
-	});
-	if (structuredPatch.isCopy) {
-		reversed.newFileName = "/dev/null";
-		reversed.newHeader = void 0;
-		reversed.isDelete = true;
-		delete reversed.isCreate;
-		delete reversed.isCopy;
-		delete reversed.isRename;
-		reversed.hunks = [];
-	}
-	return reversed;
-}
-//#endregion
-//#region ../../node_modules/.pnpm/diff@9.0.0/node_modules/diff/libesm/patch/create.js
-/**
-* Returns true if the filename contains characters that require C-style
-* quoting (as used by Git and GNU diffutils in diff output).
-*/
-function needsQuoting(s) {
-	for (let i = 0; i < s.length; i++) if (s[i] < " " || s[i] > "~" || s[i] === "\"" || s[i] === "\\") return true;
-	return false;
-}
-/**
-* C-style quotes a filename, encoding special characters as escape sequences
-* and non-ASCII bytes as octal escapes. This is the inverse of
-* `parseQuotedFileName` in parse.ts.
-*
-* Non-ASCII bytes are encoded as UTF-8 before being emitted as octal escapes.
-* This matches the behaviour of both Git and GNU diffutils, which always emit
-* UTF-8 octal escapes regardless of the underlying filesystem encoding (e.g.
-* Git for Windows converts from NTFS's UTF-16 to UTF-8 internally).
-*
-* If the filename doesn't need quoting, returns it as-is.
-*/
-function quoteFileNameIfNeeded(s) {
-	if (!needsQuoting(s)) return s;
-	let result = "\"";
-	const bytes = new TextEncoder().encode(s);
-	let i = 0;
-	while (i < bytes.length) {
-		const b = bytes[i];
-		if (b === 7) result += "\\a";
-		else if (b === 8) result += "\\b";
-		else if (b === 9) result += "\\t";
-		else if (b === 10) result += "\\n";
-		else if (b === 11) result += "\\v";
-		else if (b === 12) result += "\\f";
-		else if (b === 13) result += "\\r";
-		else if (b === 34) result += "\\\"";
-		else if (b === 92) result += "\\\\";
-		else if (b >= 32 && b <= 126) result += String.fromCharCode(b);
-		else result += "\\" + b.toString(8).padStart(3, "0");
-		i++;
-	}
-	result += "\"";
-	return result;
-}
-const INCLUDE_HEADERS = {
-	includeIndex: true,
-	includeUnderline: true,
-	includeFileHeaders: true
-};
-/**
-* creates a unified diff patch.
-*
-* @param patch either a single structured patch object (as returned by `structuredPatch`) or an
-*   array of them (as returned by `parsePatch`).
-* @param headerOptions behaves the same as the `headerOptions` option of `createTwoFilesPatch`.
-*   Ignored for patches where `isGit` is `true`.
-*
-* When a patch has `isGit: true`, `formatPatch` output is changed to more closely match Git's
-* output: it emits a `diff --git` header, emits Git extended headers as appropriate based on
-* properties like `isRename`, `isCreate`, `newMode`, etc, and will omit `---`/`+++` file
-* headers for patches with no hunks (e.g. renames without content changes).
-*/
-function formatPatch(patch, headerOptions) {
-	var _a, _b, _c, _d, _e, _f;
-	if (!headerOptions) headerOptions = INCLUDE_HEADERS;
-	if (Array.isArray(patch)) {
-		if (patch.length > 1 && !headerOptions.includeFileHeaders && !patch.every((p) => p.isGit)) throw new Error("Cannot omit file headers on a multi-file patch. (The result would be unparseable; how would a tool trying to apply the patch know which changes are to which file?)");
-		return patch.map((p) => formatPatch(p, headerOptions)).join("\n");
-	}
-	const ret = [];
-	if (patch.isGit) {
-		headerOptions = INCLUDE_HEADERS;
-		if (!patch.oldFileName) throw new Error("oldFileName must be specified for Git patches");
-		if (!patch.newFileName) throw new Error("newFileName must be specified for Git patches");
-		let gitOldName = patch.oldFileName;
-		let gitNewName = patch.newFileName;
-		if (patch.isCreate && gitOldName === "/dev/null") gitOldName = gitNewName.replace(/^b\//, "a/");
-		else if (patch.isDelete && gitNewName === "/dev/null") gitNewName = gitOldName.replace(/^a\//, "b/");
-		ret.push("diff --git " + quoteFileNameIfNeeded(gitOldName) + " " + quoteFileNameIfNeeded(gitNewName));
-		if (patch.isDelete) ret.push("deleted file mode " + ((_a = patch.oldMode) !== null && _a !== void 0 ? _a : "100644"));
-		if (patch.isCreate) ret.push("new file mode " + ((_b = patch.newMode) !== null && _b !== void 0 ? _b : "100644"));
-		if (patch.oldMode && patch.newMode && !patch.isDelete && !patch.isCreate) {
-			ret.push("old mode " + patch.oldMode);
-			ret.push("new mode " + patch.newMode);
-		}
-		if (patch.isRename) {
-			ret.push("rename from " + quoteFileNameIfNeeded(((_c = patch.oldFileName) !== null && _c !== void 0 ? _c : "").replace(/^a\//, "")));
-			ret.push("rename to " + quoteFileNameIfNeeded(((_d = patch.newFileName) !== null && _d !== void 0 ? _d : "").replace(/^b\//, "")));
-		}
-		if (patch.isCopy) {
-			ret.push("copy from " + quoteFileNameIfNeeded(((_e = patch.oldFileName) !== null && _e !== void 0 ? _e : "").replace(/^a\//, "")));
-			ret.push("copy to " + quoteFileNameIfNeeded(((_f = patch.newFileName) !== null && _f !== void 0 ? _f : "").replace(/^b\//, "")));
-		}
-	} else {
-		if (headerOptions.includeIndex && patch.oldFileName == patch.newFileName && patch.oldFileName !== void 0) ret.push("Index: " + patch.oldFileName);
-		if (headerOptions.includeUnderline) ret.push("===================================================================");
-	}
-	const hasHunks = patch.hunks.length > 0;
-	if (headerOptions.includeFileHeaders && patch.oldFileName !== void 0 && patch.newFileName !== void 0 && (!patch.isGit || hasHunks)) {
-		ret.push("--- " + quoteFileNameIfNeeded(patch.oldFileName) + (patch.oldHeader ? "	" + patch.oldHeader : ""));
-		ret.push("+++ " + quoteFileNameIfNeeded(patch.newFileName) + (patch.newHeader ? "	" + patch.newHeader : ""));
-	}
-	for (let i = 0; i < patch.hunks.length; i++) {
-		const hunk = patch.hunks[i];
-		const oldStart = hunk.oldLines === 0 ? hunk.oldStart - 1 : hunk.oldStart;
-		const newStart = hunk.newLines === 0 ? hunk.newStart - 1 : hunk.newStart;
-		ret.push("@@ -" + oldStart + "," + hunk.oldLines + " +" + newStart + "," + hunk.newLines + " @@");
-		for (const line of hunk.lines) ret.push(line);
-	}
-	return ret.join("\n") + "\n";
+//#region src/utils/appendItems.ts
+function appendItems(target, items) {
+	for (const item of items) target.push(item);
 }
 //#endregion
 //#region src/utils/cleanLastNewline.ts
@@ -12062,11 +11827,6 @@ function cleanLastNewline(contents) {
 	}
 	return contents.slice(0, end);
 }
-function getTextContent(element) {
-	if (element.type === "text") return element.value;
-	if (element.type === "element" && element.tagName === "span") return element.children.map(getTextContent).join("");
-	return "";
-}
 /**
 * Remove line breaks between lines.
 * Useful when you override `display: block` to `.line` in CSS.
@@ -12078,7 +11838,8 @@ function transformerStyleToClass(options = {}) {
 		return Object.entries(style).map(([key, value]) => `${key}:${value}`).join(";");
 	}
 	function registerStyle(style) {
-		let className = classPrefix + cyrb53(typeof style === "string" ? style : stringifyStyle(style)) + classSuffix;
+		const str = typeof style === "string" ? style : stringifyStyle(style);
+		let className = classPrefix + cyrb53(str) + classSuffix;
 		className = classReplacer(className);
 		if (!classToStyle.has(className)) classToStyle.set(className, typeof style === "string" ? style : { ...style });
 		return className;
@@ -12659,9 +12420,11 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			return !state.isWindowedHighlight || state.splitCount >= startingLine - splitHeight && state.splitCount < startingLine + totalLines;
 		},
 		emit(props, silent = false) {
-			if (!silent) if (diffStyle === "unified") state.incrementCounts(1, 0);
-			else if (diffStyle === "split") state.incrementCounts(0, 1);
-			else state.incrementCounts(1, 1);
+			if (!silent) {
+				if (diffStyle === "unified") state.incrementCounts(1, 0);
+				else if (diffStyle === "split") state.incrementCounts(0, 1);
+				else state.incrementCounts(1, 1);
+			}
 			return callback(props) ?? false;
 		}
 	};
@@ -13237,9 +13000,9 @@ function renderDiffWithHighlighter(diff, highlighter, options, { forcePlainText,
 			continue;
 		}
 		if (bucket.deletionSegments.length > 0) for (const seg of bucket.deletionSegments) for (let i = 0; i < seg.count; i++) code.deletionLines[seg.targetIndex + i] = deletionLines[seg.originalOffset + i];
-		else code.deletionLines.push(...deletionLines);
+		else appendItems(code.deletionLines, deletionLines);
 		if (bucket.additionSegments.length > 0) for (const seg of bucket.additionSegments) for (let i = 0; i < seg.count; i++) code.additionLines[seg.targetIndex + i] = additionLines[seg.originalOffset + i];
-		else code.additionLines.push(...additionLines);
+		else appendItems(code.additionLines, additionLines);
 	}
 	return {
 		code,
@@ -13332,7 +13095,7 @@ function createBucket() {
 		additionSegments: []
 	};
 }
-function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo, highlighter, deletionDecorations, additionDecorations, languageOverride, options: { theme: themeOrThemes = DEFAULT_THEMES, ...options } }) {
+function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo, highlighter, deletionDecorations, additionDecorations, languageOverride, options: { theme: themeOrThemes, ...options } }) {
 	const deletionLang = languageOverride ?? getFiletypeFromFileName(deletionFile.name);
 	const additionLang = languageOverride ?? getFiletypeFromFileName(additionFile.name);
 	const { state, transformers } = createTransformerWithState(options.useTokenTransformer);
@@ -13391,15 +13154,16 @@ function computeLineOffsets(contents) {
 	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);
+		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 = carriageReturn + 1;
-			carriageReturn = contents.indexOf("\r", nextOffset);
-		}
-		else {
 			nextOffset = lineFeed + 1;
 			lineFeed = contents.indexOf("\n", nextOffset);
 		}
@@ -13436,7 +13200,7 @@ function linesFromFileContents(contents) {
 //#endregion
 //#region src/utils/renderFileWithHighlighter.ts
 const DEFAULT_PLAIN_TEXT_OPTIONS = { forcePlainText: false };
-function renderFileWithHighlighter(file, highlighter, { theme = DEFAULT_THEMES, tokenizeMaxLineLength, useTokenTransformer }, { forcePlainText, startingLine, totalLines, lines } = DEFAULT_PLAIN_TEXT_OPTIONS) {
+function renderFileWithHighlighter(file, highlighter, { theme, tokenizeMaxLineLength, useTokenTransformer }, { forcePlainText, startingLine, totalLines, lines } = DEFAULT_PLAIN_TEXT_OPTIONS) {
 	if (forcePlainText) {
 		startingLine ??= 0;
 		totalLines ??= Infinity;
@@ -13477,15 +13241,18 @@ function renderFileWithHighlighter(file, highlighter, { theme = DEFAULT_THEMES,
 			tokenizeTimeLimit: 0
 		};
 	})();
-	const highlightedLines = getLineNodes(highlighter.codeToHast(isWindowedHighlight ? extractWindowedFileContent(lines ?? linesFromFileContents(file.contents), startingLine, totalLines) : file.contents, hastConfig));
+	const highlightedLines = getLineNodes(highlighter.codeToHast(normalizeHighlightLineEndings(isWindowedHighlight ? extractWindowedFileContent(lines ?? linesFromFileContents(file.contents), startingLine, totalLines) : file.contents), hastConfig));
 	const code = isWindowedHighlight ? new Array(startingLine) : highlightedLines;
-	if (isWindowedHighlight) code.push(...highlightedLines);
+	if (isWindowedHighlight) appendItems(code, highlightedLines);
 	return {
 		code,
 		themeStyles,
 		baseThemeType
 	};
 }
+function normalizeHighlightLineEndings(contents) {
+	return contents.replace(/\r(?!\n)/g, "\n");
+}
 function extractWindowedFileContent(lines, startingLine, totalLines) {
 	if (lines.length === 0) return "";
 	const endLine = Math.min(startingLine + totalLines, lines.length);