mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-08 15:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes.

Browse Source 
- Return after an error in RPC.
- Use an empty vim table for serialization.
This commit is contained in:
Ashkan Kiani
2019-11-20 11:36:50 -08:00
parent 3ae9b3781e
commit 0904ffe387
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/lua/vim/lsp.lua
View File

@@ -400,7 +400,7 @@ function lsp.start_client(config)
rpc.request('initialize', initialize_params, function(init_err, result) rpc.request('initialize', initialize_params, function(init_err, result)
assert(not init_err, tostring(init_err)) assert(not init_err, tostring(init_err))
assert(result, "server sent empty result") assert(result, "server sent empty result")
rpc.notify('initialized', {}) rpc.notify('initialized', {[vim.type_idx]=vim.types.dictionary})
client.initialized = true client.initialized = true
uninitialized_clients[client_id] = nil uninitialized_clients[client_id] = nil
client.server_capabilities = assert(result.capabilities, "initialize result doesn't contain capabilities") client.server_capabilities = assert(result.capabilities, "initialize result doesn't contain capabilities")

1
runtime/lua/vim/lsp/rpc.lua
View File

@@ -340,6 +340,7 @@ local function create_and_start_client(cmd, cmd_args, handlers, extra_spawn_para
local decoded, err = json_decode(body) local decoded, err = json_decode(body)
if not decoded then if not decoded then
on_error(client_errors.INVALID_SERVER_JSON, err) on_error(client_errors.INVALID_SERVER_JSON, err)
return
end end
local _ = log.debug() and log.debug("decoded", decoded) local _ = log.debug() and log.debug("decoded", decoded)