Switch to mason for installing new lsps

This commit is contained in:
ViViDboarder 2022-09-08 12:23:41 -07:00
parent 516e5386ef
commit d33415ee73
3 changed files with 82 additions and 62 deletions

View File

@ -220,12 +220,18 @@ use({
-- Install language servers -- Install language servers
use({ use({
"williamboman/nvim-lsp-installer", "williamboman/mason.nvim",
requires = "neovim/nvim-lspconfig", requires = {
"neovim/nvim-lspconfig",
"williamboman/mason-lspconfig.nvim",
},
}) })
-- Lua dev for vim -- Lua dev for vim
use("folke/lua-dev.nvim") use({
"folke/lua-dev.nvim",
requires = "neovim/lsp-config",
})
-- Better display of lsp diagnostics -- Better display of lsp diagnostics
use("folke/trouble.nvim") use("folke/trouble.nvim")

View File

@ -52,6 +52,7 @@ local function get_default_attach(override_capabilities)
local function buf_set_keymap(...) local function buf_set_keymap(...)
vim.api.nvim_buf_set_keymap(bufnr, ...) vim.api.nvim_buf_set_keymap(bufnr, ...)
end end
local function buf_set_option(...) local function buf_set_option(...)
vim.api.nvim_buf_set_option(bufnr, ...) vim.api.nvim_buf_set_option(bufnr, ...)
end end
@ -174,47 +175,6 @@ local function merged_capabilities()
return capabilities return capabilities
end end
function M.config_lsp()
utils.try_require("lspconfig", function(lsp_config)
local capabilities = merged_capabilities()
-- Configure each server
lsp_config.bashls.setup({ capabilities = capabilities, on_attach = get_default_attach() })
lsp_config.gopls.setup({ capabilities = capabilities, on_attach = get_default_attach() })
lsp_config.pyright.setup({ capabilities = capabilities, on_attach = get_default_attach() })
lsp_config.rls.setup({
capabilities = capabilities,
on_attach = get_default_attach(),
settings = {
rust = {
build_on_save = false,
all_features = true,
unstable_features = true,
},
},
})
-- Config null-ls after lsps so we can disable for languages that have language servers
require("plugins.null-ls").configure({ capabilities = capabilities, on_attach = get_default_attach() })
end)
end
function M.config_lsp_saga()
utils.try_require("lspsaga", function(saga)
saga.init_lsp_saga({
error_sign = utils.diagnostic_signs.Error,
warn_sign = utils.diagnostic_signs.Warn,
hint_sign = utils.diagnostic_signs.Hint,
dianostic_header_icon = " 💬 ",
code_action_icon = "💡",
code_action_prompt = {
enable = false,
sign = false,
},
})
end)
end
local function get_luadev_config() local function get_luadev_config()
local luadev = utils.try_require("lua-dev") local luadev = utils.try_require("lua-dev")
if luadev ~= nil then if luadev ~= nil then
@ -234,26 +194,78 @@ local function get_luadev_config()
}) })
end end
return nil return { settings = nil }
end
function M.config_lsp()
utils.try_require("lspconfig", function(lsp_config)
local capabilities = merged_capabilities()
local default_attach = get_default_attach()
local default_setup = { capabilities = capabilities, on_attach = default_attach }
-- Configure each server
lsp_config.bashls.setup(default_setup)
lsp_config.gopls.setup(default_setup)
lsp_config.pyright.setup(default_setup)
-- lsp_config.tsserver.setup(default_setup)
lsp_config.rls.setup({
capabilities = capabilities,
on_attach = default_attach,
settings = {
rust = {
build_on_save = false,
all_features = true,
unstable_features = true,
},
},
})
lsp_config.sumneko_lua.setup({
capabilities = capabilities,
on_attach = default_attach,
settings = get_luadev_config().settings,
})
-- Auto setup mason installed servers
utils.try_require("mason-lspconfig", function(mason_lspconfig)
-- Get list of servers that are installed but not set up
local already_setup = lsp_config.available_servers()
local needs_setup = vim.tbl_filter(function(server)
return not vim.tbl_contains(already_setup, server)
end, mason_lspconfig.get_installed_servers())
-- Setup each server with default config
vim.tbl_map(function(server)
lsp_config[server].setup(default_setup)
end, needs_setup)
end)
-- Config null-ls after lsps so we can disable for languages that have language servers
require("plugins.null-ls").configure(default_setup)
end)
end
function M.config_lsp_saga()
utils.try_require("lspsaga", function(saga)
saga.init_lsp_saga({
error_sign = utils.diagnostic_signs.Error,
warn_sign = utils.diagnostic_signs.Warn,
hint_sign = utils.diagnostic_signs.Hint,
dianostic_header_icon = " 💬 ",
code_action_icon = "💡",
code_action_prompt = {
enable = false,
sign = false,
},
})
end)
end end
function M.config_lsp_intaller() function M.config_lsp_intaller()
utils.try_require("nvim-lsp-installer", function(lsp_installer) utils.try_require("mason", function(mason)
-- Default options mason.setup()
local opts = {
on_attach = get_default_attach(),
}
lsp_installer.on_server_ready(function(server)
-- Config luadev opts
if server.name == "sumneko_lua" then
local luadev = get_luadev_config()
if luadev ~= nil then
opts.settings = luadev.settings
end
end
server:setup(opts)
end) end)
utils.try_require("mason-lspconfig", function(mason_lspconfig)
mason_lspconfig.setup()
end) end)
end end

View File

@ -6,7 +6,9 @@ local function disable_formatter_filetypes_for_existing_servers(sources, preserv
local server_filetypes = {} local server_filetypes = {}
utils.try_require("lspconfig", function(lsp_config) utils.try_require("lspconfig", function(lsp_config)
vim.tbl_map(function(server) vim.tbl_map(function(server)
if lsp_config[server].filetypes ~= nil then
vim.list_extend(server_filetypes, lsp_config[server].filetypes) vim.list_extend(server_filetypes, lsp_config[server].filetypes)
end
end, lsp_config.available_servers()) end, lsp_config.available_servers())
end) end)