hiifong/LazyVim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(lsp): backward compat with lspconfig refactor. Fixes #4525. See #4518

Browse Source
This commit is contained in:
Folke Lemaitre
2024-10-02 10:18:21 +02:00
parent 34f0e568d4
commit 6e4025229d
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lua/lazyvim/plugins/extras/lang/java.lua
View File

@ -76,7 +76,7 @@ return {
return { return {
-- How to find the root dir for a given filename. The default comes from -- How to find the root dir for a given filename. The default comes from
-- lspconfig which provides a function specifically for java projects. -- lspconfig which provides a function specifically for java projects.
root_dir = require("lspconfig.configs.jdtls").default_config.root_dir, root_dir = LazyVim.lsp.get_raw_config("jdtls").default_config.root_dir,
-- How to find the project name for a given root dir. -- How to find the project name for a given root dir.
project_name = function(root_dir) project_name = function(root_dir)

2
lua/lazyvim/plugins/extras/lang/tailwind.lua
View File

@ -28,7 +28,7 @@ return {
}, },
setup = { setup = {
tailwindcss = function(_, opts) tailwindcss = function(_, opts)
local tw = require("lspconfig.configs.tailwindcss") local tw = LazyVim.lsp.get_raw_config("tailwindcss")
opts.filetypes = opts.filetypes or {} opts.filetypes = opts.filetypes or {}
-- Add default filetypes -- Add default filetypes

9
lua/lazyvim/util/lsp.lua
View File

@ -181,6 +181,15 @@ function M.get_config(server)
return rawget(configs, server) return rawget(configs, server)
end end
---@return {default_config:lspconfig.Config}
function M.get_raw_config(server)
local ok, ret = pcall(require, "lspconfig.configs." .. server)
if ok then
return ret
end
return require("lspconfig.server_configurations." .. server)
end
function M.is_enabled(server) function M.is_enabled(server)
local c = M.get_config(server) local c = M.get_config(server)
return c and c.enabled ~= false return c and c.enabled ~= false