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

feat: minimal diff for claude text edit tool mode (#1636)

Browse Source
This commit is contained in:
yetone
2025-03-19 03:34:24 +08:00
committed by GitHub
parent 0786499712
commit abca1a4ea3
1 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lua/avante/llm_tools.lua
View File

@@ -239,20 +239,41 @@ function M.str_replace_editor(opts, on_log, on_complete)
on_complete(false, "Failed to find the old string: " .. opts.old_str) on_complete(false, "Failed to find the old string: " .. opts.old_str)
return return
end end
local patched_new_lines = { "<<<<<<< HEAD" } ---@diagnostic disable-next-line: assign-type-mismatch, missing-fields
vim.list_extend(patched_new_lines, old_lines) local patch = vim.diff(opts.old_str, opts.new_str, { ---@type integer[][]
table.insert(patched_new_lines, "=======") algorithm = "histogram",
vim.list_extend(patched_new_lines, new_lines) result_type = "indices",
local patch_end_line = ">>>>>>> new " ctxlen = vim.o.scrolloff,
})
local patch_start_line_content = "<<<<<<< HEAD"
local patch_end_line_content = ">>>>>>> new "
--- add random characters to the end of the line to avoid conflicts --- add random characters to the end of the line to avoid conflicts
patch_end_line = patch_end_line .. Utils.random_string(10) patch_end_line_content = patch_end_line_content .. Utils.random_string(10)
table.insert(patched_new_lines, patch_end_line) local current_start_a = 1
local patched_new_lines = {}
for _, hunk in ipairs(patch) do
local start_a, count_a, start_b, count_b = unpack(hunk)
if current_start_a < start_a then
vim.list_extend(patched_new_lines, vim.list_slice(old_lines, current_start_a, start_a - 1))
end
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))
table.insert(patched_new_lines, "=======")
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)
current_start_a = start_a + count_a
end
if current_start_a <= #old_lines then
vim.list_extend(patched_new_lines, vim.list_slice(old_lines, current_start_a, #old_lines))
end
vim.api.nvim_buf_set_lines(bufnr, start_line - 1, end_line, false, patched_new_lines) vim.api.nvim_buf_set_lines(bufnr, start_line - 1, end_line, false, patched_new_lines)
local current_winid = vim.api.nvim_get_current_win() local current_winid = vim.api.nvim_get_current_win()
vim.api.nvim_set_current_win(sidebar.code.winid) vim.api.nvim_set_current_win(sidebar.code.winid)
Diff.add_visited_buffer(bufnr) Diff.add_visited_buffer(bufnr)
Diff.process(bufnr) Diff.process(bufnr)
vim.api.nvim_win_set_cursor(sidebar.code.winid, { math.max(start_line, 1), 0 }) if #patch > 0 then
vim.api.nvim_win_set_cursor(sidebar.code.winid, { math.max(patch[1][1] + start_line - 1, 1), 0 })
end
vim.cmd("normal! zz") vim.cmd("normal! zz")
vim.api.nvim_set_current_win(current_winid) vim.api.nvim_set_current_win(current_winid)
local augroup = vim.api.nvim_create_augroup("avante_str_replace_editor", { clear = true }) local augroup = vim.api.nvim_create_augroup("avante_str_replace_editor", { clear = true })
@@ -276,7 +297,7 @@ function M.str_replace_editor(opts, on_log, on_complete)
callback = function() callback = function()
local current_lines = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false) local current_lines = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
local current_lines_content = table.concat(current_lines, "\n") local current_lines_content = table.concat(current_lines, "\n")
if current_lines_content:find(patch_end_line) then return end if current_lines_content:find(patch_end_line_content) then return end
vim.api.nvim_del_augroup_by_id(augroup) vim.api.nvim_del_augroup_by_id(augroup)
if popup then popup:unmount() end if popup then popup:unmount() end
if lines_content == current_lines_content then if lines_content == current_lines_content then