Added option to use system lsp instead of mason
This commit is contained in:
@@ -122,16 +122,22 @@ return {
|
||||
dynamicRegistration = true,
|
||||
}
|
||||
|
||||
require("mason-lspconfig").setup({
|
||||
handlers = {
|
||||
function(server_name)
|
||||
local server = require("tools").servers[server_name] or {}
|
||||
server.capabilities = vim.tbl_deep_extend("force", capabilities, server.capabilities or {})
|
||||
server.handlers = handlers
|
||||
local handler = function(server_name)
|
||||
local server = require("tools").servers[server_name] or {}
|
||||
server.capabilities = vim.tbl_deep_extend("force", capabilities, server.capabilities or {})
|
||||
server.handlers = handlers
|
||||
|
||||
require("lspconfig")[server_name].setup(server)
|
||||
end,
|
||||
},
|
||||
require("lspconfig")[server_name].setup(server)
|
||||
end
|
||||
|
||||
for server, config in pairs(require("tools").servers) do
|
||||
if config.system then
|
||||
handler(server)
|
||||
end
|
||||
end
|
||||
|
||||
require("mason-lspconfig").setup({
|
||||
handlers = { handler },
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
||||
@@ -15,7 +15,13 @@ return {
|
||||
},
|
||||
config = function()
|
||||
local tools = require("tools")
|
||||
local ensure_installed = vim.tbl_keys(tools.servers)
|
||||
local ensure_installed = vim.tbl_keys(vim.tbl_map(function(server)
|
||||
if server.system then
|
||||
return nil
|
||||
else
|
||||
return server
|
||||
end
|
||||
end, tools.servers))
|
||||
ensure_installed =
|
||||
vim.list_extend(ensure_installed, require("util.mason").process_formatters(tools.formatters))
|
||||
ensure_installed = vim.list_extend(ensure_installed, tools.extra)
|
||||
|
||||
Reference in New Issue
Block a user