@pierre/diffs 1.3.3 → 1.3.5

package/dist/renderers/DiffHunksRenderer.js

@@ -69,11 +69,18 @@ var DiffHunksRenderer = class {
 	* Enter edit-session mode: hunk updates preserve the current region
 	* skeleton instead of recomputing hunks, and rendering happens locally
 	* with the token transformer forced on (worker-pool requests/results are
-	* suspended for this renderer). Called on every editor attach, including
-	* a re-attach after recycle.
+	* suspended for this renderer). An empty additions document gets one row so
+	* the editor has a line for its caret. Called on every editor attach,
+	* including a re-attach after recycle.
 	*/
 	beginEditSession() {
 		this.editSessionActive = true;
+		const diff = this.diffCache;
+		if (diff != null && !diff.isPartial && diff.additionLines.length === 0) {
+			Object.assign(diff, recomputeEmptyDocumentDiff(diff, this.options.parseDiffOptions));
+			this.markEditSessionPass(diff);
+			this.clearRenderCache();
+		}
 	}
 	/** Leave edit-session mode. The exit recompute is the host's concern. */
 	endEditSession() {
@@ -269,7 +276,7 @@ var DiffHunksRenderer = class {
 		result.code.additionLines = realignAdditionHastLines(previousAdditionLines, diff.additionLines, result.code.additionLines, textDocument);
 		if (diff.additionLines.length <= 1 && diff.additionLines.join("") === "") {
 			Object.assign(diff, recomputeEmptyDocumentDiff(diff, this.options.parseDiffOptions));
-			result.code.additionLines[0] = createPlainAdditionLineElement(0, textDocument);
+			result.code.additionLines[0] = createPlainAdditionLineElement(0, textDocument.getLineText(0));
 			this.markEditSessionPass(diff);
 		} else if (this.editSessionActive) this.applySessionDocumentChange(diff);
 		else Object.assign(diff, recomputeDiffHunksForEdit(diff, this.options.parseDiffOptions));
@@ -489,12 +496,29 @@ var DiffHunksRenderer = class {
 	renderDiffWithHighlighter(diff, highlighter, forcePlainText = false) {
 		const { options } = this.getRenderOptions(diff);
 		const { collapsedContextThreshold } = this.getOptionsWithDefaults();
-		return {
-			result: renderDiffWithHighlighter(diff, highlighter, options, {
-				forcePlainText,
+		const result = renderDiffWithHighlighter(diff, highlighter, options, {
+			forcePlainText,
+			expandedHunks: forcePlainText ? true : void 0,
+			collapsedContextThreshold
+		});
+		if (this.editSessionActive && diff.additionLines.length === 1 && diff.additionLines[0] === "" && result.code.additionLines[0] == null) {
+			let fallbackLine;
+			iterateOverDiff({
+				diff,
+				diffStyle: "both",
 				expandedHunks: forcePlainText ? true : void 0,
-				collapsedContextThreshold
-			}),
+				collapsedContextThreshold,
+				callback: ({ additionLine }) => {
+					if (additionLine?.lineIndex !== 0) return;
+					fallbackLine = additionLine;
+					return true;
+				}
+			});
+			if (fallbackLine == null) throw new Error("DiffHunksRenderer: missing empty addition line");
+			result.code.additionLines[0] = createPlainAdditionLineElement(0, "", fallbackLine.unifiedLineIndex, fallbackLine.splitLineIndex);
+		}
+		return {
+			result,
 			options
 		};
 	}
@@ -1120,16 +1144,16 @@ function realignAdditionHastLines(previousLines, nextLines, hastLines, textDocum
 	for (let offset = 0; offset < suffix; offset++) realigned[nextContentLength - 1 - offset] = hastLines[previousContentLength - 1 - offset];
 	if (previousContentLength < previousLines.length && nextContentLength < nextLines.length) realigned[nextLines.length - 1] = hastLines[previousLines.length - 1];
 	for (let index = previousLines.length; index < nextLines.length; index++) realigned[index] ??= hastLines[index];
-	for (let index = prefix; index < nextLines.length; index++) realigned[index] ??= createPlainAdditionLineElement(index, textDocument);
+	for (let index = prefix; index < nextLines.length; index++) realigned[index] ??= createPlainAdditionLineElement(index, textDocument.getLineText(index));
 	return realigned;
 }
-function createPlainAdditionLineElement(lineIndex, textDocument) {
+function createPlainAdditionLineElement(lineIndex, lineText, unifiedLineIndex = lineIndex, splitLineIndex = lineIndex) {
 	return {
 		type: "element",
 		tagName: "div",
 		properties: {
 			"data-line": lineIndex + 1,
-			"data-line-index": `${lineIndex},${lineIndex}`,
+			"data-line-index": `${unifiedLineIndex},${splitLineIndex}`,
 			"data-line-type": "context"
 		},
 		children: [{
@@ -1138,7 +1162,7 @@ function createPlainAdditionLineElement(lineIndex, textDocument) {
 			properties: { "data-char": 0 },
 			children: [{
 				type: "text",
-				value: textDocument.getLineText(lineIndex)
+				value: lineText
 			}]
 		}]
 	};