scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-09-07 08:26:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix partial line updates in diff edits

Browse source
This commit is contained in:
Saoud Rizwan 2024-12-28 12:04:37 -08:00
parent c0cea6d591
commit f4b0887f60
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/core/assistant-message/diff.ts
View file

@ -251,6 +251,13 @@ export async function constructNewFileContent(
inSearch = false
inReplace = true
// Remove trailing linebreak for adding the === marker
if (currentSearchContent.endsWith("\r\n")) {
currentSearchContent = currentSearchContent.slice(0, -2)
} else if (currentSearchContent.endsWith("\n")) {
currentSearchContent = currentSearchContent.slice(0, -1)
}
if (!currentSearchContent) {
// Empty search block
if (originalContent.length === 0) {
@ -311,6 +318,14 @@ export async function constructNewFileContent(
if (line === ">>>>>>> REPLACE") {
// Finished one replace block
// Remove the artificially added linebreak in the last line of the REPLACE block
if (result.endsWith("\r\n")) {
result = result.slice(0, -2)
} else if (result.endsWith("\n")) {
result = result.slice(0, -1)
}
// Advance lastProcessedIndex to after the matched section
lastProcessedIndex = searchEndIndex
@ -325,6 +340,8 @@ export async function constructNewFileContent(
}
// Accumulate content for search or replace
// (currentReplaceContent is not being used for anything right now since we directly append to result.)
// (We artificially add a linebreak since we split on \n at the beginning. In order to not include a trailing linebreak in the final search/result blocks we need to remove it before using them. This allows for partial line matches to be correctly identified.)
if (inSearch) {
currentSearchContent += line + "\n"
} else if (inReplace) {