Merge pull request #7367 from continuedev/dallin/diff-UI

feat: diff UI for find and replace tools

Author: tomasz-stefaniak

gui/package-lock.json

@@ -36,10 +36,12 @@
     "@tiptap/react": "^2.1.13",
     "@tiptap/starter-kit": "^2.1.13",
     "@tiptap/suggestion": "^2.1.13",
+    "@types/diff": "^7.0.2",
     "@types/uuid": "^10.0.0",
     "anser": "^2.3.2",
     "clsx": "^2.1.1",
     "core": "file:../core",
+    "diff": "^8.0.2",
     "dompurify": "^3.0.6",
     "downshift": "^7.6.0",
     "escape-carriage": "^1.3.1",

gui/package.json

@@ -11,7 +11,7 @@ interface ApplyActionsProps {
   applyState?: ApplyState;
   onClickAccept: () => void;
   onClickReject: () => void;
-  onClickApply: () => void;
+  onClickApply?: () => void;
 }
 
 export function ApplyActions(props: ApplyActionsProps) {

gui/src/components/StyledMarkdownPreview/StepContainerPreToolbar/ApplyActions.tsx

@@ -1,10 +1,11 @@
 import { getLastNPathParts } from "core/util/uri";
+import { MouseEventHandler } from "react";
 import FileIcon from "../../FileIcon";
 import { ToolTip } from "../../gui/Tooltip";
 
 export interface FileInfoProps {
   filepath: string;
-  onClick?: () => void;
+  onClick?: MouseEventHandler<HTMLDivElement>;
   range?: string;
 }
 

gui/src/components/StyledMarkdownPreview/StepContainerPreToolbar/FileInfo.tsx

@@ -96,7 +96,7 @@ export function StepContainerPreToolbar({
       toolCallState?.status === "errored" ||
       toolCallState?.status === "done") ? (
       <div
-        className={`mr-1 h-4 w-4 ${toolCallState.output ? "cursor-pointer" : ""}`}
+        className={`mr-1 h-4 w-4 flex-shrink-0 ${toolCallState.output ? "cursor-pointer" : ""}`}
         onClick={() => {
           if (toolCallState.output) {
             ideMessenger.post("showVirtualFile", {