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

fix: only set keymap for the current buffer in replace_in_file (#2190)

Browse Source
This commit is contained in:
Lite Ye
2025-06-09 02:03:34 -04:00
committed by GitHub
parent 7f7fa79b0e
commit 60209c3d46
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -464,8 +464,8 @@ function M.func(opts, on_log, on_complete, session_ctx)
end end
local function register_keybinding_events() local function register_keybinding_events()
local keymap_opts = { buffer = bufnr }
vim.keymap.set({ "n", "v" }, Config.mappings.diff.ours, function() vim.keymap.set({ "n", "v" }, Config.mappings.diff.ours, function()
if vim.api.nvim_get_current_buf() ~= bufnr then return end
local diff_block, idx = get_current_diff_block() local diff_block, idx = get_current_diff_block()
if not diff_block then return end if not diff_block then return end
pcall(vim.api.nvim_buf_del_extmark, bufnr, NAMESPACE, diff_block.delete_extmark_id) pcall(vim.api.nvim_buf_del_extmark, bufnr, NAMESPACE, diff_block.delete_extmark_id)
@@ -487,10 +487,9 @@ function M.func(opts, on_log, on_complete, session_ctx)
vim.api.nvim_win_call(winnr, function() vim.cmd("normal! zz") end) vim.api.nvim_win_call(winnr, function() vim.cmd("normal! zz") end)
end end
has_rejected = true has_rejected = true
end) end, keymap_opts)
vim.keymap.set({ "n", "v" }, Config.mappings.diff.theirs, function() vim.keymap.set({ "n", "v" }, Config.mappings.diff.theirs, function()
if vim.api.nvim_get_current_buf() ~= bufnr then return end
local diff_block, idx = get_current_diff_block() local diff_block, idx = get_current_diff_block()
if not diff_block then return end if not diff_block then return end
pcall(vim.api.nvim_buf_del_extmark, bufnr, NAMESPACE, diff_block.incoming_extmark_id) pcall(vim.api.nvim_buf_del_extmark, bufnr, NAMESPACE, diff_block.incoming_extmark_id)
@@ -504,25 +503,23 @@ function M.func(opts, on_log, on_complete, session_ctx)
vim.api.nvim_win_set_cursor(winnr, { next_diff_block.new_start_line, 0 }) vim.api.nvim_win_set_cursor(winnr, { next_diff_block.new_start_line, 0 })
vim.api.nvim_win_call(winnr, function() vim.cmd("normal! zz") end) vim.api.nvim_win_call(winnr, function() vim.cmd("normal! zz") end)
end end
end) end, keymap_opts)
vim.keymap.set({ "n", "v" }, Config.mappings.diff.next, function() vim.keymap.set({ "n", "v" }, Config.mappings.diff.next, function()
if vim.api.nvim_get_current_buf() ~= bufnr then return end
local diff_block = get_next_diff_block() local diff_block = get_next_diff_block()
if not diff_block then return end if not diff_block then return end
local winnr = Utils.get_winid(bufnr) local winnr = Utils.get_winid(bufnr)
vim.api.nvim_win_set_cursor(winnr, { diff_block.new_start_line, 0 }) vim.api.nvim_win_set_cursor(winnr, { diff_block.new_start_line, 0 })
vim.api.nvim_win_call(winnr, function() vim.cmd("normal! zz") end) vim.api.nvim_win_call(winnr, function() vim.cmd("normal! zz") end)
end) end, keymap_opts)
vim.keymap.set({ "n", "v" }, Config.mappings.diff.prev, function() vim.keymap.set({ "n", "v" }, Config.mappings.diff.prev, function()
if vim.api.nvim_get_current_buf() ~= bufnr then return end
local diff_block = get_prev_diff_block() local diff_block = get_prev_diff_block()
if not diff_block then return end if not diff_block then return end
local winnr = Utils.get_winid(bufnr) local winnr = Utils.get_winid(bufnr)
vim.api.nvim_win_set_cursor(winnr, { diff_block.new_start_line, 0 }) vim.api.nvim_win_set_cursor(winnr, { diff_block.new_start_line, 0 })
vim.api.nvim_win_call(winnr, function() vim.cmd("normal! zz") end) vim.api.nvim_win_call(winnr, function() vim.cmd("normal! zz") end)
end) end, keymap_opts)
end end
local function unregister_keybinding_events() local function unregister_keybinding_events()