aboutsummaryrefslogtreecommitdiff
path: root/runtime/lua/vim
diff options
context:
space:
mode:
authorMathias Fußenegger <mfussenegger@users.noreply.github.com>2021-07-31 22:26:02 +0200
committerGitHub <noreply@github.com>2021-07-31 22:26:02 +0200
commit24f2b9ef1cee4945736dc339b18c1eba1ef0d5ed (patch)
tree18b82982aa97b001ac511a8331d3f705c6ad3010 /runtime/lua/vim
parent5f01714b255d1c037abcb836b835096cf817adfd (diff)
downloadrneovim-24f2b9ef1cee4945736dc339b18c1eba1ef0d5ed.tar.gz
rneovim-24f2b9ef1cee4945736dc339b18c1eba1ef0d5ed.tar.bz2
rneovim-24f2b9ef1cee4945736dc339b18c1eba1ef0d5ed.zip
fix(lsp): Include client name in handler error messages (#15227)
Makes it easier to tell with language server caused an error.
Diffstat (limited to 'runtime/lua/vim')
-rw-r--r--runtime/lua/vim/lsp/handlers.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index a77c88e2dc..b7f1ea0ab6 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -457,12 +457,14 @@ for k, fn in pairs(M) do
})
if err then
+ local client = vim.lsp.get_client_by_id(client_id)
+ local client_name = client and client.name or string.format("client_id=%d", client_id)
-- LSP spec:
-- interface ResponseError:
-- code: integer;
-- message: string;
-- data?: string | number | boolean | array | object | null;
- return err_message(tostring(err.code) .. ': ' .. err.message)
+ return err_message(client_name .. ': ' .. tostring(err.code) .. ': ' .. err.message)
end
return fn(err, method, params, client_id, bufnr, config)