@corbat-tech/coco 2.8.2 → 2.9.0

package/dist/index.js

@@ -25,6 +25,7 @@ import JSON5 from 'json5';
 import 'events';
 import 'minimatch';
 import { simpleGit } from 'simple-git';
+import { diffWords } from 'diff';
 import hljs from 'highlight.js/lib/core';
 import bash from 'highlight.js/lib/languages/bash';
 import css from 'highlight.js/lib/languages/css';
@@ -18915,6 +18916,10 @@ function highlightLine(line, lang) {
 }
 
 // src/cli/repl/output/diff-renderer.ts
+var bgDeleteLine = chalk3.bgRgb(80, 20, 20);
+var bgAddLine = chalk3.bgRgb(20, 60, 20);
+var bgDeleteWord = chalk3.bgRgb(160, 40, 40);
+var bgAddWord = chalk3.bgRgb(40, 120, 40);
 function parseDiff(raw) {
   const files = [];
   const lines = raw.split("\n");
@@ -19039,6 +19044,46 @@ function parseHunk(lines, start) {
     nextIndex: i
   };
 }
+function pairAdjacentLines(lines) {
+  const pairs = [];
+  let i = 0;
+  while (i < lines.length) {
+    const deleteStart = i;
+    while (i < lines.length && lines[i].type === "delete") i++;
+    const deleteEnd = i;
+    const addStart = i;
+    while (i < lines.length && lines[i].type === "add") i++;
+    const addEnd = i;
+    const deleteCount = deleteEnd - deleteStart;
+    const addCount = addEnd - addStart;
+    if (deleteCount > 0 && addCount > 0) {
+      const pairCount = Math.min(deleteCount, addCount);
+      for (let j = 0; j < pairCount; j++) {
+        pairs.push({ deleteIdx: deleteStart + j, addIdx: addStart + j });
+      }
+    }
+    if (i === deleteEnd && i === addEnd) {
+      i++;
+    }
+  }
+  return pairs;
+}
+function highlightWordChanges(deletedContent, addedContent) {
+  const changes = diffWords(deletedContent, addedContent);
+  let styledDelete = "";
+  let styledAdd = "";
+  for (const change of changes) {
+    if (change.added) {
+      styledAdd += bgAddWord(change.value);
+    } else if (change.removed) {
+      styledDelete += bgDeleteWord(change.value);
+    } else {
+      styledDelete += bgDeleteLine(change.value);
+      styledAdd += bgAddLine(change.value);
+    }
+  }
+  return { styledDelete, styledAdd };
+}
 var getTerminalWidth = () => process.stdout.columns || 80;
 function stripAnsi(str) {
   return str.replace(/\x1b\[[0-9;]*m/g, "");
@@ -19107,32 +19152,64 @@ function renderFileBlock(file, opts) {
         ) + hunkLabel
       );
     }
-    for (const line of hunk.lines) {
+    const pairs = pairAdjacentLines(hunk.lines);
+    const pairedDeleteIndices = new Set(pairs.map((p4) => p4.deleteIdx));
+    const pairedAddIndices = new Set(pairs.map((p4) => p4.addIdx));
+    const pairByAdd = new Map(pairs.map((p4) => [p4.addIdx, p4.deleteIdx]));
+    const wordHighlights = /* @__PURE__ */ new Map();
+    for (const pair of pairs) {
+      const delLine = hunk.lines[pair.deleteIdx];
+      const addLine = hunk.lines[pair.addIdx];
+      wordHighlights.set(pair.deleteIdx, highlightWordChanges(delLine.content, addLine.content));
+    }
+    for (let li = 0; li < hunk.lines.length; li++) {
+      const line = hunk.lines[li];
       const lineNo = formatLineNo(line, showLineNumbers);
       const prefix = line.type === "add" ? "+" : line.type === "delete" ? "-" : " ";
-      let content = line.content;
-      if (line.type !== "delete" && lang) {
-        content = highlightLine(content, lang);
-      }
-      const lineStr = `${lineNo}${prefix} ${content}`;
-      const plainLen = stripAnsi(lineStr).length;
-      const pad = Math.max(0, contentWidth - plainLen);
       if (line.type === "add") {
+        const isPaired = pairedAddIndices.has(li);
+        let content;
+        if (isPaired) {
+          const delIdx = pairByAdd.get(li);
+          content = wordHighlights.get(delIdx).styledAdd;
+        } else {
+          content = line.content;
+        }
+        const innerText = `${lineNo}${prefix} ${content}`;
+        const plainLen = stripAnsi(innerText).length + 1;
+        const pad = Math.max(0, contentWidth - plainLen);
         console.log(
-          chalk3.magenta("\u2502") + chalk3.green(` ${lineStr}`) + " ".repeat(pad) + " " + chalk3.magenta("\u2502")
+          chalk3.magenta("\u2502") + bgAddLine(` ${innerText}` + " ".repeat(pad + 2)) + chalk3.magenta("\u2502")
         );
       } else if (line.type === "delete") {
+        const isPaired = pairedDeleteIndices.has(li);
+        let content;
+        if (isPaired) {
+          content = wordHighlights.get(li).styledDelete;
+        } else {
+          content = line.content;
+        }
+        const innerText = `${lineNo}${prefix} ${content}`;
+        const plainLen = stripAnsi(innerText).length + 1;
+        const pad = Math.max(0, contentWidth - plainLen);
         console.log(
-          chalk3.magenta("\u2502") + chalk3.red(` ${lineStr}`) + " ".repeat(pad) + " " + chalk3.magenta("\u2502")
+          chalk3.magenta("\u2502") + bgDeleteLine(` ${innerText}` + " ".repeat(pad + 2)) + chalk3.magenta("\u2502")
         );
       } else {
+        let content = line.content;
+        if (lang) {
+          content = highlightLine(content, lang);
+        }
+        const lineStr = `${lineNo}${prefix} ${content}`;
+        const plainLen = stripAnsi(lineStr).length;
+        const pad = Math.max(0, contentWidth - plainLen);
         console.log(
           chalk3.magenta("\u2502") + chalk3.dim(` ${lineStr}`) + " ".repeat(pad) + " " + chalk3.magenta("\u2502")
         );
       }
     }
   }
-  console.log(chalk3.magenta("\u2570" + "\u2500".repeat(maxWidth - 2) + "\u256F"));
+  console.log(chalk3.magenta("\u2570" + "\u2500".repeat(Math.max(0, maxWidth - 2)) + "\u256F"));
 }
 function formatLineNo(line, show) {
   if (!show) return "";