Fix extra blank lines in copied review comment diffs (#44)

Author: gumadeiras

src/__tests__/App.test.tsx

@@ -586,6 +586,8 @@ test('review comment markdown includes multi-line ranges', () => {
   expect(markdown).toContain('1. **src/range.ts** (New lines 1-2)');
   expect(markdown).toContain('+   1 | const first = true;');
   expect(markdown).toContain('+   2 | const second = true;');
+  expect(markdown).toContain('+   1 | const first = true;\n   +   2 | const second = true;');
+  expect(markdown).not.toContain('const first = true;\n\n   +');
 });
 
 test('escape discards empty review comments without confirmation', () => {

src/lib/review-comments.ts

@@ -27,9 +27,10 @@ export const getReviewCommentLineSelection = (comment: ReviewComment): CodeViewL
 type ReviewPatchRow = {
   additionLineNumber?: number;
   deletionLineNumber?: number;
+  patchLineIndex: number;
+  patchLines: ReadonlyArray<string>;
   prefix: '+' | '-' | ' ';
   side?: ReviewComment['side'];
-  text: string;
 };
 
 const matchesReviewPatchLine = (
@@ -140,6 +141,12 @@ const indentMarkdown = (value: string) =>
     .join('\n');
 
 const formatReviewLineNumber = (lineNumber: number | string) => String(lineNumber).padStart(4);
+// @pierre/diffs keeps source line terminators; copied Markdown rows add their own separators.
+const trimReviewPatchLineTerminator = (line: string) =>
+  line.endsWith('\r\n') ? line.slice(0, -2) : line.endsWith('\n') ? line.slice(0, -1) : line;
+
+const getReviewPatchText = (lines: ReadonlyArray<string>, index: number) =>
+  trimReviewPatchLineTerminator(lines[index] ?? '');
 
 export const getReviewCommentPatchContext = (
   file: ChangedFile,
@@ -160,8 +167,9 @@ export const getReviewCommentPatchContext = (
           rows.push({
             additionLineNumber: additionLineNumber + index,
             deletionLineNumber: deletionLineNumber + index,
+            patchLineIndex: content.additionLineIndex + index,
+            patchLines: fileDiff.additionLines,
             prefix: ' ',
-            text: fileDiff.additionLines[content.additionLineIndex + index] ?? '',
           });
         }
         deletionLineNumber += content.lines;
@@ -172,18 +180,20 @@ export const getReviewCommentPatchContext = (
       for (let index = 0; index < content.deletions; index += 1) {
         rows.push({
           deletionLineNumber: deletionLineNumber + index,
+          patchLineIndex: content.deletionLineIndex + index,
+          patchLines: fileDiff.deletionLines,
           prefix: '-',
           side: 'deletions',
-          text: fileDiff.deletionLines[content.deletionLineIndex + index] ?? '',
         });
       }
 
       for (let index = 0; index < content.additions; index += 1) {
         rows.push({
           additionLineNumber: additionLineNumber + index,
+          patchLineIndex: content.additionLineIndex + index,
+          patchLines: fileDiff.additionLines,
           prefix: '+',
           side: 'additions',
-          text: fileDiff.additionLines[content.additionLineIndex + index] ?? '',
         });
       }
 
@@ -213,7 +223,10 @@ export const getReviewCommentPatchContext = (
           : row.prefix === '-'
             ? row.deletionLineNumber
             : `${row.deletionLineNumber ?? ''}/${row.additionLineNumber ?? ''}`;
-      return `${row.prefix}${formatReviewLineNumber(lineNumber ?? '')} | ${row.text}`;
+      return `${row.prefix}${formatReviewLineNumber(lineNumber ?? '')} | ${getReviewPatchText(
+        row.patchLines,
+        row.patchLineIndex,
+      )}`;
     });
 
     return [hunk.hunkSpecs?.trim(), ...context].filter(Boolean).join('\n');