mirror/LazyVim.LazyVim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2025-06-27 03:09:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(lsp): make lsp work when mason-lspconfig is disabled. Fixed #445

Browse source
This commit is contained in:
Folke Lemaitre 2023-03-17 08:04:17 +01:00
parent f0b548af2f
commit c10e550639
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lua/lazyvim/plugins/lsp/init.lua
View file

@ -101,16 +101,8 @@ return {
require("lspconfig")[server].setup(server_opts) require("lspconfig")[server].setup(server_opts)
end end
-- temp fix for lspconfig rename local have_mason, mlsp = pcall(require, "mason-lspconfig")
-- https://github.com/neovim/nvim-lspconfig/pull/2439 local available = have_mason and mlsp.get_available_servers() or {}
local mappings = require("mason-lspconfig.mappings.server")
if not mappings.lspconfig_to_package.lua_ls then
mappings.lspconfig_to_package.lua_ls = "lua-language-server"
mappings.package_to_lspconfig["lua-language-server"] = "lua_ls"
end
local mlsp = require("mason-lspconfig")
local available = mlsp.get_available_servers()
local ensure_installed = {} ---@type string[] local ensure_installed = {} ---@type string[]
for server, server_opts in pairs(servers) do for server, server_opts in pairs(servers) do
@ -125,8 +117,10 @@ return {
end end
end end
require("mason-lspconfig").setup({ ensure_installed = ensure_installed }) if have_mason then
require("mason-lspconfig").setup_handlers({ setup }) mlsp.setup({ ensure_installed = ensure_installed })
mlsp.setup_handlers({ setup })
end
end, end,
}, },