leigh/telescope.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(lsp): Handle new signature for lsp handlers

Browse Source
This commit is contained in:
TJ DeVries
2021-09-05 21:07:37 -04:00
parent 5fc94cdd78
commit 162cf7b534
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lua/telescope/builtin/lsp.lua
View File

@@ -307,7 +307,6 @@ lsp.workspace_symbols = function(opts)
}):find() }):find()
end end
-- TODO(MERGE)
local function get_workspace_symbols_requester(bufnr) local function get_workspace_symbols_requester(bufnr)
local cancel = function() end local cancel = function() end
@@ -316,7 +315,14 @@ local function get_workspace_symbols_requester(bufnr)
cancel() cancel()
_, cancel = vim.lsp.buf_request(bufnr, "workspace/symbol", { query = prompt }, tx) _, cancel = vim.lsp.buf_request(bufnr, "workspace/symbol", { query = prompt }, tx)
local err, _, results_lsp = rx() -- Handle 0.5 / 0.5.1 handler situation
local err, res_1, res_2 = rx()
local results_lsp
if type(res_1) == "table" then
results_lsp = res_1
else
results_lsp = res_2
end
assert(not err, err) assert(not err, err)
local locations = vim.lsp.util.symbols_to_items(results_lsp or {}, bufnr) or {} local locations = vim.lsp.util.symbols_to_items(results_lsp or {}, bufnr) or {}