fix: remove mason-lspconfig, we do not need it anymore
This commit is contained in:
parent
0c17d320bb
commit
ad246eb5dd
24
init.lua
24
init.lua
|
|
@ -666,23 +666,14 @@ require('lazy').setup({
|
||||||
-- :Mason
|
-- :Mason
|
||||||
--
|
--
|
||||||
-- You can press `g?` for help in this menu.
|
-- You can press `g?` for help in this menu.
|
||||||
--
|
|
||||||
-- `mason` had to be setup earlier: to configure its options see the
|
|
||||||
-- `dependencies` table for `nvim-lspconfig` above.
|
|
||||||
--
|
|
||||||
-- You can add other tools here that you want Mason to install
|
|
||||||
-- for you, so that they are available from within Neovim.
|
|
||||||
local ensure_installed = vim.tbl_keys(servers or {})
|
local ensure_installed = vim.tbl_keys(servers or {})
|
||||||
vim.list_extend(ensure_installed, {
|
vim.list_extend(ensure_installed, {
|
||||||
'stylua', -- Used to format Lua code
|
'stylua', -- Used to format Lua code
|
||||||
|
-- You can add other tools here that you want Mason to install
|
||||||
})
|
})
|
||||||
|
|
||||||
require('mason-tool-installer').setup { ensure_installed = ensure_installed }
|
require('mason-tool-installer').setup { ensure_installed = ensure_installed }
|
||||||
|
|
||||||
require('mason-lspconfig').setup {
|
|
||||||
ensure_installed = { 'lua_ls' },
|
|
||||||
}
|
|
||||||
|
|
||||||
for name, server in pairs(servers) do
|
for name, server in pairs(servers) do
|
||||||
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
|
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
|
||||||
vim.lsp.config(name, server)
|
vim.lsp.config(name, server)
|
||||||
|
|
@ -706,21 +697,11 @@ require('lazy').setup({
|
||||||
'lua/?/init.lua',
|
'lua/?/init.lua',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
-- Make the server aware of Neovim runtime files
|
|
||||||
workspace = {
|
workspace = {
|
||||||
checkThirdParty = false,
|
checkThirdParty = false,
|
||||||
-- NOTE: this is a lot slower and will cause issues when working on your own configuration.
|
-- NOTE: this is a lot slower and will cause issues when working on your own configuration.
|
||||||
-- See https://github.com/neovim/nvim-lspconfig/issues/3189
|
-- See https://github.com/neovim/nvim-lspconfig/issues/3189
|
||||||
library = vim.api.nvim_get_runtime_file('', true),
|
library = vim.api.nvim_get_runtime_file('', true),
|
||||||
--
|
|
||||||
-- Alternatively:
|
|
||||||
-- library = {
|
|
||||||
-- vim.env.VIMRUNTIME,
|
|
||||||
-- -- Depending on the usage, you might want to add additional paths
|
|
||||||
-- -- here.
|
|
||||||
-- -- '${3rd}/luv/library',
|
|
||||||
-- -- '${3rd}/busted/library',
|
|
||||||
-- },
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
|
|
@ -728,6 +709,7 @@ require('lazy').setup({
|
||||||
Lua = {},
|
Lua = {},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
vim.lsp.enable 'lua_ls'
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue