6612692d98
### Summary - Added a new "Apply" button to code snippets provided by the AI assistant. - The button is designed to seamlessly merge the AI-generated snippet into the relevant file in the editor. ### Current Issues 1. **Sticky Accept/Decline Buttons:** These activate for every snippet instead of being limited to the relevant snippet. 2. **Discard Button:** Currently non-functional. 3. **Highlight Inconsistencies:** The green-red code highlights for old and new code are inconsistent. ### To Do - Implement a toast notification when the "Apply" button is pressed on an irrelevant tab to prevent code application errors. ### Workflow Implemented 1. The "Apply" button is added alongside "Copy" and "Reply" for AI-generated code snippets. 2. Upon clicking "Apply," the code snippet and relevant file content (active file) are sent to a secondary model (GPT-4O). 3. The system prompt for GPT-4O instructs it to merge the snippet with the file content: - Ensure the original file functionality remains intact. - Integrate the code snippet seamlessly. 4. The output from GPT-4O is injected directly into the code editor. 5. Changes are visually highlighted: - Green for new code. - Red for removed code. 6. Highlights remain until the user explicitly accepts or discards the changes.
150 lines
5.2 KiB
TypeScript
150 lines
5.2 KiB
TypeScript
import { Check, CornerUpLeft, X } from "lucide-react"
|
|
import monaco from "monaco-editor"
|
|
import { Components } from "react-markdown"
|
|
import { Prism as SyntaxHighlighter } from "react-syntax-highlighter"
|
|
import { vscDarkPlus } from "react-syntax-highlighter/dist/esm/styles/prism"
|
|
import { Button } from "../../../ui/button"
|
|
import ApplyButton from "../ApplyButton"
|
|
import { stringifyContent } from "./chatUtils"
|
|
|
|
// Create markdown components for chat message component
|
|
export const createMarkdownComponents = (
|
|
renderCopyButton: (text: any) => JSX.Element,
|
|
renderMarkdownElement: (props: any) => JSX.Element,
|
|
askAboutCode: (code: any) => void,
|
|
activeFileName: string,
|
|
activeFileContent: string,
|
|
editorRef: any,
|
|
handleApplyCode: (mergedCode: string) => void,
|
|
mergeDecorationsCollection?: monaco.editor.IEditorDecorationsCollection,
|
|
setMergeDecorationsCollection?: (collection: undefined) => void
|
|
): Components => ({
|
|
code: ({
|
|
node,
|
|
className,
|
|
children,
|
|
...props
|
|
}: {
|
|
node?: import("hast").Element
|
|
className?: string
|
|
children?: React.ReactNode
|
|
[key: string]: any
|
|
}) => {
|
|
const match = /language-(\w+)/.exec(className || "")
|
|
|
|
return match ? (
|
|
<div className="relative border border-input rounded-md mt-8 my-2 translate-y-[-1rem]">
|
|
<div className="absolute top-0 left-0 px-2 py-1 text-xs font-semibold text-gray-200 rounded-tl">
|
|
{match[1]}
|
|
</div>
|
|
<div className="sticky top-0 right-0 flex justify-end z-10">
|
|
<div className="flex border border-input shadow-lg bg-background rounded-md">
|
|
{renderCopyButton(children)}
|
|
<div className="w-px bg-input"></div>
|
|
{!mergeDecorationsCollection ? (
|
|
<ApplyButton
|
|
code={String(children)}
|
|
activeFileName={activeFileName}
|
|
activeFileContent={activeFileContent}
|
|
editorRef={editorRef}
|
|
onApply={handleApplyCode}
|
|
/>
|
|
) : (
|
|
<>
|
|
<Button
|
|
onClick={() => {
|
|
if (
|
|
setMergeDecorationsCollection &&
|
|
mergeDecorationsCollection &&
|
|
editorRef?.current
|
|
) {
|
|
mergeDecorationsCollection.clear()
|
|
setMergeDecorationsCollection(undefined)
|
|
}
|
|
}}
|
|
size="sm"
|
|
variant="ghost"
|
|
className="p-1 h-6"
|
|
title="Accept Changes"
|
|
>
|
|
<Check className="w-4 h-4 text-green-500" />
|
|
</Button>
|
|
<div className="w-px bg-input"></div>
|
|
<Button
|
|
onClick={() => {
|
|
if (
|
|
setMergeDecorationsCollection &&
|
|
mergeDecorationsCollection &&
|
|
editorRef?.current
|
|
) {
|
|
editorRef.current.getModel()?.setValue(activeFileContent)
|
|
mergeDecorationsCollection.clear()
|
|
setMergeDecorationsCollection(undefined)
|
|
}
|
|
}}
|
|
size="sm"
|
|
variant="ghost"
|
|
className="p-1 h-6"
|
|
title="Discard Changes"
|
|
>
|
|
<X className="w-4 h-4 text-red-500" />
|
|
</Button>
|
|
</>
|
|
)}
|
|
<div className="w-px bg-input"></div>
|
|
<Button
|
|
onClick={(e) => {
|
|
e.preventDefault()
|
|
e.stopPropagation()
|
|
askAboutCode(children)
|
|
}}
|
|
size="sm"
|
|
variant="ghost"
|
|
className="p-1 h-6"
|
|
>
|
|
<CornerUpLeft className="w-4 h-4" />
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
<SyntaxHighlighter
|
|
style={vscDarkPlus as any}
|
|
language={match[1]}
|
|
PreTag="div"
|
|
customStyle={{
|
|
margin: 0,
|
|
padding: "0.5rem",
|
|
fontSize: "0.875rem",
|
|
}}
|
|
>
|
|
{stringifyContent(children)}
|
|
</SyntaxHighlighter>
|
|
</div>
|
|
) : (
|
|
<code className={className} {...props}>
|
|
{children}
|
|
</code>
|
|
)
|
|
},
|
|
// Render markdown elements
|
|
p: ({ node, children, ...props }) =>
|
|
renderMarkdownElement({ node, children, ...props }),
|
|
h1: ({ node, children, ...props }) =>
|
|
renderMarkdownElement({ node, children, ...props }),
|
|
h2: ({ node, children, ...props }) =>
|
|
renderMarkdownElement({ node, children, ...props }),
|
|
h3: ({ node, children, ...props }) =>
|
|
renderMarkdownElement({ node, children, ...props }),
|
|
h4: ({ node, children, ...props }) =>
|
|
renderMarkdownElement({ node, children, ...props }),
|
|
h5: ({ node, children, ...props }) =>
|
|
renderMarkdownElement({ node, children, ...props }),
|
|
h6: ({ node, children, ...props }) =>
|
|
renderMarkdownElement({ node, children, ...props }),
|
|
ul: (props) => (
|
|
<ul className="list-disc pl-6 mb-4 space-y-2">{props.children}</ul>
|
|
),
|
|
ol: (props) => (
|
|
<ol className="list-decimal pl-6 mb-4 space-y-2">{props.children}</ol>
|
|
),
|
|
})
|