From c4c592e0ad159fe8d66b81996cbcb04e482a51ad Mon Sep 17 00:00:00 2001 From: Ryo Kitagawa Date: Wed, 3 Mar 2021 15:36:59 +0900 Subject: Fix denols definition in deno v1.7.5 --- lua/lspconfig/denols.lua | 59 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 12 deletions(-) (limited to 'lua') diff --git a/lua/lspconfig/denols.lua b/lua/lspconfig/denols.lua index 9f07ed83..2798ff1e 100644 --- a/lua/lspconfig/denols.lua +++ b/lua/lspconfig/denols.lua @@ -4,6 +4,26 @@ local lsp = vim.lsp local server_name = "denols" +local function deno_uri_to_uri(uri) + -- 1.7.4 LS returns deno:///https/deno.land/std@0.85.0/http/server.ts + -- 1.7.5 LS returns deno:/https/deno.land/std%400.85.0/http/server.ts + -- nvim-lsp only handles deno:// + if string.sub(uri, 1, 6) == "deno:/" and string.sub(uri, 7, 7) ~= "/" then + return string.gsub(uri, "^deno:/", "deno://", 1) + end + return uri +end + +local function uri_to_deno_uri(uri) + -- 1.7.4 LS use deno:/// and nvim-lsp use deno:/// as buffer_uri, too. + -- 1.7.5 LS use deno:/ and nvim-lsp use deno:// as buffer_uri. + -- When buffer_uri is deno://, change uri to deno:/. + if string.sub(uri, 1, 7) == "deno://" and string.sub(uri, 8, 8) ~= "/" then + return string.gsub(uri, "^deno://", "deno:/", 1) + end + return uri +end + local function buf_cache(bufnr) local params = {} params["referrer"] = { uri = vim.uri_from_bufnr(bufnr) } @@ -18,7 +38,7 @@ local function virtual_text_document_handler(uri, result) for client_id, res in pairs(result) do local lines = vim.split(res.result, "\n") - local bufnr = vim.uri_to_bufnr(uri) + local bufnr = vim.uri_to_bufnr(deno_uri_to_uri(uri)) local current_buf = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false) if #current_buf ~= 0 then return nil end @@ -26,6 +46,7 @@ local function virtual_text_document_handler(uri, result) vim.api.nvim_buf_set_lines(bufnr, 0, -1, nil, lines) vim.api.nvim_buf_set_option(bufnr, "readonly", true) vim.api.nvim_buf_set_option(bufnr, "modified", false) + vim.api.nvim_buf_set_option(bufnr, "modifiable", false) lsp.buf_attach_client(bufnr, client_id) end end @@ -40,6 +61,25 @@ local function virtual_text_document(uri) virtual_text_document_handler(uri, result) end +local function definition_handler(err, method, result) + if not result or vim.tbl_isempty(result) then return nil end + + for _, res in pairs(result) do + if string.sub(res.targetUri, 1, 6) == "deno:/" then + virtual_text_document(res.targetUri) + res.targetUri = deno_uri_to_uri(res.targetUri) + end + end + + lsp.handlers["textDocument/definition"](err, method, result) +end + +local function denols_definition() + local params = lsp.util.make_position_params() + params.textDocument.uri = uri_to_deno_uri(params.textDocument.uri) + lsp.buf_request(0, "textDocument/definition", params) +end + configs[server_name] = { default_config = { cmd = {"deno", "lsp"}; @@ -51,20 +91,14 @@ configs[server_name] = { unstable = false; }; handlers = { - ["textDocument/definition"] = function(err, method, result) - if not result or vim.tbl_isempty(result) then return nil end - - for _, res in pairs(result) do - if string.sub(res.targetUri, 1, 7) == "deno://" then - virtual_text_document(res.targetUri) - end - end - - lsp.handlers["textDocument/definition"](err, method, result) - end; + ["textDocument/definition"] = definition_handler; }; }; commands = { + DenolsDefinition = { + denols_definition; + description = "Jump to definition. This handle deno:/ schema in deno:// buffer." + }; DenolsCache = { function() buf_cache(0) @@ -84,6 +118,7 @@ Deno's built-in language server }; } +configs.denols.definition = denols_definition configs.denols.buf_cache = buf_cache configs.denols.virtual_text_document = virtual_text_document -- vim:et ts=2 sw=2 -- cgit v1.2.3-70-g09d2 From 8caa5fe3122cabaf2f1b32833e601b64f28d6784 Mon Sep 17 00:00:00 2001 From: Ryo Kitagawa Date: Sun, 7 Mar 2021 09:45:56 +0900 Subject: Fix denols references --- lua/lspconfig/denols.lua | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) (limited to 'lua') diff --git a/lua/lspconfig/denols.lua b/lua/lspconfig/denols.lua index 2798ff1e..df8214b6 100644 --- a/lua/lspconfig/denols.lua +++ b/lua/lspconfig/denols.lua @@ -5,8 +5,7 @@ local lsp = vim.lsp local server_name = "denols" local function deno_uri_to_uri(uri) - -- 1.7.4 LS returns deno:///https/deno.land/std@0.85.0/http/server.ts - -- 1.7.5 LS returns deno:/https/deno.land/std%400.85.0/http/server.ts + -- denols returns deno:/https/deno.land/std%400.85.0/http/server.ts -- nvim-lsp only handles deno:// if string.sub(uri, 1, 6) == "deno:/" and string.sub(uri, 7, 7) ~= "/" then return string.gsub(uri, "^deno:/", "deno://", 1) @@ -15,8 +14,7 @@ local function deno_uri_to_uri(uri) end local function uri_to_deno_uri(uri) - -- 1.7.4 LS use deno:/// and nvim-lsp use deno:/// as buffer_uri, too. - -- 1.7.5 LS use deno:/ and nvim-lsp use deno:// as buffer_uri. + -- denols use deno:/ and nvim-lsp use deno:// as buffer_uri. -- When buffer_uri is deno://, change uri to deno:/. if string.sub(uri, 1, 7) == "deno://" and string.sub(uri, 8, 8) ~= "/" then return string.gsub(uri, "^deno://", "deno:/", 1) @@ -61,17 +59,19 @@ local function virtual_text_document(uri) virtual_text_document_handler(uri, result) end -local function definition_handler(err, method, result) +local function denols_handler(err, method, result) if not result or vim.tbl_isempty(result) then return nil end for _, res in pairs(result) do - if string.sub(res.targetUri, 1, 6) == "deno:/" then - virtual_text_document(res.targetUri) - res.targetUri = deno_uri_to_uri(res.targetUri) + local uri = res.uri or res.targetUri + if string.sub(uri, 1, 6) == "deno:/" then + virtual_text_document(uri) + res['uri'] = deno_uri_to_uri(uri) + res['targetUri'] = deno_uri_to_uri(uri) end end - lsp.handlers["textDocument/definition"](err, method, result) + lsp.handlers[method](err, method, result) end local function denols_definition() @@ -80,6 +80,17 @@ local function denols_definition() lsp.buf_request(0, "textDocument/definition", params) end +local function denols_references(context) + vim.validate { context = { context, 't', true } } + local params = lsp.util.make_position_params() + params.context = context or { + includeDeclaration = true; + } + params[vim.type_idx] = vim.types.dictionary + params.textDocument.uri = uri_to_deno_uri(params.textDocument.uri) + lsp.buf_request(0, 'textDocument/references', params) +end + configs[server_name] = { default_config = { cmd = {"deno", "lsp"}; @@ -91,7 +102,8 @@ configs[server_name] = { unstable = false; }; handlers = { - ["textDocument/definition"] = definition_handler; + ["textDocument/definition"] = denols_handler; + ["textDocument/references"] = denols_handler; }; }; commands = { @@ -99,6 +111,12 @@ configs[server_name] = { denols_definition; description = "Jump to definition. This handle deno:/ schema in deno:// buffer." }; + DenolsReferences = { + function() + denols_references({ includeDeclaration = true }) + end; + description = "List references. This handle deno:/ schema in deno:// buffer." + }; DenolsCache = { function() buf_cache(0) @@ -119,6 +137,7 @@ Deno's built-in language server } configs.denols.definition = denols_definition +configs.denols.references = denols_references configs.denols.buf_cache = buf_cache configs.denols.virtual_text_document = virtual_text_document -- vim:et ts=2 sw=2 -- cgit v1.2.3-70-g09d2