init.lua @ fdf2641

M lua/fk/lsp/init.lua

@@ -15,14 +15,7 @@ capabilities = require("cmp_nvim_lsp").update_capabilities(vim.lsp.protocol.make_client_capabilities()),
       flags = { debounce_text_changes = 150 },
     }
 
-    local ok, server_opts = pcall(require, "fk.lsp.providers." .. server.name)
-    if ok then
-      opts = vim.tbl_deep_extend("force", opts, server_opts or {})
-    end
-
-    if server.name == "sumneko_lua" then
-      opts = vim.tbl_extend("force", opts or {}, require("lua-dev").setup { lspconfig = server:get_default_options() })
-    end
+    opts = require "fk.lsp.providers"(server, opts)
 
     server:setup(opts)
     vim.cmd [[ do User LspAttachBuffers ]]

A lua/fk/lsp/providers/init.lua

@@ -0,0 +1,22 @@
+---@param server Server
+---@param opts table
+---@return table
+return function(server, opts)
+  if server.name == "sumneko_lua" then
+    return vim.tbl_extend("force", opts, require("lua-dev").setup { lspconfig = server:get_default_options() })
+  end
+
+  if server.name == "pyright" then
+    return vim.tbl_extend("force", opts, require "fk.lsp.providers.pyright")
+  end
+
+  if server.name == "yamlls" then
+    return vim.tbl_extend("force", opts, require "fk.lsp.providers.yamlls")
+  end
+
+  if server.name == "gopls" then
+    return vim.tbl_extend("force", opts, require "fk.lsp.providers.gopls")
+  end
+
+  return opts
+end