From eefde00ae80f91ecf88a93e869e346fdd04c7ba4 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Tue, 9 Aug 2022 10:41:17 +0200 Subject: refactor!: migrate to mason.nvim (#2880) --- tests/minimal_lsp.lua | 59 ++++++++++++++++++++++-------------------------- tests/specs/lsp_spec.lua | 6 ++++- 2 files changed, 32 insertions(+), 33 deletions(-) (limited to 'tests') diff --git a/tests/minimal_lsp.lua b/tests/minimal_lsp.lua index a610fd7f..09224f94 100644 --- a/tests/minimal_lsp.lua +++ b/tests/minimal_lsp.lua @@ -16,7 +16,7 @@ local package_root = join_paths(temp_dir, "nvim", "site", "pack") local install_path = join_paths(package_root, "packer", "start", "packer.nvim") local compile_path = join_paths(install_path, "plugin", "packer_compiled.lua") --- Choose whether to use the executable that's managed by lsp-installer +-- Choose whether to use the executable that's managed by mason local use_lsp_installer = true local function load_plugins() @@ -24,7 +24,8 @@ local function load_plugins() { "wbthomason/packer.nvim", "neovim/nvim-lspconfig", - { "williamboman/nvim-lsp-installer", disable = not use_lsp_installer }, + "williamboman/mason-lspconfig.nvim", + "williamboman/mason.nvim", }, config = { package_root = package_root, @@ -44,9 +45,6 @@ _G.load_config = function() require("vim.lsp.log").set_format_func(vim.inspect) local nvim_lsp = require "lspconfig" local on_attach = function(_, bufnr) - local function buf_set_keymap(...) - vim.api.nvim_buf_set_keymap(bufnr, ...) - end local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end @@ -54,24 +52,26 @@ _G.load_config = function() buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc") -- Mappings. - local opts = { noremap = true, silent = true } - buf_set_keymap("n", "gD", "lua vim.lsp.buf.declaration()", opts) - buf_set_keymap("n", "gd", "lua vim.lsp.buf.definition()", opts) - buf_set_keymap("n", "K", "lua vim.lsp.buf.hover()", opts) - buf_set_keymap("n", "gi", "lua vim.lsp.buf.implementation()", opts) - buf_set_keymap("n", "", "lua vim.lsp.buf.signature_help()", opts) - buf_set_keymap("n", "wa", "lua vim.lsp.buf.add_workspace_folder()", opts) - buf_set_keymap("n", "wr", "lua vim.lsp.buf.remove_workspace_folder()", opts) - buf_set_keymap("n", "wl", "lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))", opts) - buf_set_keymap("n", "lD", "lua vim.lsp.buf.type_definition()", opts) - buf_set_keymap("n", "lr", "lua vim.lsp.buf.rename()", opts) - buf_set_keymap("n", "gr", "lua vim.lsp.buf.references()", opts) - buf_set_keymap("n", "gl", "lua vim.diagnostic.open_float(0,{scope='line'})", opts) - buf_set_keymap("n", "lk", "lua vim.diagnostic.goto_prev()", opts) - buf_set_keymap("n", "lj", "lua vim.diagnostic.goto_next()", opts) - buf_set_keymap("n", "lq", "lua vim.diagnostic.setloclist()", opts) - buf_set_keymap("n", "li", "LspInfo", opts) - buf_set_keymap("n", "lI", "LspInstallInfo", opts) + local opts = { buffer = bufnr, noremap = true, silent = true } + vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts) + vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts) + vim.keymap.set("n", "K", vim.lsp.buf.hover, opts) + vim.keymap.set("n", "gi", vim.lsp.buf.implementation, opts) + vim.keymap.set("n", "", vim.lsp.buf.signature_help, opts) + vim.keymap.set("n", "wa", vim.lsp.buf.add_workspace_folder, opts) + vim.keymap.set("n", "wr", vim.lsp.buf.remove_workspace_folder, opts) + vim.keymap.set("n", "wl", function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, opts) + vim.keymap.set("n", "lD", vim.lsp.buf.type_definition, opts) + vim.keymap.set("n", "lr", vim.lsp.buf.rename, opts) + vim.keymap.set("n", "gr", vim.lsp.buf.references, opts) + vim.keymap.set("n", "gl", vim.diagnostic.open_float, opts) + vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) + vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts) + vim.keymap.set("n", "q", vim.diagnostic.setloclist, opts) + vim.keymap.set("n", "li", "LspInfo", opts) + vim.keymap.set("n", "lI", "MasonCR>", opts) end -- Add the server that troubles you here, e.g. "clangd", "pyright", "tsserver" @@ -81,15 +81,6 @@ _G.load_config = function() on_attach = on_attach, } - if use_lsp_installer then - local server_available, server = require("nvim-lsp-installer.servers").get_server(name) - if not server_available then - server:install() - end - local default_opts = server:get_default_options() - setup_opts = vim.tbl_deep_extend("force", setup_opts, default_opts) - end - if not name then print "You have not defined a server name, please edit minimal_init.lua" end @@ -99,6 +90,10 @@ _G.load_config = function() end nvim_lsp[name].setup(setup_opts) + if use_lsp_installer then + require("mason-lspconfig").setup { automatic_installation = true } + end + print [[You can find your log at $HOME/.cache/nvim/lsp.log. Please paste in a github issue under a details tag as described in the issue template.]] end diff --git a/tests/specs/lsp_spec.lua b/tests/specs/lsp_spec.lua index 7d9a3386..01e5e1d3 100644 --- a/tests/specs/lsp_spec.lua +++ b/tests/specs/lsp_spec.lua @@ -53,10 +53,14 @@ a.describe("lsp workflow", function() a.it("should only include one server per generated template", function() require("lvim.lsp").setup() + local allowed_dupes = { "tailwindcss" } for _, file in ipairs(vim.fn.glob(lvim.lsp.templates_dir .. "/*.lua", 1, 1)) do local content = {} for entry in io.lines(file) do - table.insert(content, entry) + local server_name = entry:match [[.*setup%("(.*)"%)]] + if not vim.tbl_contains(allowed_dupes, server_name) then + table.insert(content, server_name) + end end local err_msg = "" if #content > 1 then -- cgit v1.2.3