Skip to content

feat: diff UI for find and replace tools #7367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 25, 2025
Merged

feat: diff UI for find and replace tools #7367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
469c0c8
feat: UI for diff tools
RomneyDa Aug 23, 2025
07c3930
test: find and replace ui tests
RomneyDa Aug 23, 2025
0208969
chore: cleanup console logs
RomneyDa Aug 24, 2025
56b7195
fix: cubic feedback
RomneyDa Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion gui/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions gui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion gui/src/components/StyledMarkdownPreview/StepContainerPreToolbar/ApplyActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ interface ApplyActionsProps {
applyState?: ApplyState;
onClickAccept: () => void;
onClickReject: () => void;
onClickApply: () => void;
onClickApply?: () => void;
}

export function ApplyActions(props: ApplyActionsProps) {
Expand Down
3 changes: 2 additions & 1 deletion gui/src/components/StyledMarkdownPreview/StepContainerPreToolbar/FileInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion gui/src/components/StyledMarkdownPreview/StepContainerPreToolbar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", {
Expand Down
Loading