From 24b0bfadea4ef4cb02581e3bf8b4d5d935ca9a25 Mon Sep 17 00:00:00 2001 From: yetone Date: Thu, 29 Aug 2024 19:46:51 +0800 Subject: [PATCH] fix: compatible with the situation of disabling lsp inlay_hint delay (#360) --- lua/avante/diff.lua | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lua/avante/diff.lua b/lua/avante/diff.lua index dfd5347..d8fbdc4 100644 --- a/lua/avante/diff.lua +++ b/lua/avante/diff.lua @@ -509,16 +509,15 @@ function M.setup() 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 + local previous_inlay_enabled = nil api.nvim_create_autocmd("User", { group = augroup, pattern = "AvanteConflictDetected", callback = function(ev) vim.diagnostic.enable(false, { bufnr = ev.buf }) - if is_inlay_enable then - previous_inlay = vim.lsp.inlay_hint.is_enabled({ bufnr = ev.buf }) + if vim.lsp.inlay_hint then + previous_inlay_enabled = vim.lsp.inlay_hint.is_enabled({ bufnr = ev.buf }) vim.lsp.inlay_hint.enable(false, { bufnr = ev.buf }) end setup_buffer_mappings(ev.buf) @@ -530,9 +529,9 @@ function M.setup() pattern = "AvanteConflictResolved", callback = function(ev) vim.diagnostic.enable(true, { bufnr = ev.buf }) - if is_inlay_enable then - vim.lsp.inlay_hint.enable(previous_inlay, { bufnr = ev.buf }) - previous_inlay = nil + if vim.lsp.inlay_hint and previous_inlay_enabled ~= nil then + vim.lsp.inlay_hint.enable(previous_inlay_enabled, { bufnr = ev.buf }) + previous_inlay_enabled = nil end clear_buffer_mappings(ev.buf) end,