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

fix(inlay): make sure to check for previous options (fixes #334) (#340)

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

11
lua/avante/diff.lua
View File

@ -501,13 +501,17 @@ function M.setup()
local augroup = api.nvim_create_augroup(AUGROUP_NAME, { clear = true }) local augroup = api.nvim_create_augroup(AUGROUP_NAME, { clear = true })
local is_inlay_enable = vim.lsp.inlay_hint and vim.lsp.inlay_hint.is_enabled() or false
local previous_inlay = nil
api.nvim_create_autocmd("User", { api.nvim_create_autocmd("User", {
group = augroup, group = augroup,
pattern = "AvanteConflictDetected", pattern = "AvanteConflictDetected",
callback = function() callback = function()
local bufnr = api.nvim_get_current_buf() local bufnr = api.nvim_get_current_buf()
vim.diagnostic.enable(false, { bufnr = bufnr }) vim.diagnostic.enable(false, { bufnr = bufnr })
if vim.lsp.inlay_hint then if is_inlay_enable then
previous_inlay = vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr })
vim.lsp.inlay_hint.enable(false, { bufnr = bufnr }) vim.lsp.inlay_hint.enable(false, { bufnr = bufnr })
end end
setup_buffer_mappings(bufnr) setup_buffer_mappings(bufnr)
@ -520,8 +524,9 @@ function M.setup()
callback = function() callback = function()
local bufnr = api.nvim_get_current_buf() local bufnr = api.nvim_get_current_buf()
vim.diagnostic.enable(true, { bufnr = bufnr }) vim.diagnostic.enable(true, { bufnr = bufnr })
if vim.lsp.inlay_hint then if is_inlay_enable then
vim.lsp.inlay_hint.enable(true, { bufnr = bufnr }) vim.lsp.inlay_hint.enable(previous_inlay, { bufnr = bufnr })
previous_inlay = nil
end end
clear_buffer_mappings(bufnr) clear_buffer_mappings(bufnr)
end, end,