diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua index a2e5286a..414bb655 100644 --- a/lua/lazyvim/plugins/lsp/init.lua +++ b/lua/lazyvim/plugins/lsp/init.lua @@ -247,9 +247,9 @@ return { }) end - if LazyVim.lsp.get_config("denols") and LazyVim.lsp.get_config("tsserver") then + if LazyVim.lsp.is_enabled("denols") and LazyVim.lsp.is_enabled("vtsls") then local is_deno = require("lspconfig.util").root_pattern("deno.json", "deno.jsonc") - LazyVim.lsp.disable("tsserver", is_deno) + LazyVim.lsp.disable("vtsls", is_deno) LazyVim.lsp.disable("denols", function(root_dir) return not is_deno(root_dir) end) diff --git a/lua/lazyvim/util/lsp.lua b/lua/lazyvim/util/lsp.lua index 05070beb..b68f7349 100644 --- a/lua/lazyvim/util/lsp.lua +++ b/lua/lazyvim/util/lsp.lua @@ -179,6 +179,11 @@ function M.get_config(server) return rawget(configs, server) end +function M.is_enabled(server) + local c = M.get_config(server) + return c and c.enabled ~= false +end + ---@param server string ---@param cond fun( root_dir, config): boolean function M.disable(server, cond)