Skip to content

feat: add diff strategy selection in chat text area #525

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

Closed
monotykamary wants to merge 5 commits into from
Closed

feat: add diff strategy selection in chat text area #525

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0afe08d
feat: add diff strategy selection in chat text area
monotykamary Jan 24, 2025
cab7fdb
fix: persist extension settings when diffStrategy changes
monotykamary Jan 24, 2025
49e59c3
fix: move postMessage to the onChange handle to avoid rerender postMe…
monotykamary Jan 24, 2025
35c8e0f
refactor: simplify handle state
monotykamary Jan 24, 2025
5ced55c
fix: revert entity replacement
monotykamary Jan 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
65 changes: 63 additions & 2 deletions webview-ui/src/components/chat/ChatTextArea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,30 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
},
ref,
) => {
const { filePaths, currentApiConfigName, listApiConfigMeta, customModes } = useExtensionState()
const {
filePaths,
currentApiConfigName,
listApiConfigMeta,
customModes,
diffEnabled,
setDiffEnabled,
experimentalDiffStrategy,
setExperimentalDiffStrategy,
} = useExtensionState()
const [gitCommits, setGitCommits] = useState<any[]>([])
const [showDropdown, setShowDropdown] = useState(false)
const [diffStrategy, setDiffStrategy] = useState<string>("search-replace") // Default to 'search-replace'

// Initialize diffStrategy based on extension state
useEffect(() => {
if (!diffEnabled) {
setDiffStrategy("whole")
} else if (experimentalDiffStrategy) {
setDiffStrategy("unified-diff")
} else {
setDiffStrategy("search-replace")
}
}, [diffEnabled, experimentalDiffStrategy])

// Close dropdown when clicking outside
useEffect(() => {
Expand Down Expand Up @@ -470,7 +491,7 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(

highlightLayerRef.current.innerHTML = text
.replace(/\n$/, "\n\n")
.replace(/[<>&]/g, (c) => ({ "<": "&lt;", ">": "&gt;", "&": "&amp;" })[c] || c)
.replace(/[<>&]/g, (c) => ({ "<": "<", ">": ">", "&": "&amp;" })[c] || c)
.replace(mentionRegexGlobal, '<mark class="mention-context-textarea-highlight">$&</mark>')

highlightLayerRef.current.scrollTop = textAreaRef.current.scrollTop
Expand Down Expand Up @@ -799,6 +820,46 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
<CaretIcon />
</div>
</div>

<div
style={{
position: "relative",
display: "inline-block",
flex: "0 1 auto",
minWidth: 0,
maxWidth: "150px",
overflow: "hidden",
}}>
<select
value={diffStrategy}
disabled={textAreaDisabled}
onChange={(e) => {
const value = e.target.value
setDiffStrategy(value)
if (value === "whole") {
setDiffEnabled(false)
setExperimentalDiffStrategy(false)
} else if (value === "search-replace") {
setDiffEnabled(true)
setExperimentalDiffStrategy(false)
} else if (value === "unified-diff") {
setDiffEnabled(true)
setExperimentalDiffStrategy(true)
}
}}
style={{
...selectStyle,
width: "100%",
textOverflow: "ellipsis",
}}>
<option value="whole">whole</option>
<option value="search-replace">search-replace</option>
<option value="unified-diff">unified</option>
</select>
<div style={caretContainerStyle}>
<CaretIcon />
</div>
</div>
</div>

<div
Expand Down
Loading