Skip to content

Commit ad246eb

Browse files
committed
fix: remove mason-lspconfig, we do not need it anymore
1 parent 0c17d32 commit ad246eb

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

init.lua

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -666,23 +666,14 @@ require('lazy').setup({
666666
-- :Mason
667667
--
668668
-- You can press `g?` for help in this menu.
669-
--
670-
-- `mason` had to be setup earlier: to configure its options see the
671-
-- `dependencies` table for `nvim-lspconfig` above.
672-
--
673-
-- You can add other tools here that you want Mason to install
674-
-- for you, so that they are available from within Neovim.
675669
local ensure_installed = vim.tbl_keys(servers or {})
676670
vim.list_extend(ensure_installed, {
677671
'stylua', -- Used to format Lua code
672+
-- You can add other tools here that you want Mason to install
678673
})
679674

680675
require('mason-tool-installer').setup { ensure_installed = ensure_installed }
681676

682-
require('mason-lspconfig').setup {
683-
ensure_installed = { 'lua_ls' },
684-
}
685-
686677
for name, server in pairs(servers) do
687678
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
688679
vim.lsp.config(name, server)
@@ -706,28 +697,19 @@ require('lazy').setup({
706697
'lua/?/init.lua',
707698
},
708699
},
709-
-- Make the server aware of Neovim runtime files
710700
workspace = {
711701
checkThirdParty = false,
712702
-- NOTE: this is a lot slower and will cause issues when working on your own configuration.
713-
-- See https://github.com/neovim/nvim-lspconfig/issues/3189
703+
-- See https://github.com/neovim/nvim-lspconfig/issues/3189
714704
library = vim.api.nvim_get_runtime_file('', true),
715-
--
716-
-- Alternatively:
717-
-- library = {
718-
-- vim.env.VIMRUNTIME,
719-
-- -- Depending on the usage, you might want to add additional paths
720-
-- -- here.
721-
-- -- '${3rd}/luv/library',
722-
-- -- '${3rd}/busted/library',
723-
-- },
724705
},
725706
})
726707
end,
727708
settings = {
728709
Lua = {},
729710
},
730711
})
712+
vim.lsp.enable 'lua_ls'
731713
end,
732714
},
733715

0 commit comments

Comments
 (0)