diff options
Diffstat (limited to '.config/nvim/lua/lsp')
| -rw-r--r-- | .config/nvim/lua/lsp/handlers.lua | 86 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp/init.lua | 28 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp/null-ls.lua | 141 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp/null-ls/formatters.lua | 77 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp/null-ls/init.lua | 44 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp/null-ls/linters.lua | 77 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp/null-ls/services.lua | 55 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp/peek.lua | 24 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp/utils.lua | 27 |
9 files changed, 367 insertions, 192 deletions
diff --git a/.config/nvim/lua/lsp/handlers.lua b/.config/nvim/lua/lsp/handlers.lua index c869d79..e273261 100644 --- a/.config/nvim/lua/lsp/handlers.lua +++ b/.config/nvim/lua/lsp/handlers.lua @@ -3,61 +3,69 @@ local M = {} function M.setup() - vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { - virtual_text = options.lsp.diagnostics.virtual_text, - signs = options.lsp.diagnostics.signs.active, - underline = options.lsp.document_highlight, - }) - - vim.lsp.handlers["textDocument/publishDiagnostics"] = function(_, _, params, client_id, _) - local config = { -- your config + vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( + vim.lsp.diagnostic.on_publish_diagnostics, + { virtual_text = options.lsp.diagnostics.virtual_text, - signs = options.lsp.diagnostics.signs, - underline = options.lsp.diagnostics.underline, - update_in_insert = options.lsp.diagnostics.update_in_insert, - severity_sort = options.lsp.diagnostics.severity_sort, + signs = options.lsp.diagnostics.signs.active, + underline = options.lsp.document_highlight, } - local uri = params.uri - local bufnr = vim.uri_to_bufnr(uri) + ) - if not bufnr then - return - end + vim.lsp.handlers["textDocument/publishDiagnostics"] = + function(_, _, params, client_id, _) + local config = { -- your config + virtual_text = options.lsp.diagnostics.virtual_text, + signs = options.lsp.diagnostics.signs, + underline = options.lsp.diagnostics.underline, + update_in_insert = options.lsp.diagnostics.update_in_insert, + severity_sort = options.lsp.diagnostics.severity_sort, + } + local uri = params.uri + local bufnr = vim.uri_to_bufnr(uri) - local diagnostics = params.diagnostics + if not bufnr then + return + end - for i, v in ipairs(diagnostics) do - local source = v.source - if source then - if string.find(source, "/") then - source = string.sub(v.source, string.find(v.source, "([%w-_]+)$")) + local diagnostics = params.diagnostics + + for i, v in ipairs(diagnostics) do + local source = v.source + if source then + if string.find(source, "/") then + source = string.sub(v.source, string.find(v.source, "([%w-_]+)$")) + end + diagnostics[i].message = string.format("%s: %s", source, v.message) + else + diagnostics[i].message = string.format("%s", v.message) end - diagnostics[i].message = string.format("%s: %s", source, v.message) - else - diagnostics[i].message = string.format("%s", v.message) - end - if vim.tbl_contains(vim.tbl_keys(v), "code") then - diagnostics[i].message = diagnostics[i].message .. string.format(" [%s]", v.code) + if vim.tbl_contains(vim.tbl_keys(v), "code") then + diagnostics[i].message = diagnostics[i].message + .. string.format(" [%s]", v.code) + end end - end - vim.lsp.diagnostic.save(diagnostics, bufnr, client_id) + vim.lsp.diagnostic.save(diagnostics, bufnr, client_id) - if not vim.api.nvim_buf_is_loaded(bufnr) then - return - end + if not vim.api.nvim_buf_is_loaded(bufnr) then + return + end - vim.lsp.diagnostic.display(diagnostics, bufnr, client_id, config) - end + vim.lsp.diagnostic.display(diagnostics, bufnr, client_id, config) + end vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = options.lsp.popup_border, }) - vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { - border = options.lsp.popup_border, - }) + vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with( + vim.lsp.handlers.signature_help, + { + border = options.lsp.popup_border, + } + ) end return M diff --git a/.config/nvim/lua/lsp/init.lua b/.config/nvim/lua/lsp/init.lua index 0c830f5..067375f 100644 --- a/.config/nvim/lua/lsp/init.lua +++ b/.config/nvim/lua/lsp/init.lua @@ -1,10 +1,14 @@ local M = {} local Log = require "core.log" + function M.config() vim.lsp.protocol.CompletionItemKind = options.lsp.completion.item_kind for _, sign in ipairs(options.lsp.diagnostics.signs.values) do - vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = sign.name }) + vim.fn.sign_define( + sign.name, + { texthl = sign.name, text = sign.text, numhl = sign.name } + ) end require("lsp.handlers").setup() @@ -107,10 +111,18 @@ function M.common_on_init(client, bufnr) end local formatters = options.lang[vim.bo.filetype].formatters - if not vim.tbl_isempty(formatters) and formatters[1]["exe"] ~= nil and formatters[1].exe ~= "" then + if + not vim.tbl_isempty(formatters) + and formatters[1]["exe"] ~= nil + and formatters[1].exe ~= "" + then client.resolved_capabilities.document_formatting = false Log:get_default().info( - string.format("Overriding language server [%s] with format provider [%s]", client.name, formatters[1].exe) + string.format( + "Overriding language server [%s] with format provider [%s]", + client.name, + formatters[1].exe + ) ) end end @@ -127,21 +139,23 @@ function M.common_on_attach(client, bufnr) end function M.setup(lang) + local lsp_utils = require "lsp.utils" local lsp = options.lang[lang].lsp - if require("utils").check_lsp_client_active(lsp.provider) then + if lsp_utils.is_client_active(lsp.provider) then return end local overrides = options.lsp.override - if type(overrides) == "table" then if vim.tbl_contains(overrides, lang) then return end end - local lspconfig = require "lspconfig" - lspconfig[lsp.provider].setup(lsp.setup) + if lsp.provider ~= nil and lsp.provider ~= "" then + local lspconfig = require "lspconfig" + lspconfig[lsp.provider].setup(lsp.setup) + end end return M diff --git a/.config/nvim/lua/lsp/null-ls.lua b/.config/nvim/lua/lsp/null-ls.lua deleted file mode 100644 index 81c6648..0000000 --- a/.config/nvim/lua/lsp/null-ls.lua +++ /dev/null @@ -1,141 +0,0 @@ -local M = {} -local Log = require "core.log" - -local null_ls = require "null-ls" - -local nodejs_local_providers = { "prettier", "prettierd", "prettier_d_slim", "eslint_d", "eslint" } - -M.requested_providers = {} - -function M.get_registered_providers_by_filetype(ft) - local matches = {} - for _, provider in pairs(M.requested_providers) do - if vim.tbl_contains(provider.filetypes, ft) then - local provider_name = provider.name - -- special case: show "eslint_d" instead of eslint - -- https://github.com/jose-elias-alvarez/null-ls.nvim/blob/9b8458bd1648e84169a7e8638091ba15c2f20fc0/doc/BUILTINS.md#eslint - if string.find(provider._opts.command, "eslint_d") then - provider_name = "eslint_d" - end - table.insert(matches, provider_name) - end - end - - return matches -end - -function M.get_missing_providers_by_filetype(ft) - local matches = {} - for _, provider in pairs(M.requested_providers) do - if vim.tbl_contains(provider.filetypes, ft) then - local provider_name = provider.name - - table.insert(matches, provider_name) - end - end - - return matches -end - -local function register_failed_request(ft, provider, operation) - if not options.lang[ft][operation]._failed_requests then - options.lang[ft][operation]._failed_requests = {} - end - table.insert(options.lang[ft][operation]._failed_requests, provider) -end - -local function validate_nodejs_provider(provider) - local command_path - local root_dir - if options.builtin.rooter.active then - --- use vim-rooter to set root_dir - vim.cmd "let root_dir = FindRootDirectory()" - root_dir = vim.api.nvim_get_var "root_dir" - else - --- use LSP to set root_dir - local ts_client = require("utils").get_active_client_by_ft "typescript" - if ts_client == nil then - Log:get_default().error "Unable to determine root directory since tsserver didn't start correctly" - return - end - root_dir = ts_client.config.root_dir - end - local local_nodejs_command = root_dir .. "/node_modules/.bin/" .. provider._opts.command - Log:get_default().debug("checking for local node module: ", vim.inspect(provider)) - - if vim.fn.executable(local_nodejs_command) == 1 then - command_path = local_nodejs_command - elseif vim.fn.executable(provider._opts.command) == 1 then - Log:get_default().debug("checking in global path instead for node module", provider._opts.command) - command_path = provider._opts.command - else - Log:get_default().debug("Unable to find node module", provider._opts.command) - end - return command_path -end - -local function validate_provider_request(provider) - if provider == "" or provider == nil then - return - end - -- NOTE: we can't use provider.name because eslint_d uses eslint name - if vim.tbl_contains(nodejs_local_providers, provider._opts.command) then - return validate_nodejs_provider(provider) - end - if vim.fn.executable(provider._opts.command) ~= 1 then - Log:get_default().warn("Unable to find the path for", vim.inspect(provider)) - return - end - return provider._opts.command -end - --- TODO: for linters and formatters with spaces and '-' replace with '_' -function M.setup(filetype) - for _, formatter in pairs(options.lang[filetype].formatters) do - Log:get_default().debug("validating format provider: ", formatter.exe) - local builtin_formatter = null_ls.builtins.formatting[formatter.exe] - if not vim.tbl_contains(M.requested_providers, builtin_formatter) then - -- FIXME: why doesn't this work? - -- builtin_formatter._opts.args = formatter.args or builtin_formatter._opts.args - -- builtin_formatter._opts.to_stdin = formatter.stdin or builtin_formatter._opts.to_stdin - local resolved_path = validate_provider_request(builtin_formatter) - if resolved_path then - builtin_formatter._opts.command = resolved_path - table.insert(M.requested_providers, builtin_formatter) - Log:get_default().info("Using format provider", builtin_formatter.name) - else - -- mark it here to avoid re-doing the lookup again - register_failed_request(filetype, formatter.exe, "formatters") - end - end - end - - for _, linter in pairs(options.lang[filetype].linters) do - local builtin_diagnoser = null_ls.builtins.diagnostics[linter.exe] - Log:get_default().debug("validating lint provider: ", linter.exe) - -- special case: fallback to "eslint" - -- https://github.com/jose-elias-alvarez/null-ls.nvim/blob/9b8458bd1648e84169a7e8638091ba15c2f20fc0/doc/BUILTINS.md#eslint - -- if provider.exe - if linter.exe == "eslint_d" then - builtin_diagnoser = null_ls.builtins.diagnostics.eslint.with { command = "eslint_d" } - end - if not vim.tbl_contains(M.requested_providers, builtin_diagnoser) then - -- FIXME: why doesn't this work? - -- builtin_diagnoser._opts.args = linter.args or builtin_diagnoser._opts.args - -- builtin_diagnoser._opts.to_stdin = linter.stdin or builtin_diagnoser._opts.to_stdin - local resolved_path = validate_provider_request(builtin_diagnoser) - if resolved_path then - builtin_diagnoser._opts.command = resolved_path - table.insert(M.requested_providers, builtin_diagnoser) - Log:get_default().info("Using linter provider", builtin_diagnoser.name) - else - -- mark it here to avoid re-doing the lookup again - register_failed_request(filetype, linter.exe, "linters") - end - end - end - - null_ls.register { sources = M.requested_providers } -end - -return M diff --git a/.config/nvim/lua/lsp/null-ls/formatters.lua b/.config/nvim/lua/lsp/null-ls/formatters.lua new file mode 100644 index 0000000..e69c824 --- /dev/null +++ b/.config/nvim/lua/lsp/null-ls/formatters.lua @@ -0,0 +1,77 @@ +local M = {} +local formatters_by_ft = {} + +local null_ls = require "null-ls" +local services = require "lsp.null-ls.services" +local logger = require("core.log"):get_default() + +local function list_names(formatters, option) + option = option or {} + local filter = option.filter or "supported" + + return vim.tbl_keys(formatters[filter]) +end + +function M.list_supported_names(filetype) + if not formatters_by_ft[filetype] then + return {} + end + return list_names(formatters_by_ft[filetype], { filter = "supported" }) +end + +function M.list_unsupported_names(filetype) + if not formatters_by_ft[filetype] then + return {} + end + return list_names(formatters_by_ft[filetype], { filter = "unsupported" }) +end + +function M.list_available(filetype) + local formatters = {} + for _, provider in pairs(null_ls.builtins.formatting) do + -- TODO: Add support for wildcard filetypes + if vim.tbl_contains(provider.filetypes or {}, filetype) then + table.insert(formatters, provider.name) + end + end + + return formatters +end + +function M.list_configured(formatter_configs) + local formatters, errors = {}, {} + + for _, fmt_config in ipairs(formatter_configs) do + local formatter = null_ls.builtins.formatting[fmt_config.exe] + + if not formatter then + logger.error("Not a valid formatter:", fmt_config.exe) + errors[fmt_config.exe] = {} -- Add data here when necessary + else + local formatter_cmd = services.find_command(formatter._opts.command) + if not formatter_cmd then + logger.warn("Not found:", formatter._opts.command) + errors[fmt_config.exe] = {} -- Add data here when necessary + else + logger.info("Using formatter:", formatter_cmd) + formatters[fmt_config.exe] = formatter.with { + command = formatter_cmd, + extra_args = fmt_config.args, + } + end + end + end + + return { supported = formatters, unsupported = errors } +end + +function M.setup(filetype, option) + if formatters_by_ft[filetype] and not option.force_reload then + return + end + + formatters_by_ft[filetype] = M.list_configured(options.lang[filetype].formatters) + null_ls.register { sources = formatters_by_ft[filetype].supported } +end + +return M diff --git a/.config/nvim/lua/lsp/null-ls/init.lua b/.config/nvim/lua/lsp/null-ls/init.lua new file mode 100644 index 0000000..f2b1042 --- /dev/null +++ b/.config/nvim/lua/lsp/null-ls/init.lua @@ -0,0 +1,44 @@ +local M = {} + +function M.list_supported_provider_names(filetype) + local names = {} + + local formatters = require "lsp.null-ls.formatters" + local linters = require "lsp.null-ls.linters" + + vim.list_extend(names, formatters.list_supported_names(filetype)) + vim.list_extend(names, linters.list_supported_names(filetype)) + + return names +end + +function M.list_unsupported_provider_names(filetype) + local names = {} + + local formatters = require "lsp.null-ls.formatters" + local linters = require "lsp.null-ls.linters" + + vim.list_extend(names, formatters.list_unsupported_names(filetype)) + vim.list_extend(names, linters.list_unsupported_names(filetype)) + + return names +end + +-- TODO: for linters and formatters with spaces and '-' replace with '_' +function M.setup(filetype, option) + option = option or {} + + local ok, _ = pcall(require, "null-ls") + if not ok then + require("core.log"):get_default().error "Missing null-ls dependency" + return + end + + local formatters = require "lsp.null-ls.formatters" + local linters = require "lsp.null-ls.linters" + + formatters.setup(filetype, option) + linters.setup(filetype, option) +end + +return M diff --git a/.config/nvim/lua/lsp/null-ls/linters.lua b/.config/nvim/lua/lsp/null-ls/linters.lua new file mode 100644 index 0000000..a0675a7 --- /dev/null +++ b/.config/nvim/lua/lsp/null-ls/linters.lua @@ -0,0 +1,77 @@ +local M = {} +local linters_by_ft = {} + +local null_ls = require "null-ls" +local services = require "lsp.null-ls.services" +local logger = require("core.log"):get_default() + +local function list_names(linters, option) + option = option or {} + local filter = option.filter or "supported" + + return vim.tbl_keys(linters[filter]) +end + +function M.list_supported_names(filetype) + if not linters_by_ft[filetype] then + return {} + end + return list_names(linters_by_ft[filetype], { filter = "supported" }) +end + +function M.list_unsupported_names(filetype) + if not linters_by_ft[filetype] then + return {} + end + return list_names(linters_by_ft[filetype], { filter = "unsupported" }) +end + +function M.list_available(filetype) + local linters = {} + for _, provider in pairs(null_ls.builtins.diagnostics) do + -- TODO: Add support for wildcard filetypes + if vim.tbl_contains(provider.filetypes or {}, filetype) then + table.insert(linters, provider.name) + end + end + + return linters +end + +function M.list_configured(linter_configs) + local linters, errors = {}, {} + + for _, lnt_config in pairs(linter_configs) do + local linter = null_ls.builtins.diagnostics[lnt_config.exe] + + if not linter then + logger.error("Not a valid linter:", lnt_config.exe) + errors[lnt_config.exe] = {} -- Add data here when necessary + else + local linter_cmd = services.find_command(linter._opts.command) + if not linter_cmd then + logger.warn("Not found:", linter._opts.command) + errors[lnt_config.exe] = {} -- Add data here when necessary + else + logger.info("Using linter:", linter_cmd) + linters[lnt_config.exe] = linter.with { + command = linter_cmd, + extra_args = lnt_config.args, + } + end + end + end + + return { supported = linters, unsupported = errors } +end + +function M.setup(filetype, option) + if linters_by_ft[filetype] and not option.force_reload then + return + end + + linters_by_ft[filetype] = M.list_configured(options.lang[filetype].linters) + null_ls.register { sources = linters_by_ft[filetype].supported } +end + +return M diff --git a/.config/nvim/lua/lsp/null-ls/services.lua b/.config/nvim/lua/lsp/null-ls/services.lua new file mode 100644 index 0000000..80bf66e --- /dev/null +++ b/.config/nvim/lua/lsp/null-ls/services.lua @@ -0,0 +1,55 @@ +local M = {} + +local logger = require("core.log"):get_default() + +local function find_root_dir() + if options.builtin.rooter.active then + --- use vim-rooter to set root_dir + vim.cmd "let root_dir = FindRootDirectory()" + return vim.api.nvim_get_var "root_dir" + end + + -- TODO: Rework this to not make it javascript specific + --- use LSP to set root_dir + local lsp_utils = require "lsp.utils" + local ts_client = lsp_utils.get_active_client_by_ft "typescript" + if ts_client == nil then + logger.error "Unable to determine root directory since tsserver didn't start correctly" + return nil + end + + return ts_client.config.root_dir +end + +local function from_node_modules(command) + local root_dir = find_root_dir() + if not root_dir then + return nil + end + + return root_dir .. "/node_modules/.bin/" .. command +end + +local local_providers = { + prettier = { find = from_node_modules }, + prettierd = { find = from_node_modules }, + prettier_d_slim = { find = from_node_modules }, + eslint_d = { find = from_node_modules }, + eslint = { find = from_node_modules }, +} + +function M.find_command(command) + if local_providers[command] then + local local_command = local_providers[command].find(command) + if local_command and vim.fn.executable(local_command) == 1 then + return local_command + end + end + + if vim.fn.executable(command) == 1 then + return command + end + return nil +end + +return M diff --git a/.config/nvim/lua/lsp/peek.lua b/.config/nvim/lua/lsp/peek.lua index cc8e57a..e4f4e1e 100644 --- a/.config/nvim/lua/lsp/peek.lua +++ b/.config/nvim/lua/lsp/peek.lua @@ -12,7 +12,8 @@ local function create_floating_file(location, opts) -- Set some defaults opts = opts or {} - local close_events = opts.close_events or { "CursorMoved", "CursorMovedI", "BufHidden", "InsertCharPre" } + local close_events = opts.close_events + or { "CursorMoved", "CursorMovedI", "BufHidden", "InsertCharPre" } -- location may be LocationLink or Location local uri = location.targetUri or location.uri @@ -29,7 +30,10 @@ local function create_floating_file(location, opts) local contents = vim.api.nvim_buf_get_lines( bufnr, range.start.line, - math.min(range["end"].line + 1 + (opts.context or 10), range.start.line + (opts.max_height or 15)), -- Don't let the window be more that 15 lines long(height) + math.min( + range["end"].line + 1 + (opts.context or 10), + range.start.line + (opts.max_height or 15) + ), -- Don't let the window be more that 15 lines long(height) false ) local width, height = vim.lsp.util._make_floating_popup_size(contents, opts) @@ -46,7 +50,9 @@ local function create_floating_file(location, opts) -- Set some autocmds to close the window vim.api.nvim_command( - "autocmd QuitPre <buffer> ++nested ++once lua pcall(vim.api.nvim_win_close, " .. winnr .. ", true)" + "autocmd QuitPre <buffer> ++nested ++once lua pcall(vim.api.nvim_win_close, " + .. winnr + .. ", true)" ) vim.lsp.util.close_preview_autocmd(close_events, winnr) @@ -128,10 +134,18 @@ function M.Peek(what) else -- Make a new request and then create the new window in the callback local params = vim.lsp.util.make_position_params() - local success, _ = pcall(vim.lsp.buf_request, 0, "textDocument/" .. what, params, preview_location_callback) + local success, _ = pcall( + vim.lsp.buf_request, + 0, + "textDocument/" .. what, + params, + preview_location_callback + ) if not success then print( - 'peek: Error calling LSP method "textDocument/' .. what .. '". The current language lsp might not support it.' + 'peek: Error calling LSP method "textDocument/' + .. what + .. '". The current language lsp might not support it.' ) end end diff --git a/.config/nvim/lua/lsp/utils.lua b/.config/nvim/lua/lsp/utils.lua new file mode 100644 index 0000000..af265de --- /dev/null +++ b/.config/nvim/lua/lsp/utils.lua @@ -0,0 +1,27 @@ +local M = {} + +function M.is_client_active(name) + local clients = vim.lsp.get_active_clients() + for _, client in pairs(clients) do + if client.name == name then + return true + end + end + return false +end + +function M.get_active_client_by_ft(filetype) + if not options.lang[filetype] or not options.lang[filetype].lsp then + return nil + end + + local clients = vim.lsp.get_active_clients() + for _, client in pairs(clients) do + if client.name == options.lang[filetype].lsp.provider then + return client + end + end + return nil +end + +return M |