fix: ensure minimum row height for empty lines and correct 'No newline' row calculation

- Fix getCurrentLineRow to return minimum 1 row for empty lines (both CodeView and DiffView)
- Fix 'No newline at end of file' row height calculation to include actual text length instead of blindly adding +1

Author: MrWangJustToDo

packages/cli/src/components/DiffSplitContentLine.tsx

@@ -56,18 +56,21 @@ const InternalDiffSplitLine = ({
 
   // Calculate row heights - must match the actual wrap width used in DiffContent
   // DiffContent receives contentWidth and wraps at (contentWidth - 2) for the operator column and end padding
-  let oldRow = getCurrentLineRow({ content: oldLine?.value || "", width: contentWidth - 2 });
-  let newRow = getCurrentLineRow({ content: newLine?.value || "", width: contentWidth - 2 });
+  const noNewlineText = "\\ No newline at end of file";
 
-  oldRow =
+  // Include "No newline" text in row calculation if present
+  const oldContent =
     oldLine?.diff?.changes?.hasLineChange && oldLine?.diff?.changes.newLineSymbol === NewLineSymbol.NEWLINE
-      ? oldRow + 1
-      : oldRow;
+      ? (oldLine?.value || "") + noNewlineText
+      : oldLine?.value || "";
 
-  newRow =
+  const newContent =
     newLine?.diff?.changes?.hasLineChange && newLine?.diff?.changes.newLineSymbol === NewLineSymbol.NEWLINE
-      ? newRow + 1
-      : newRow;
+      ? (newLine?.value || "") + noNewlineText
+      : newLine?.value || "";
+
+  const oldRow = getCurrentLineRow({ content: oldContent, width: contentWidth - 2 });
+  const newRow = getCurrentLineRow({ content: newContent, width: contentWidth - 2 });
 
   const row = Math.max(oldRow, newRow);
 

packages/cli/src/components/DiffUnifiedContentLine.tsx

@@ -181,10 +181,15 @@ const InternalDiffUnifiedLine = ({
 
   const contentWidth = columns - (lineNumWidth + 1) * 2 - 1;
 
-  // Use contentWidth - 2 to match the actual wrap width in DiffContent (operator column takes 1 char, end padding takes 1 char)
-  let row = getCurrentLineRow({ content: rawLine, width: contentWidth - 2 });
+  // Include "No newline" text in row calculation if present
+  const noNewlineText = "\\ No newline at end of file";
+  const contentWithSymbol =
+    diffLine?.changes?.hasLineChange && diffLine.changes.newLineSymbol === NewLineSymbol.NEWLINE
+      ? rawLine + noNewlineText
+      : rawLine;
 
-  row = diffLine?.changes?.hasLineChange && diffLine.changes.newLineSymbol === NewLineSymbol.NEWLINE ? row + 1 : row;
+  // Use contentWidth - 2 to match the actual wrap width in DiffContent (operator column takes 1 char, end padding takes 1 char)
+  const row = getCurrentLineRow({ content: contentWithSymbol, width: contentWidth - 2 });
 
   const color = hasDiff
     ? theme === "light"

packages/cli/src/components/codeTools.ts

@@ -93,5 +93,6 @@ export const createCodeConfigStore = <T = any>(props: CodeViewProps<T> & { isMou
 };
 
 export const getCurrentLineRow = ({ content, width }: { content: string; width: number }) => {
-  return Math.ceil(stringWidth(content) / width);
+  // Ensure minimum of 1 row for empty lines
+  return Math.max(1, Math.ceil(stringWidth(content) / width));
 };

packages/cli/src/components/tools.ts

@@ -127,7 +127,8 @@ export const createDiffConfigStore = <T = any>(
 };
 
 export const getCurrentLineRow = ({ content, width }: { content: string; width: number }) => {
-  return Math.ceil(stringWidth(content) / width);
+  // Ensure minimum of 1 row for empty lines
+  return Math.max(1, Math.ceil(stringWidth(content) / width));
 };
 
 export const getStringContentWithFixedWidth = ({

packages/cli/test/code.mjs

@@ -210,11 +210,11 @@ export const highlighterReady = new Promise<DiffHighlighter>((r) => {
 getDiffViewHighlighter().then((highlighter) => {
   render(
     createElement(CodeView, {
-      data: {content: temp1, fileLang: 'ts'},
+      data: { content: temp1, fileLang: "ts" },
       // width: 80,
       codeViewTheme: "dark",
       extendData: {
-        newFile: { 107: { data: "test extend data" } },
+        107: { data: "test extend data" },
       },
       renderExtendLine: ({ data }) => {
         return createElement(

packages/cli/test/file.mjs

@@ -422,7 +422,7 @@ getDiffViewHighlighter().then((highlighter) => {
       // diffViewTabWidth: 'small',
       // diffViewTabSpace: true,
       extendData: {
-        newFile: { 107: { data: "test extend data" } },
+        newFile: { 97: { data: "test extend data" } },
       },
       renderExtendLine: ({ data }) => {
         return createElement(