From 620beb5c94dc4efd165fda80dfa1bbe27871b7cd Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Sun, 24 Oct 2021 14:34:00 +0200
Subject: fix(lsp): disable eslint server by default (#1842)

---
 lua/lvim/lsp/config.lua | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lua/lvim/lsp')

diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index 96430631..2d9104ea 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -46,6 +46,8 @@ return {
     "ansiblels",
     "denols",
     "ember",
+    "eslint",
+    "eslintls",
     "jedi_language_server",
     "pylsp",
     "rome",
-- 
cgit v1.2.3


From 6b8ef55e3de47224cd40de1d67831901484d3d5a Mon Sep 17 00:00:00 2001
From: Chase Colman <chase@colman.io>
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 +++++++---
 lua/lvim/lsp/templates.lua |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'lua/lvim/lsp')

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
 
diff --git a/lua/lvim/lsp/templates.lua b/lua/lvim/lsp/templates.lua
index 3478f4fb..33c75a6e 100644
--- a/lua/lvim/lsp/templates.lua
+++ b/lua/lvim/lsp/templates.lua
@@ -19,7 +19,8 @@ end
 ---@param server_name string name of a valid language server, e.g. pyright, gopls, tsserver, etc.
 ---@param dir string the full path to the desired directory
 function M.generate_ftplugin(server_name, dir)
-  if vim.tbl_contains(lvim.lsp.override, server_name) then
+  local has_custom_provider, _ = pcall(require, "lvim/lsp/providers/" .. server_name)
+  if vim.tbl_contains(lvim.lsp.override, server_name) and not has_custom_provider then
     return
   end
 
-- 
cgit v1.2.3