CarGDev/avante.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: more robust diff blocks parser (#1994)

Browse Source
This commit is contained in:
yetone
2025-05-06 20:10:51 +08:00
committed by GitHub
parent 4cb4f34fed
commit 65c9fcd54f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lua/avante/llm_tools/replace_in_file.lua
View File

@@ -89,15 +89,15 @@ function M.func(opts, on_log, on_complete, session_ctx)
local rough_diff_blocks = {} local rough_diff_blocks = {}
for _, line in ipairs(diff_lines) do for _, line in ipairs(diff_lines) do
if line:match("^%s*<<<<<<< SEARCH") then if line:match("^%s*<<<<<<<* SEARCH") then
is_searching = true is_searching = true
is_replacing = false is_replacing = false
current_search = {} current_search = {}
elseif line:match("^%s*=======") and is_searching then elseif line:match("^%s*=======*") and is_searching then
is_searching = false is_searching = false
is_replacing = true is_replacing = true
current_replace = {} current_replace = {}
elseif line:match("^%s*>>>>>>> REPLACE") and is_replacing then elseif line:match("^%s*>>>>>>>* REPLACE") and is_replacing then
is_replacing = false is_replacing = false
table.insert( table.insert(
rough_diff_blocks, rough_diff_blocks,
@@ -110,7 +110,10 @@ function M.func(opts, on_log, on_complete, session_ctx)
end end
end end
if #rough_diff_blocks == 0 then return false, "No diff blocks found" end if #rough_diff_blocks == 0 then
Utils.debug("diff", opts.diff)
return false, "No diff blocks found"
end
local bufnr, err = Helpers.get_bufnr(abs_path) local bufnr, err = Helpers.get_bufnr(abs_path)
if err then return false, err end if err then return false, err end