From 6b8ef55e3de47224cd40de1d67831901484d3d5a Mon Sep 17 00:00:00 2001 From: Chase Colman Date: Thu, 28 Oct 2021 21:15:49 +0800 Subject: fix(lsp): install templates and configure overrides for custom providers --- lua/lvim/lsp/manager.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lua/lvim/lsp/manager.lua') diff --git a/lua/lvim/lsp/manager.lua b/lua/lvim/lsp/manager.lua index 0b11c175..a8544803 100644 --- a/lua/lvim/lsp/manager.lua +++ b/lua/lvim/lsp/manager.lua @@ -26,8 +26,8 @@ local function resolve_config(name, user_config) capabilities = require("lvim.lsp").common_capabilities(), } - local status_ok, custom_config = pcall(require, "lvim.lsp/providers/" .. name) - if status_ok then + local has_custom_provider, custom_config = pcall(require, "lvim/lsp/providers/" .. name) + if has_custom_provider then Log:debug("Using custom configuration for requested server: " .. name) config = vim.tbl_deep_extend("force", config, custom_config) end @@ -70,7 +70,11 @@ function M.setup(server_name, user_config) if server_available and ensure_installed(requested_server) then requested_server:setup(config) else - require("lspconfig")[server_name].setup(config) + -- since it may not be installed, don't attempt to configure the LSP unless there is a custom provider + local has_custom_provider, _ = pcall(require, "lvim/lsp/providers/" .. server_name) + if has_custom_provider then + require("lspconfig")[server_name].setup(config) + end end end -- cgit v1.2.3