diff options
| author | jdrouhard <github@jmdtech.org> | 2021-01-01 16:51:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-01 23:51:47 +0100 |
| commit | 4a0a6f7bff64b03c80dd84444fc4dbddbe1065ad (patch) | |
| tree | b6aabf1907c729388e40b4669c61c92384a9674d /runtime/lua/vim/lsp/handlers.lua | |
| parent | 5eccfd2b2e5366f2bbe6aca1471a5d52e77c9fbc (diff) | |
| download | rneovim-4a0a6f7bff64b03c80dd84444fc4dbddbe1065ad.tar.gz rneovim-4a0a6f7bff64b03c80dd84444fc4dbddbe1065ad.tar.bz2 rneovim-4a0a6f7bff64b03c80dd84444fc4dbddbe1065ad.zip | |
LSP: progress callback should only update existing dict for reports (#13652)
Change the update of the client.messages.progress table to overwrite only the percentage and message properties on $report, Previously we were overwriting the table which meant client.messages.progress[token].message.title was wiped on report.
Diffstat (limited to 'runtime/lua/vim/lsp/handlers.lua')
| -rw-r--r-- | runtime/lua/vim/lsp/handlers.lua | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua index fd23a6a547..c26affc100 100644 --- a/runtime/lua/vim/lsp/handlers.lua +++ b/runtime/lua/vim/lsp/handlers.lua @@ -28,8 +28,9 @@ end -- Basically a token of type number/string local function progress_callback(_, _, params, client_id) local client = vim.lsp.get_client_by_id(client_id) + local client_name = client and client.name or string.format("id=%d", client_id) if not client then - err_message("LSP[", client_id, "] client has shut down after sending the message") + err_message("LSP[", client_name, "] client has shut down after sending the message") end local val = params.value -- unspecified yet local token = params.token -- string or number @@ -43,14 +44,11 @@ local function progress_callback(_, _, params, client_id) percentage = val.percentage, } elseif val.kind == 'report' then - client.messages.progress[token] = { - message = val.message, - percentage = val.percentage, - } + client.messages.progress[token].message = val.message; + client.messages.progress[token].percentage = val.percentage; elseif val.kind == 'end' then if client.messages.progress[token] == nil then - err_message( - 'echom "[lsp-status] Received `end` message with no corresponding `begin` from "') + err_message("LSP[", client_name, "] received `end` message with no corresponding `begin`") else client.messages.progress[token].message = val.message client.messages.progress[token].done = true @@ -70,8 +68,9 @@ M['$/progress'] = progress_callback M['window/workDoneProgress/create'] = function(_, _, params, client_id) local client = vim.lsp.get_client_by_id(client_id) local token = params.token -- string or number + local client_name = client and client.name or string.format("id=%d", client_id) if not client then - err_message("LSP[", client_id, "] client has shut down after sending the message") + err_message("LSP[", client_name, "] client has shut down after sending the message") end client.messages.progress[token] = {} return vim.NIL |