mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(lsp): remove json encode/decode wrappers (#15826)

Browse Source
This commit is contained in:
Mathias Fußenegger
2021-09-28 18:13:44 +02:00
committed by GitHub
parent 9ca7b6b71a
commit ff18a8bcc4
1 changed files with 6 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,34 +4,6 @@ local log = require('vim.lsp.log')
local protocol = require('vim.lsp.protocol') local protocol = require('vim.lsp.protocol')
local validate, schedule, schedule_wrap = vim.validate, vim.schedule, vim.schedule_wrap local validate, schedule, schedule_wrap = vim.validate, vim.schedule, vim.schedule_wrap
-- TODO replace with a better implementation.
---@private
--- Encodes to JSON.
---
---@param data (table) Data to encode
---@returns (string) Encoded object
local function json_encode(data)
local status, result = pcall(vim.json.encode, data)
if status then
return result
else
return nil, result
end
end
---@private
--- Decodes from JSON.
---
---@param data (string) Data to decode
---@returns (table) Decoded JSON object
local function json_decode(data)
local status, result = pcall(vim.json.decode, data)
if status then
return result
else
return nil, result
end
end
---@private ---@private
--- Checks whether a given path exists and is a directory. --- Checks whether a given path exists and is a directory.
---@param filename (string) path to check ---@param filename (string) path to check
@@ -389,12 +361,12 @@ local function start(cmd, cmd_args, dispatchers, extra_spawn_params)
--- Encodes {payload} into a JSON-RPC message and sends it to the remote --- Encodes {payload} into a JSON-RPC message and sends it to the remote
--- process. --- process.
--- ---
---@param payload (table) Converted into a JSON string, see |json_encode()| ---@param payload table
---@returns true if the payload could be scheduled, false if the main event-loop is in the process of closing. ---@returns true if the payload could be scheduled, false if the main event-loop is in the process of closing.
local function encode_and_send(payload) local function encode_and_send(payload)
local _ = log.debug() and log.debug("rpc.send", payload) local _ = log.debug() and log.debug("rpc.send", payload)
if handle == nil or handle:is_closing() then return false end if handle == nil or handle:is_closing() then return false end
local encoded = assert(json_encode(payload)) local encoded = vim.json.encode(payload)
stdin:write(format_message_with_content_length(encoded)) stdin:write(format_message_with_content_length(encoded))
return true return true
end end
@@ -485,14 +457,15 @@ local function start(cmd, cmd_args, dispatchers, extra_spawn_params)
---@private ---@private
local function handle_body(body) local function handle_body(body)
local decoded, err = json_decode(body) local ok, decoded = pcall(vim.json.decode, body)
if not decoded then if not ok then
-- on_error(client_errors.INVALID_SERVER_JSON, err) on_error(client_errors.INVALID_SERVER_JSON, decoded)
return return
end end
local _ = log.debug() and log.debug("rpc.receive", decoded) local _ = log.debug() and log.debug("rpc.receive", decoded)
if type(decoded.method) == 'string' and decoded.id then if type(decoded.method) == 'string' and decoded.id then
local err
-- Server Request -- Server Request
decoded.params = convert_NIL(decoded.params) decoded.params = convert_NIL(decoded.params)
-- Schedule here so that the users functions don't trigger an error and -- Schedule here so that the users functions don't trigger an error and