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

fix: special handling wehn vim diff count_a is 0 (#1691)

Browse Source
This commit is contained in:
yetone
2025-03-24 15:21:00 +08:00
committed by GitHub
parent 49ae3c84fd
commit 94fc0bd76c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lua/avante/llm_tools/init.lua
View File

@@ -99,14 +99,20 @@ function M.str_replace_editor(opts, on_log, on_complete)
for _, hunk in ipairs(patch) do for _, hunk in ipairs(patch) do
local start_a, count_a, start_b, count_b = unpack(hunk) local start_a, count_a, start_b, count_b = unpack(hunk)
if current_start_a < start_a then if current_start_a < start_a then
vim.list_extend(patched_new_lines, vim.list_slice(old_lines, current_start_a, start_a - 1)) if count_a > 0 then
vim.list_extend(patched_new_lines, vim.list_slice(old_lines, current_start_a, start_a - 1))
else
vim.list_extend(patched_new_lines, vim.list_slice(old_lines, current_start_a, start_a))
end
end end
table.insert(patched_new_lines, patch_start_line_content) table.insert(patched_new_lines, patch_start_line_content)
vim.list_extend(patched_new_lines, vim.list_slice(old_lines, start_a, start_a + count_a - 1)) if count_a > 0 then
vim.list_extend(patched_new_lines, vim.list_slice(old_lines, start_a, start_a + count_a - 1))
end
table.insert(patched_new_lines, "=======") table.insert(patched_new_lines, "=======")
vim.list_extend(patched_new_lines, vim.list_slice(new_lines, start_b, start_b + count_b - 1)) vim.list_extend(patched_new_lines, vim.list_slice(new_lines, start_b, start_b + count_b - 1))
table.insert(patched_new_lines, patch_end_line_content) table.insert(patched_new_lines, patch_end_line_content)
current_start_a = start_a + count_a current_start_a = start_a + math.max(count_a, 1)
end end
if current_start_a <= #old_lines then if current_start_a <= #old_lines then
vim.list_extend(patched_new_lines, vim.list_slice(old_lines, current_start_a, #old_lines)) vim.list_extend(patched_new_lines, vim.list_slice(old_lines, current_start_a, #old_lines))