fix(nvim): unsupported lsp is not setup

spywhere · Oct 31, 2023 · b7d3345 · b7d3345
1 parent ed74208
commit b7d3345
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/configs/nvim/lua/lib/lsp.lua b/configs/nvim/lua/lib/lsp.lua
@@ -136,7 +136,7 @@ M.setup = function (name, options)
             setup_lsp(server, lsps[server], options)
           end
         end
-        name(handler)
+        name(handler, vim.tbl_keys(lsps))
       end)
     end
   elseif name == nil then

diff --git a/configs/nvim/lua/plugin/autocomplete/lspconfig.lua b/configs/nvim/lua/plugin/autocomplete/lspconfig.lua
@@ -7,8 +7,18 @@ registry.install {
     'williamboman/mason.nvim',
     'neovim/nvim-lspconfig'
   },
-  delay = lsp.setup(function (handler)
-    require('mason-lspconfig').setup {
+  delay = lsp.setup(function (handler, required_servers)
+    local mason_lsp = require('mason-lspconfig')
+
+    local available_servers = mason_lsp.get_available_servers()
+    for _, server in ipairs(required_servers) do
+      -- setup lsp manually for unsupported servers
+      if not available_servers[server] then
+        handler(server)
+      end
+    end
+
+    mason_lsp.setup {
       ensure_installed = {
         'bashls', 'emmet_ls', 'eslint', 'graphql', 'lua_ls', 'pyright', 'tsserver', 'vimls', 'yamlls'
       },