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

fix: swap diff incoming and deleting (#2273)

Browse Source
This commit is contained in:
yetone
2025-06-20 14:26:02 +08:00
committed by GitHub
parent 25be666377
commit babb114bc4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -589,13 +589,13 @@ function M.func(opts, on_log, on_complete, session_ctx)
return { { line_, Highlights.TO_BE_DELETED_WITHOUT_STRIKETHROUGH } } return { { line_, Highlights.TO_BE_DELETED_WITHOUT_STRIKETHROUGH } }
end) end)
:totable() :totable()
local extmark_line = math.max(0, start_line - 2) -- local extmark_line = math.max(0, start_line - 2)
local delete_extmark_id = vim.api.nvim_buf_set_extmark(bufnr, NAMESPACE, extmark_line, 0, { local end_row = start_line + #diff_block.new_lines - 1
local delete_extmark_id = vim.api.nvim_buf_set_extmark(bufnr, NAMESPACE, end_row - 1, 0, {
virt_lines = deleted_virt_lines, virt_lines = deleted_virt_lines,
hl_eol = true, hl_eol = true,
hl_mode = "combine", hl_mode = "combine",
}) })
local end_row = start_line + #diff_block.new_lines - 1
local incoming_extmark_id = vim.api.nvim_buf_set_extmark(bufnr, NAMESPACE, start_line - 1, 0, { local incoming_extmark_id = vim.api.nvim_buf_set_extmark(bufnr, NAMESPACE, start_line - 1, 0, {
hl_group = Highlights.INCOMING, hl_group = Highlights.INCOMING,
hl_eol = true, hl_eol = true,