fix: make error display less jarring by matching diff_error style #6782
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,73 @@ | ||||||
| import React from "react" | ||||||
| import { cn } from "@/lib/utils" | ||||||
| import { IconButton } from "./IconButton" | ||||||
|
|
||||||
| interface DisclosureHeaderProps { | ||||||
| contentId: string | ||||||
| iconClass: string | ||||||
| iconStyle?: React.CSSProperties | ||||||
| title: React.ReactNode | ||||||
| expanded: boolean | ||||||
| onToggle: () => void | ||||||
| onCopy?: (e: React.MouseEvent) => void | ||||||
| copyTitle?: string | ||||||
| copyIconClass?: string // e.g. "codicon-copy" | "codicon-check" | ||||||
| className?: string | ||||||
| } | ||||||
|
|
||||||
| export const DisclosureHeader: React.FC<DisclosureHeaderProps> = ({ | ||||||
| contentId, | ||||||
| iconClass, | ||||||
| iconStyle, | ||||||
| title, | ||||||
| expanded, | ||||||
| onToggle, | ||||||
| onCopy, | ||||||
| copyTitle, | ||||||
| copyIconClass, | ||||||
| className, | ||||||
| }) => { | ||||||
| return ( | ||||||
| <div | ||||||
| className={cn("flex items-center justify-between", className)} | ||||||
| style={{ | ||||||
| fontWeight: "normal", | ||||||
| fontSize: "var(--vscode-font-size)", | ||||||
| color: "var(--vscode-editor-foreground)", | ||||||
| borderBottom: expanded ? "1px solid var(--vscode-editorGroup-border)" : "none", | ||||||
| }}> | ||||||
| <button | ||||||
| type="button" | ||||||
| aria-expanded={expanded} | ||||||
| aria-controls={contentId} | ||||||
| onClick={onToggle} | ||||||
| className={cn( | ||||||
| "flex items-center justify-between gap-2", | ||||||
| "bg-transparent border-0 p-0 m-0 cursor-pointer", | ||||||
| "focus:outline-none focus-visible:ring-1 focus-visible:ring-vscode-focusBorder", | ||||||
| )} | ||||||
| style={{ width: "100%", textAlign: "left" }}> | ||||||
| <div style={{ display: "flex", alignItems: "center", gap: "10px", flexGrow: 1 }}> | ||||||
| <span | ||||||
| className={cn("codicon", iconClass)} | ||||||
| style={{ fontSize: 16, marginBottom: "-1.5px", ...iconStyle }} | ||||||
| /> | ||||||
| <span>{title}</span> | ||||||
| </div> | ||||||
| <span className={`codicon codicon-chevron-${expanded ? "down" : "right"}`} /> | ||||||
| </button> | ||||||
|
|
||||||
| {onCopy && ( | ||||||
| <IconButton | ||||||
| iconClass={copyIconClass ?? "codicon-copy"} | ||||||
| title={copyTitle ?? "Copy"} | ||||||
|
Contributor
There was a problem hiding this comment. The default copy title is hardcoded as 'Copy'. Consider using a translatable string (via an i18n function) instead of a literal string to adhere to internationalization guidelines.
Suggested change
This comment was generated because it violated a code review rule: irule_C0ez7Rji6ANcGkkX. |
||||||
| onClick={(e) => { | ||||||
| e.stopPropagation() | ||||||
| onCopy(e) | ||||||
| }} | ||||||
| style={{ marginLeft: 4 }} | ||||||
| /> | ||||||
| )} | ||||||
| </div> | ||||||
| ) | ||||||
| } | ||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I notice there's significant code duplication between the error and diff_error implementations. Both share nearly identical structure for the collapsible UI, copy functionality, and expand/collapse behavior. Could we consider extracting a reusable component like to reduce this duplication and make future maintenance easier?