mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-04 01:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): unify progress message handling (#18040)

Browse Source 
The LSP progress handler would put non-progress messages (such as from
clangd or pyls; not part of the LSP spec) directly into
`client.messages`, while `vim.lsp.util.get_progress_messages()` would
try to fetch them from `client.messages.messages` instead (and come up
empty everytime). This would result in these messages never being
cleaned up by `get_progress_messages()`.

This commit fixes that by treating those messages like show-once
progress messages (by setting `done=true` immediately).
This commit is contained in:
runiq
2022-04-20 18:40:52 +02:00
committed by GitHub
parent 6b0d3ae6a8
commit 7e7fdca163
2 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/lua/vim/lsp/handlers.lua
View File

@@ -33,7 +33,7 @@ local function progress_handler(_, result, ctx, _)
local val = result.value -- unspecified yet local val = result.value -- unspecified yet
local token = result.token -- string or number local token = result.token -- string or number
if type(val) ~= 'table' then val = { content=val } end
if val.kind then if val.kind then
if val.kind == 'begin' then if val.kind == 'begin' then
client.messages.progress[token] = { client.messages.progress[token] = {
@@ -53,7 +53,8 @@ local function progress_handler(_, result, ctx, _)
end end
end end
else else
table.insert(client.messages, {content = val, show_once = true, shown = 0}) client.messages.progress[token] = val
client.messages.progress[token].done = true
end end
vim.api.nvim_command("doautocmd <nomodeline> User LspProgressUpdate") vim.api.nvim_command("doautocmd <nomodeline> User LspProgressUpdate")

24
runtime/lua/vim/lsp/util.lua
View File

@@ -302,7 +302,6 @@ end
function M.get_progress_messages() function M.get_progress_messages()
local new_messages = {} local new_messages = {}
local msg_remove = {}
local progress_remove = {} local progress_remove = {}
for _, client in ipairs(vim.lsp.get_active_clients()) do for _, client in ipairs(vim.lsp.get_active_clients()) do
@@ -325,29 +324,6 @@ function M.get_progress_messages()
end end
end end
for i, msg in ipairs(data.messages) do
if msg.show_once then
msg.shown = msg.shown + 1
if msg.shown > 1 then
table.insert(msg_remove, {client = client, idx = i})
end
end
table.insert(new_messages, {name = data.name, content = msg.content})
end
if next(data.status) ~= nil then
table.insert(new_messages, {
name = data.name,
content = data.status.content,
uri = data.status.uri,
status = true
})
end
for _, item in ipairs(msg_remove) do
table.remove(client.messages, item.idx)
end
end end
for _, item in ipairs(progress_remove) do for _, item in ipairs(progress_remove) do