@pierre/diffs 1.3.6 → 1.4.0

package/dist/worker/worker-portable.js

@@ -12053,6 +12053,11 @@ function formatPatch(patch, headerOptions) {
 	return ret.join("\n") + "\n";
 }
 //#endregion
+//#region src/utils/appendItems.ts
+function appendItems(target, items) {
+	for (const item of items) target.push(item);
+}
+//#endregion
 //#region src/utils/cleanLastNewline.ts
 function cleanLastNewline(contents) {
 	let end = contents.length;
@@ -13237,9 +13242,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 +13337,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);
@@ -13436,7 +13441,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 +13482,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);