mroot/lazyvim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2026-07-21 20:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(lsp): fix mason install/exclude. Closes #6504

Browse source
This commit is contained in:
Folke Lemaitre 2025-09-23 12:58:45 +02:00
parent 21518ae8a3
commit 37b1ec41ae
No known key found for this signature in database
GPG key ID: 9B52594D560070AB
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -187,37 +187,36 @@ return {
local mason_all = have_mason local mason_all = have_mason
and vim.tbl_keys(require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package) and vim.tbl_keys(require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package)
or {} --[[ @as string[] ]] or {} --[[ @as string[] ]]
local mason_exclude = {}, {} ---@type string[]
---@return boolean? exclude automatic setup ---@return boolean? exclude automatic setup
local function configure(server) local function configure(server)
local sopts = opts.servers[server] local sopts = opts.servers[server]
sopts = sopts == true and {} or (not sopts) and { enabled = false } or sopts --[[@as lazyvim.lsp.Config]] sopts = sopts == true and {} or (not sopts) and { enabled = false } or sopts --[[@as lazyvim.lsp.Config]]
if sopts.enabled == false then if sopts.enabled == false then
return true mason_exclude[#mason_exclude + 1] = server
return
end end
local use_mason = sopts.mason ~= false and vim.tbl_contains(mason_all, server)
local setup = opts.setup[server] or opts.setup["*"] local setup = opts.setup[server] or opts.setup["*"]
if setup and setup(server, sopts) then if setup and setup(server, sopts) then
return true -- lsp will be configured and enabled by the setup function mason_exclude[#mason_exclude + 1] = server
end else
vim.lsp.config(server, sopts) -- configure the server
vim.lsp.config(server, sopts) -- configure the server if not use_mason then
vim.lsp.enable(server)
-- manually enable if mason=false or if this is a server that cannot be installed with mason-lspconfig end
if sopts.mason == false or not vim.tbl_contains(mason_all, server) then
vim.lsp.enable(server)
return true
end end
return use_mason
end end
local servers = vim.tbl_keys(opts.servers) local install = vim.tbl_filter(configure, vim.tbl_keys(opts.servers))
local exclude = vim.tbl_filter(configure, servers)
if have_mason then if have_mason then
require("mason-lspconfig").setup({ require("mason-lspconfig").setup({
ensure_installed = vim.tbl_filter(function(server) ensure_installed = vim.list_extend(install, LazyVim.opts("mason-lspconfig.nvim").ensure_installed or {}),
return not vim.tbl_contains(exclude, server) automatic_enable = { exclude = mason_exclude },
end, vim.list_extend(servers, LazyVim.opts("mason-lspconfig.nvim").ensure_installed or {})),
automatic_enable = { exclude = exclude },
}) })
end end
end), end),