From 4ea0a4bb56a23ba5dcee750f7f6bb104d9da8a15 Mon Sep 17 00:00:00 2001
From: Ammar <ammar+ai@ammar.io>
Date: Fri, 12 Dec 2025 11:00:13 -0600
Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20fix:=20align=20diff=20styling=20?=
 =?UTF-8?q?with=20app=20theme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RightSidebar/CodeReview/HunkViewer.tsx    | 38 +++++-----
 .../components/shared/DiffRenderer.tsx        | 73 ++++++++++++-------
 .../components/tools/FileEditToolCall.tsx     | 20 ++---
 3 files changed, 78 insertions(+), 53 deletions(-)

diff --git a/src/browser/components/RightSidebar/CodeReview/HunkViewer.tsx b/src/browser/components/RightSidebar/CodeReview/HunkViewer.tsx
index 8b88107415..c4762d5084 100644
--- a/src/browser/components/RightSidebar/CodeReview/HunkViewer.tsx
+++ b/src/browser/components/RightSidebar/CodeReview/HunkViewer.tsx
@@ -248,25 +248,25 @@ export const HunkViewer = React.memo<HunkViewerProps>(
             Renamed from <code>{hunk.oldPath}</code>
           </div>
         ) : isExpanded ? (
-          <div className="font-monospace bg-code-bg grid grid-cols-[minmax(min-content,1fr)] overflow-x-auto px-2 py-1.5 text-[11px] leading-[1.4]">
-            <SelectableDiffRenderer
-              content={hunk.content}
-              filePath={hunk.filePath}
-              oldStart={hunk.oldStart}
-              newStart={hunk.newStart}
-              maxHeight="none"
-              onReviewNote={onReviewNote}
-              onLineClick={() => {
-                // Create synthetic event with data-hunk-id for parent handler
-                const syntheticEvent = {
-                  currentTarget: { dataset: { hunkId } },
-                } as unknown as React.MouseEvent<HTMLElement>;
-                onClick?.(syntheticEvent);
-              }}
-              searchConfig={searchConfig}
-              enableHighlighting={isVisible}
-            />
-          </div>
+          <SelectableDiffRenderer
+            content={hunk.content}
+            filePath={hunk.filePath}
+            oldStart={hunk.oldStart}
+            newStart={hunk.newStart}
+            fontSize="11px"
+            maxHeight="none"
+            className="rounded-none border-0"
+            onReviewNote={onReviewNote}
+            onLineClick={() => {
+              // Create synthetic event with data-hunk-id for parent handler
+              const syntheticEvent = {
+                currentTarget: { dataset: { hunkId } },
+              } as unknown as React.MouseEvent<HTMLElement>;
+              onClick?.(syntheticEvent);
+            }}
+            searchConfig={searchConfig}
+            enableHighlighting={isVisible}
+          />
         ) : (
           <div
             className="text-muted hover:text-foreground cursor-pointer px-3 py-2 text-center text-[11px] italic"
diff --git a/src/browser/components/shared/DiffRenderer.tsx b/src/browser/components/shared/DiffRenderer.tsx
index b7c7f72611..4b0f0b34cd 100644
--- a/src/browser/components/shared/DiffRenderer.tsx
+++ b/src/browser/components/shared/DiffRenderer.tsx
@@ -23,51 +23,64 @@ import type { ReviewNoteData } from "@/common/types/review";
 // Shared type for diff line types
 export type DiffLineType = "add" | "remove" | "context" | "header";
 
-// Helper function for getting diff line background color
+// Helper function for getting diff line background color.
+// Keep backgrounds subtle so the diff reads like a code block, not a highlighter.
 const getDiffLineBackground = (type: DiffLineType): string => {
   switch (type) {
     case "add":
-      return "rgba(46, 160, 67, 0.15)";
+      return "color-mix(in srgb, var(--color-success), transparent 90%)";
     case "remove":
-      return "rgba(248, 81, 73, 0.15)";
+      return "color-mix(in srgb, var(--color-danger), transparent 90%)";
+    case "header":
+      return "color-mix(in srgb, var(--color-accent), transparent 92%)";
+    case "context":
     default:
       return "transparent";
   }
 };
 
-// Helper function for getting diff line text color
-const getDiffLineColor = (type: DiffLineType): string => {
+const getDiffLineBorderColor = (type: DiffLineType): string => {
   switch (type) {
     case "add":
-      return "#4caf50";
+      return "color-mix(in srgb, var(--color-success), transparent 35%)";
     case "remove":
-      return "#f44336";
+      return "color-mix(in srgb, var(--color-danger), transparent 35%)";
     case "header":
-      return "#2196f3";
+      return "color-mix(in srgb, var(--color-accent), transparent 45%)";
     case "context":
     default:
-      return "var(--color-text)";
+      return "transparent";
   }
 };
 
-// Helper function for getting line content color
+// Helper function for getting line content color.
+// Only headers/context are tinted; actual code stays the normal foreground color.
 const getLineContentColor = (type: DiffLineType): string => {
   switch (type) {
     case "header":
-      return "#2196f3";
+      return "var(--color-accent-light)";
     case "context":
       return "var(--color-text-secondary)";
     case "add":
     case "remove":
+    default:
       return "var(--color-text)";
   }
 };
 
-// Helper function for computing contrast color for add/remove indicators
+// Used for the +/- marker and line numbers.
 const getContrastColor = (type: DiffLineType): string => {
-  return type === "add" || type === "remove"
-    ? "color-mix(in srgb, var(--color-text-secondary), white 50%)"
-    : "var(--color-text-secondary)";
+  switch (type) {
+    case "add":
+      return "var(--color-success-light)";
+    case "remove":
+      return "var(--color-danger-soft)";
+    case "header":
+      return "var(--color-accent-light)";
+    case "context":
+    default:
+      return "var(--color-text-secondary)";
+  }
 };
 
 /**
@@ -115,7 +128,12 @@ export const DiffContainer: React.FC<
   const showOverflowControls = clampContent && isOverflowing;
 
   return (
-    <div className={cn("relative m-0 rounded bg-code-bg py-1.5 [&_*]:text-[inherit]", className)}>
+    <div
+      className={cn(
+        "relative m-0 rounded-sm border border-border-light bg-code-bg py-1.5 [&_*]:text-[inherit]",
+        className
+      )}
+    >
       <div
         ref={contentRef}
         className={cn(
@@ -271,12 +289,15 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
           return (
             <div
               key={line.originalIndex}
-              className="block w-full"
-              style={{ background: getDiffLineBackground(chunk.type) }}
+              className="block w-full border-l-2 border-transparent"
+              style={{
+                background: getDiffLineBackground(chunk.type),
+                borderLeftColor: getDiffLineBorderColor(chunk.type),
+              }}
             >
               <div
-                className="flex px-2 font-mono whitespace-pre"
-                style={{ color: getDiffLineColor(chunk.type) }}
+                className="font-monospace flex px-2 whitespace-pre"
+                style={{ color: "var(--color-text)" }}
               >
                 <span
                   className="inline-block w-1 shrink-0 text-center"
@@ -451,6 +472,7 @@ export const SelectableDiffRenderer = React.memo<SelectableDiffRendererProps>(
     filePath,
     fontSize,
     maxHeight,
+    className,
     onReviewNote,
     onLineClick,
     searchConfig,
@@ -556,7 +578,7 @@ export const SelectableDiffRenderer = React.memo<SelectableDiffRendererProps>(
     // Show loading state while highlighting
     if (!highlightedChunks || highlightedLineData.length === 0) {
       return (
-        <DiffContainer fontSize={fontSize} maxHeight={maxHeight}>
+        <DiffContainer fontSize={fontSize} maxHeight={maxHeight} className={className}>
           <div style={{ opacity: 0.5, padding: "8px" }}>Processing...</div>
         </DiffContainer>
       );
@@ -566,7 +588,7 @@ export const SelectableDiffRenderer = React.memo<SelectableDiffRendererProps>(
     const lines = content.split("\n").filter((line) => line.length > 0);
 
     return (
-      <DiffContainer fontSize={fontSize} maxHeight={maxHeight}>
+      <DiffContainer fontSize={fontSize} maxHeight={maxHeight} className={className}>
         {highlightedLineData.map((lineInfo, displayIndex) => {
           const isSelected = isLineSelected(displayIndex);
           const indicator = lineInfo.type === "add" ? "+" : lineInfo.type === "remove" ? "-" : " ";
@@ -576,12 +598,13 @@ export const SelectableDiffRenderer = React.memo<SelectableDiffRendererProps>(
               <div
                 className={cn(
                   SELECTABLE_DIFF_LINE_CLASS,
-                  "block w-full relative cursor-text group"
+                  "block w-full relative cursor-text group border-l-2 border-transparent"
                 )}
                 style={{
                   background: isSelected
                     ? "hsl(from var(--color-review-accent) h s l / 0.2)"
                     : getDiffLineBackground(lineInfo.type),
+                  borderLeftColor: getDiffLineBorderColor(lineInfo.type),
                 }}
               >
                 <span className="absolute top-1/2 left-1 z-[1] -translate-y-1/2">
@@ -618,8 +641,8 @@ export const SelectableDiffRenderer = React.memo<SelectableDiffRendererProps>(
                   </Tooltip>
                 </span>
                 <div
-                  className="flex px-2 font-mono whitespace-pre"
-                  style={{ color: getDiffLineColor(lineInfo.type) }}
+                  className="font-monospace flex px-2 whitespace-pre"
+                  style={{ color: "var(--color-text)" }}
                 >
                   <span
                     className="inline-block w-1 shrink-0 text-center"
diff --git a/src/browser/components/tools/FileEditToolCall.tsx b/src/browser/components/tools/FileEditToolCall.tsx
index 53eaca55a1..ee5c2bea12 100644
--- a/src/browser/components/tools/FileEditToolCall.tsx
+++ b/src/browser/components/tools/FileEditToolCall.tsx
@@ -160,15 +160,17 @@ export const FileEditToolCall: React.FC<FileEditToolCallProps> = ({
                 </DetailSection>
               )}
 
-              {result.success && result.diff && (
-                <DiffContainer>
-                  {showRaw ? (
-                    <pre className="m-0 break-words whitespace-pre-wrap">{result.diff}</pre>
-                  ) : (
-                    renderDiff(result.diff, filePath, onReviewNote)
-                  )}
-                </DiffContainer>
-              )}
+              {result.success &&
+                result.diff &&
+                (showRaw ? (
+                  <DiffContainer>
+                    <pre className="font-monospace m-0 text-[11px] leading-[1.4] break-words whitespace-pre-wrap">
+                      {result.diff}
+                    </pre>
+                  </DiffContainer>
+                ) : (
+                  renderDiff(result.diff, filePath, onReviewNote)
+                ))}
             </>
           )}