@pierre/diffs 1.5.1 → 1.5.2

package/dist/editor/getChangedDocumentLines.d.ts

@@ -0,0 +1,6 @@
+import { TextDocument, TextDocumentChange } from "./textDocument.js";
+//#region src/editor/getChangedDocumentLines.d.ts
+declare function getChangedDocumentLines(document: Pick<TextDocument, 'getLineText' | 'getText' | 'lineCount'>, change: TextDocumentChange): Map<number, string>;
+//#endregion
+export { getChangedDocumentLines };
+//# sourceMappingURL=getChangedDocumentLines.d.ts.map

package/dist/editor/getChangedDocumentLines.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getChangedDocumentLines.d.ts","names":[],"sources":["../../src/editor/getChangedDocumentLines.ts"],"mappings":";;iBAMgB,wBACd,UAAU,KAAK,wDACf,QAAQ,qBACP"}

package/dist/editor/getChangedDocumentLines.js

@@ -0,0 +1,35 @@
+import { linesFromFileContents } from "../utils/computeFileOffsets.js";
+//#region src/editor/getChangedDocumentLines.ts
+function getChangedDocumentLines(document, change) {
+	const ranges = change.changedLineChanges?.some(([, , delta]) => delta !== 0) === true ? [[change.startLine, change.endLine]] : change.changedLineRanges;
+	const lines = /* @__PURE__ */ new Map();
+	for (const [start, end] of ranges) {
+		const lastLine = Math.min(end, document.lineCount - 1);
+		if (lastLine < start) continue;
+		if (lastLine === start) {
+			lines.set(start, document.getLineText(start, true));
+			continue;
+		}
+		const endPosition = lastLine + 1 < document.lineCount ? {
+			line: lastLine + 1,
+			character: 0
+		} : {
+			line: lastLine,
+			character: document.getLineText(lastLine).length
+		};
+		const contents = document.getText({
+			start: {
+				line: start,
+				character: 0
+			},
+			end: endPosition
+		});
+		const rangeLines = linesFromFileContents(contents);
+		for (let line = start; line <= lastLine; line++) lines.set(line, rangeLines[line - start]);
+	}
+	return lines;
+}
+//#endregion
+export { getChangedDocumentLines };
+
+//# sourceMappingURL=getChangedDocumentLines.js.map

package/dist/editor/getChangedDocumentLines.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getChangedDocumentLines.js","names":[],"sources":["../../src/editor/getChangedDocumentLines.ts"],"sourcesContent":["import { linesFromFileContents } from '../utils/computeFileOffsets';\nimport type { TextDocument, TextDocumentChange } from './textDocument';\n\n// Get the current text of all lines affected by an edit, even outside the visible\n// area, so the diff keeps the same text as the editor. Adding or removing lines\n// can change the line numbers between edits, so include those lines too.\nexport function getChangedDocumentLines(\n  document: Pick<TextDocument, 'getLineText' | 'getText' | 'lineCount'>,\n  change: TextDocumentChange\n): Map<number, string> {\n  const ranges =\n    change.changedLineChanges?.some(([, , delta]) => delta !== 0) === true\n      ? [[change.startLine, change.endLine]]\n      : change.changedLineRanges;\n  const lines = new Map<number, string>();\n  for (const [start, end] of ranges) {\n    const lastLine = Math.min(end, document.lineCount - 1);\n    if (lastLine < start) continue;\n    if (lastLine === start) {\n      lines.set(start, document.getLineText(start, true));\n      continue;\n    }\n    // Read a whole range at once to avoid searching the piece table for every\n    // line. Single-line edits above keep the cheaper direct lookup.\n    const endPosition =\n      lastLine + 1 < document.lineCount\n        ? { line: lastLine + 1, character: 0 }\n        : { line: lastLine, character: document.getLineText(lastLine).length };\n    const contents = document.getText({\n      start: { line: start, character: 0 },\n      end: endPosition,\n    });\n    const rangeLines = linesFromFileContents(contents);\n    for (let line = start; line <= lastLine; line++) {\n      lines.set(line, rangeLines[line - start]);\n    }\n  }\n  return lines;\n}\n"],"mappings":";;AAMA,SAAgB,wBACd,UACA,QACqB;CACrB,MAAM,SACJ,OAAO,oBAAoB,MAAM,KAAK,WAAW,UAAU,CAAC,MAAM,OAC9D,CAAC,CAAC,OAAO,WAAW,OAAO,OAAO,CAAC,IACnC,OAAO;CACb,MAAM,wBAAQ,IAAI,IAAoB;CACtC,KAAK,MAAM,CAAC,OAAO,QAAQ,QAAQ;EACjC,MAAM,WAAW,KAAK,IAAI,KAAK,SAAS,YAAY,CAAC;EACrD,IAAI,WAAW,OAAO;EACtB,IAAI,aAAa,OAAO;GACtB,MAAM,IAAI,OAAO,SAAS,YAAY,OAAO,IAAI,CAAC;GAClD;EACF;EAGA,MAAM,cACJ,WAAW,IAAI,SAAS,YACpB;GAAE,MAAM,WAAW;GAAG,WAAW;EAAE,IACnC;GAAE,MAAM;GAAU,WAAW,SAAS,YAAY,QAAQ,CAAC,CAAC;EAAO;EACzE,MAAM,WAAW,SAAS,QAAQ;GAChC,OAAO;IAAE,MAAM;IAAO,WAAW;GAAE;GACnC,KAAK;EACP,CAAC;EACD,MAAM,aAAa,sBAAsB,QAAQ;EACjD,KAAK,IAAI,OAAO,OAAO,QAAQ,UAAU,QACvC,MAAM,IAAI,MAAM,WAAW,OAAO,MAAM;CAE5C;CACA,OAAO;AACT"}

package/dist/renderers/DiffHunksRenderer.d.ts

@@ -133,7 +133,7 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
    * row set without a line-count change — the host must escalate to a full
    * re-render instead of its cheap refresh path.
    */
-  updateRenderCache(dirtyLines: Map<number, Array<HighlightedToken>>, themeType: 'dark' | 'light', lineCountChangeInFlight?: boolean): boolean;
+  updateRenderCache(dirtyLines: Map<number, Array<HighlightedToken>>, themeType: 'dark' | 'light', lineCountChangeInFlight?: boolean, changedDocumentLines?: ReadonlyMap<number, string>, documentLineCount?: number): boolean;
   private applyExpansionRemap;
   applyDocumentChange(textDocument: TextDocument<'file-diff', LAnnotation>): void;
   private applySessionDocumentChange;

package/dist/renderers/DiffHunksRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":";;;;;;;UAoJiB,iCAAiC;EAChD,mBAAmB;;UAGJ,6CAA6C,KAC5D;EAGA,kBAAkB;;UAGH;EACf;EACA,UAAU;EACV;EACA;;UAGe;EACf;EACA;EACA;;UAGe;EACf,gBAAgB;EAChB,mBAAmB;EACnB,oBAAoB;;UAUL;EACf;EACA;EACA;EACA;EACA;EACA,eAAe;EACf,eAAe;;UAGA;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,UAAU;;UAGK;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,kBAAkB;EAClB,mBAAmB;EACnB,oBAAoB;EACpB,qBAAqB;EACrB,oBAAoB;EACpB,qBAAqB;EACrB,UAAU;EACV;EACA,SAAS;EACT,eAAe;EACf;EACA;EACA;EACA;EACA;EACA;;cAKW,kBAAkB;EAgCpB,SAAS;UACR;UAGA;UACA;WApCD;UAED;UAIA;UAEA;UAEA;UACA;UAEA;UACA;UAGA;UAGA;UAQA;EAER,YACS,UAAS,0BACR,sBACN,YAAY,mBAAmB,yBAEzB,8CACA,gBAAgB;EASnB;EAQA;;;;;;;;;;EA4BA,iBACL,MAAM,kBACN,eAAe;;EA0EV;;;;EAWA;;;;;;;;;;EAiBA,4BAA4B;UAqC3B;MA4BG,aAAa;EAIjB;EAMA,WAAW,SAAS;EAIpB,aAAa,SAAS,QAAQ;EAI9B,WACL,eACA,WAAW,qBACX;EA0BK,gBAAgB,oBAAoB;EAIpC,uBAAuB,YAAY;;EAKnC,oBACL,eAAe,YAAY;EAKtB,mBACL,iBAAiB,mBAAmB;;;;;;;EAyB/B,kBACL,YAAY,YAAY,MAAM,oBAC9B,6BACA;UA+HM;EAWD,oBACL,cAAc,0BAA0B;UAkElC;UAwBA;UAaA;YAOE,2BACR,YACC,6BAA6B;YAStB,yBACR,MACA,QACC,2BAA2B;UAetB;YAKU,iCAChB,KAAK,wBACF;YAGa,+BAChB,KAAK,wBACF;YAEK,0BAA0B;EAiDvB,yBAAyB,QAAQ;EAYvC,QAAQ,MAAM;UAmCb;EAQD,2BAA2B,KAChC;UAeM;;;;;;EA2CD,qBAAqB,MAAM,mBAAmB;UAwB7C;EAiCD,WACL,OAAM,8BACN,cAAa,cACZ;EAiJU,YACX,MAAM,kBACN,cAAa,cACZ,QAAQ;YAMD,iBACR,gBACA,oBACA,mBAAmB,sBAClB;UAeW;UAuBN;EA2CD,mBACL,MAAM,kBACN,QAAQ,kBACR,SAAS,mBACT;UAQM;UAqCA;UAgBA;UAuBA;EAaD,iBAAiB;UAIhB;UAIA;EAgjBD,cACL,6CACA,QAAQ,oBACP;EAyBI,cACL,QAAQ,mBACR,WAAU,mBACT;EAkDI,eACL,QAAQ,mBACR,eAAc;EAKT,kBACL,UAAU,kBACV;UAqBM;UAiEA;UA+DA;UASA"}
+{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":";;;;;;;UAoJiB,iCAAiC;EAChD,mBAAmB;;UAGJ,6CAA6C,KAC5D;EAGA,kBAAkB;;UAGH;EACf;EACA,UAAU;EACV;EACA;;UAGe;EACf;EACA;EACA;;UAGe;EACf,gBAAgB;EAChB,mBAAmB;EACnB,oBAAoB;;UAUL;EACf;EACA;EACA;EACA;EACA;EACA,eAAe;EACf,eAAe;;UAGA;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,UAAU;;UAGK;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,kBAAkB;EAClB,mBAAmB;EACnB,oBAAoB;EACpB,qBAAqB;EACrB,oBAAoB;EACpB,qBAAqB;EACrB,UAAU;EACV;EACA,SAAS;EACT,eAAe;EACf;EACA;EACA;EACA;EACA;EACA;;cAKW,kBAAkB;EAgCpB,SAAS;UACR;UAGA;UACA;WApCD;UAED;UAIA;UAEA;UAEA;UACA;UAEA;UACA;UAGA;UAGA;UAQA;EAER,YACS,UAAS,0BACR,sBACN,YAAY,mBAAmB,yBAEzB,8CACA,gBAAgB;EASnB;EAQA;;;;;;;;;;EA4BA,iBACL,MAAM,kBACN,eAAe;;EA0EV;;;;EAWA;;;;;;;;;;EAiBA,4BAA4B;UAqC3B;MA4BG,aAAa;EAIjB;EAMA,WAAW,SAAS;EAIpB,aAAa,SAAS,QAAQ;EAI9B,WACL,eACA,WAAW,qBACX;EA0BK,gBAAgB,oBAAoB;EAIpC,uBAAuB,YAAY;;EAKnC,oBACL,eAAe,YAAY;EAKtB,mBACL,iBAAiB,mBAAmB;;;;;;;EAyB/B,kBACL,YAAY,YAAY,MAAM,oBAC9B,6BACA,mCACA,uBAAuB,6BACvB;UAoKM;EAWD,oBACL,cAAc,0BAA0B;UAkElC;UAwBA;UAaA;YAOE,2BACR,YACC,6BAA6B;YAStB,yBACR,MACA,QACC,2BAA2B;UAetB;YAKU,iCAChB,KAAK,wBACF;YAGa,+BAChB,KAAK,wBACF;YAEK,0BAA0B;EAiDvB,yBAAyB,QAAQ;EAYvC,QAAQ,MAAM;UAmCb;EAQD,2BAA2B,KAChC;UAeM;;;;;;EA2CD,qBAAqB,MAAM,mBAAmB;UAwB7C;EAiCD,WACL,OAAM,8BACN,cAAa,cACZ;EAiJU,YACX,MAAM,kBACN,cAAa,cACZ,QAAQ;YAMD,iBACR,gBACA,oBACA,mBAAmB,sBAClB;UAeW;UAuBN;EA2CD,mBACL,MAAM,kBACN,QAAQ,kBACR,SAAS,mBACT;UAQM;UAqCA;UAgBA;UAuBA;EAaD,iBAAiB;UAIhB;UAIA;EAgjBD,cACL,6CACA,QAAQ,oBACP;EAyBI,cACL,QAAQ,mBACR,WAAU,mBACT;EAkDI,eACL,QAAQ,mBACR,eAAc;EAKT,kBACL,UAAU,kBACV;UAqBM;UAiEA;UA+DA;UASA"}

package/dist/renderers/DiffHunksRenderer.js

@@ -223,7 +223,7 @@ var DiffHunksRenderer = class {
 	* row set without a line-count change — the host must escalate to a full
 	* re-render instead of its cheap refresh path.
 	*/
-	updateRenderCache(dirtyLines, themeType, lineCountChangeInFlight = false) {
+	updateRenderCache(dirtyLines, themeType, lineCountChangeInFlight = false, changedDocumentLines, documentLineCount) {
 		this.pendingStructuralRows = void 0;
 		const { renderCache } = this;
 		if (renderCache == null) return false;
@@ -234,13 +234,27 @@ var DiffHunksRenderer = class {
 		const pendingStructuralRows = this.pendingStructuralRows = lineCountChangeInFlight ? /* @__PURE__ */ new Map() : void 0;
 		const changedAdditionLines = [];
 		const previousAdditionLines = /* @__PURE__ */ new Map();
+		if (pendingStructuralRows == null && changedDocumentLines != null) {
+			const additionLineCount = diff.additionLines.length;
+			const canAppendFinalRow = canAppendFinalDocumentRow(diff.additionLines, documentLineCount);
+			for (const [line, text] of changedDocumentLines) {
+				if (line < 0 || line > additionLineCount || line === additionLineCount && (text === "" || !canAppendFinalRow)) continue;
+				const previous = diff.additionLines[line] ?? "";
+				if (previous !== text) {
+					diff.additionLines[line] = text;
+					changedAdditionLines.push(line);
+					previousAdditionLines.set(line, previous);
+					if (!dirtyLines.has(line)) hastLines[line] = createPlainAdditionLineElement(line, cleanLastNewline(text));
+				}
+			}
+		}
 		for (const [line, tokens] of dirtyLines) {
 			const prevProps = hastLines[line]?.properties ?? {};
 			const lineText = tokens.map((a) => a[2]).join("");
 			const canSyncDiffLine = line < diff.additionLines.length;
 			const prevLine = canSyncDiffLine ? diff.additionLines[line] ?? "" : "";
 			const prevText = cleanLastNewline(prevLine);
-			if (pendingStructuralRows == null && canSyncDiffLine) {
+			if (pendingStructuralRows == null && canSyncDiffLine && changedDocumentLines?.has(line) !== true) {
 				diff.additionLines[line] = applyLineTextWithNewline(prevLine, lineText);
 				if (prevText !== lineText) {
 					changedAdditionLines.push(line);
@@ -1233,6 +1247,9 @@ function realignAdditionHastLines(previousLines, nextLines, hastLines, textDocum
 	for (let index = prefix; index < nextLines.length; index++) realigned[index] ??= createPlainAdditionLineElement(index, textDocument.getLineText(index));
 	return realigned;
 }
+function canAppendFinalDocumentRow(additionLines, documentLineCount) {
+	return documentLineCount === additionLines.length + 1 && additionLines.at(-1)?.endsWith("\n") === true;
+}
 function createPlainAdditionLineElement(lineIndex, lineText, unifiedLineIndex = lineIndex, splitLineIndex = lineIndex) {
 	return {
 		type: "element",