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

fix: clear hints (#2265)

Browse Source
This commit is contained in:
yetone
2025-06-19 15:09:58 +08:00
committed by GitHub
parent af2eaf797c
commit 5f0c2f1252
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -472,6 +472,9 @@ function M.func(opts, on_log, on_complete, session_ctx)
local function register_keybinding_events() local function register_keybinding_events()
local keymap_opts = { buffer = bufnr } 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 show_keybinding_hint_extmark_id then
vim.api.nvim_buf_del_extmark(bufnr, KEYBINDING_NAMESPACE, show_keybinding_hint_extmark_id)
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)
@@ -496,6 +499,9 @@ function M.func(opts, on_log, on_complete, session_ctx)
end, keymap_opts) end, keymap_opts)
vim.keymap.set({ "n", "v" }, Config.mappings.diff.theirs, function() vim.keymap.set({ "n", "v" }, Config.mappings.diff.theirs, function()
if show_keybinding_hint_extmark_id then
vim.api.nvim_buf_del_extmark(bufnr, KEYBINDING_NAMESPACE, show_keybinding_hint_extmark_id)
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)
@@ -512,6 +518,9 @@ function M.func(opts, on_log, on_complete, session_ctx)
end, keymap_opts) end, keymap_opts)
vim.keymap.set({ "n", "v" }, Config.mappings.diff.next, function() vim.keymap.set({ "n", "v" }, Config.mappings.diff.next, function()
if show_keybinding_hint_extmark_id then
vim.api.nvim_buf_del_extmark(bufnr, KEYBINDING_NAMESPACE, show_keybinding_hint_extmark_id)
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)
@@ -520,6 +529,9 @@ function M.func(opts, on_log, on_complete, session_ctx)
end, keymap_opts) end, keymap_opts)
vim.keymap.set({ "n", "v" }, Config.mappings.diff.prev, function() vim.keymap.set({ "n", "v" }, Config.mappings.diff.prev, function()
if show_keybinding_hint_extmark_id then
vim.api.nvim_buf_del_extmark(bufnr, KEYBINDING_NAMESPACE, show_keybinding_hint_extmark_id)
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)