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

fix(diff): use buffer from event for callback (#343)

Browse Source 
Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
This commit is contained in:
Aaron Pham 2024-08-28 19:54:46 -04:00 committed by GitHub
parent bb5411cd9a
commit 1e9c14db06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lua/avante/diff.lua
View File

@ -507,28 +507,26 @@ function M.setup()
api.nvim_create_autocmd("User", { api.nvim_create_autocmd("User", {
group = augroup, group = augroup,
pattern = "AvanteConflictDetected", pattern = "AvanteConflictDetected",
callback = function() callback = function(ev)
local bufnr = api.nvim_get_current_buf() vim.diagnostic.enable(false, { bufnr = ev.buf })
vim.diagnostic.enable(false, { bufnr = bufnr })
if is_inlay_enable then if is_inlay_enable then
previous_inlay = vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr }) previous_inlay = vim.lsp.inlay_hint.is_enabled({ bufnr = ev.buf })
vim.lsp.inlay_hint.enable(false, { bufnr = bufnr }) vim.lsp.inlay_hint.enable(false, { bufnr = ev.buf })
end end
setup_buffer_mappings(bufnr) setup_buffer_mappings(ev.buf)
end, end,
}) })
api.nvim_create_autocmd("User", { api.nvim_create_autocmd("User", {
group = AUGROUP_NAME, group = AUGROUP_NAME,
pattern = "AvanteConflictResolved", pattern = "AvanteConflictResolved",
callback = function() callback = function(ev)
local bufnr = api.nvim_get_current_buf() vim.diagnostic.enable(true, { bufnr = ev.buf })
vim.diagnostic.enable(true, { bufnr = bufnr })
if is_inlay_enable then if is_inlay_enable then
vim.lsp.inlay_hint.enable(previous_inlay, { bufnr = bufnr }) vim.lsp.inlay_hint.enable(previous_inlay, { bufnr = ev.buf })
previous_inlay = nil previous_inlay = nil
end end
clear_buffer_mappings(bufnr) clear_buffer_mappings(ev.buf)
end, end,
}) })