aboutsummaryrefslogtreecommitdiff
path: root/runtime/lua/vim/lsp/util.lua
diff options
context:
space:
mode:
authorglepnir <glephunter@gmail.com>2024-11-23 19:11:30 +0800
committerLewis Russell <me@lewisr.dev>2024-11-24 10:47:05 +0000
commit2a1f604c77a161f076f7d520d66fc6f051b625e7 (patch)
treec8286b7e2fadf261db7d4160a8b45c6d732e0db9 /runtime/lua/vim/lsp/util.lua
parentd9b08c58c34ba6c8083f533d5f7a0fd21e262d00 (diff)
downloadrneovim-2a1f604c77a161f076f7d520d66fc6f051b625e7.tar.gz
rneovim-2a1f604c77a161f076f7d520d66fc6f051b625e7.tar.bz2
rneovim-2a1f604c77a161f076f7d520d66fc6f051b625e7.zip
fix(lsp): delete bufvar inside WinClosed event
Problem: floaing preview window can be closed by some ex commands like `only` `fclose` which will not clean the bufvar Solution: use WinClosed event with floating_winnr for clean bufnr, and add test cases for vim.lsp.util.open_floating_preview
Diffstat (limited to 'runtime/lua/vim/lsp/util.lua')
-rw-r--r--runtime/lua/vim/lsp/util.lua21
1 files changed, 16 insertions, 5 deletions
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 24837c3b44..0f608ffbd1 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1344,10 +1344,6 @@ local function close_preview_window(winnr, bufnrs)
local augroup = 'preview_window_' .. winnr
pcall(api.nvim_del_augroup_by_name, augroup)
- local buf = vim.w[winnr].buf_hold_win
- if buf and api.nvim_buf_is_valid(buf) then
- vim.b[buf].lsp_floating_window = nil
- end
pcall(api.nvim_win_close, winnr, true)
end)
end
@@ -1613,7 +1609,6 @@ function M.open_floating_preview(contents, syntax, opts)
{ silent = true, noremap = true, nowait = true }
)
close_preview_autocmd(opts.close_events, floating_winnr, { floating_bufnr, bufnr })
- vim.w[floating_winnr].buf_hold_win = bufnr
-- save focus_id
if opts.focus_id then
@@ -1622,6 +1617,22 @@ function M.open_floating_preview(contents, syntax, opts)
api.nvim_buf_set_var(bufnr, 'lsp_floating_preview', floating_winnr)
end
+ local augroup_name = ('closing_floating_preview_%d'):format(floating_winnr)
+ local ok =
+ pcall(api.nvim_get_autocmds, { group = augroup_name, pattern = tostring(floating_winnr) })
+ if not ok then
+ api.nvim_create_autocmd('WinClosed', {
+ group = api.nvim_create_augroup(augroup_name, {}),
+ pattern = tostring(floating_winnr),
+ callback = function()
+ if api.nvim_buf_is_valid(bufnr) then
+ vim.b[bufnr].lsp_floating_preview = nil
+ end
+ api.nvim_del_augroup_by_name(augroup_name)
+ end,
+ })
+ end
+
if do_stylize then
vim.wo[floating_winnr].conceallevel = 2
end