diff options
Diffstat (limited to 'runtime/lua/vim/lsp')
| -rw-r--r-- | runtime/lua/vim/lsp/rpc.lua | 2 | ||||
| -rw-r--r-- | runtime/lua/vim/lsp/util.lua | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/runtime/lua/vim/lsp/rpc.lua b/runtime/lua/vim/lsp/rpc.lua index 1aa8326514..0cabd1a0d4 100644 --- a/runtime/lua/vim/lsp/rpc.lua +++ b/runtime/lua/vim/lsp/rpc.lua @@ -518,7 +518,7 @@ local function start(cmd, cmd_args, dispatchers, extra_spawn_params) send_response(decoded.id, err, result) end) -- This works because we are expecting vim.NIL here - elseif decoded.id and (decoded.result or decoded.error) then + elseif decoded.id and (decoded.result ~= vim.NIL or decoded.error ~= vim.NIL) then -- Server Result decoded.error = convert_NIL(decoded.error) decoded.result = convert_NIL(decoded.result) diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua index 92ec447b55..ce8468aa8a 100644 --- a/runtime/lua/vim/lsp/util.lua +++ b/runtime/lua/vim/lsp/util.lua @@ -944,6 +944,9 @@ function M.jump_to_location(location) local from = {from_bufnr, vim.fn.line('.'), vim.fn.col('.'), 0} local item = {tagname=vim.fn.expand('<cword>'), from=from} + -- Save position in jumplist + vim.cmd("mark '") + --- Jump to new location (adjusting for UTF-16 encoding of characters) local bufnr = vim.uri_to_bufnr(uri) api.nvim_set_current_buf(bufnr) |