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

lsp: Handle ContentModified the same way as RequestCancelled (#12803)

Browse Source 
* Added the ContentModified error to be hidden from users, like RequestCancelled
* Fixed tests (and ill-formed lua code)
* Simplified if-expression
This commit is contained in:
Rasmus Ishøy Michelsen
2020-09-22 21:54:34 +02:00
committed by GitHub
parent 78539dda95
commit 4f8d98e583
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -494,10 +494,13 @@ local function start(cmd, cmd_args, handlers, extra_spawn_params)
decoded.error = convert_NIL(decoded.error)
decoded.result = convert_NIL(decoded.result)
-- Do not surface RequestCancelled to users, it is RPC-internal.
if decoded.error
and decoded.error.code == protocol.ErrorCodes.RequestCancelled then
-- Do not surface RequestCancelled or ContentModified to users, it is RPC-internal.
if decoded.error then
if decoded.error.code == protocol.ErrorCodes.RequestCancelled then
local _ = log.debug() and log.debug("Received cancellation ack", decoded)
elseif decoded.error.code == protocol.ErrorCodes.ContentModified then
local _ = log.debug() and log.debug("Received content modified ack", decoded)
end
local result_id = tonumber(decoded.id)
-- Clear any callback since this is cancelled now.
-- This is safe to do assuming that these conditions hold: