From 03b7da74eee555064741fbc54e667eb918e8aa52 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Thu, 12 Aug 2021 11:31:31 +0200
Subject: Fix formatting according to style-guide (#1057)

---
 lua/lsp/null-ls.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lua/lsp')

diff --git a/lua/lsp/null-ls.lua b/lua/lsp/null-ls.lua
index 697eac39..2ce98f2c 100644
--- a/lua/lsp/null-ls.lua
+++ b/lua/lsp/null-ls.lua
@@ -97,7 +97,7 @@ function M.setup(filetype)
     local builtin_formatter = null_ls.builtins.formatting[formatter.exe]
     if not vim.tbl_contains(M.requested_providers, builtin_formatter) then
       -- FIXME: why doesn't this work?
-      -- builtin_formatter._opts.args = formatter.args or builtin_formatter._opts.args
+      builtin_formatter._opts.args = formatter.args or builtin_formatter._opts.args
       -- builtin_formatter._opts.to_stdin = formatter.stdin or builtin_formatter._opts.to_stdin
       local resolved_path = validate_provider_request(builtin_formatter)
       if resolved_path then
-- 
cgit v1.2.3


From 70d139ac2771fac9b072aaebe505f9ac77480b2a Mon Sep 17 00:00:00 2001
From: Luc Sinet <Tastyep@users.noreply.github.com>
Date: Fri, 13 Aug 2021 22:32:56 +0200
Subject: [Refactor/Bugfix] Improve null ls handler (#1277)

---
 lua/lsp/init.lua               |   5 +-
 lua/lsp/null-ls.lua            | 142 -----------------------------------------
 lua/lsp/null-ls/formatters.lua |  79 +++++++++++++++++++++++
 lua/lsp/null-ls/init.lua       |  44 +++++++++++++
 lua/lsp/null-ls/linters.lua    |  79 +++++++++++++++++++++++
 lua/lsp/null-ls/services.lua   |  55 ++++++++++++++++
 lua/lsp/utils.lua              |  27 ++++++++
 7 files changed, 287 insertions(+), 144 deletions(-)
 delete mode 100644 lua/lsp/null-ls.lua
 create mode 100644 lua/lsp/null-ls/formatters.lua
 create mode 100644 lua/lsp/null-ls/init.lua
 create mode 100644 lua/lsp/null-ls/linters.lua
 create mode 100644 lua/lsp/null-ls/services.lua
 create mode 100644 lua/lsp/utils.lua

(limited to 'lua/lsp')

diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index e4ea02db..891147e5 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -1,5 +1,6 @@
 local M = {}
 local Log = require "core.log"
+
 function M.config()
   vim.lsp.protocol.CompletionItemKind = lvim.lsp.completion.item_kind
 
@@ -127,13 +128,13 @@ function M.common_on_attach(client, bufnr)
 end
 
 function M.setup(lang)
+  local lsp_utils = require "lsp.utils"
   local lsp = lvim.lang[lang].lsp
-  if require("utils").check_lsp_client_active(lsp.provider) then
+  if lsp_utils.is_client_active(lsp.provider) then
     return
   end
 
   local overrides = lvim.lsp.override
-
   if type(overrides) == "table" then
     if vim.tbl_contains(overrides, lang) then
       return
diff --git a/lua/lsp/null-ls.lua b/lua/lsp/null-ls.lua
deleted file mode 100644
index 2ce98f2c..00000000
--- a/lua/lsp/null-ls.lua
+++ /dev/null
@@ -1,142 +0,0 @@
-local M = {}
-local Log = require "core.log"
-
-local null_ls = require "null-ls"
-
-local nodejs_local_providers = { "prettier", "prettierd", "prettier_d_slim", "eslint_d", "eslint" }
-
-M.requested_providers = {}
-
-function M.get_registered_providers_by_filetype(ft)
-  local matches = {}
-  for _, provider in pairs(M.requested_providers) do
-    if vim.tbl_contains(provider.filetypes, ft) then
-      local provider_name = provider.name
-      -- special case: show "eslint_d" instead of eslint
-      -- https://github.com/jose-elias-alvarez/null-ls.nvim/blob/9b8458bd1648e84169a7e8638091ba15c2f20fc0/doc/BUILTINS.md#eslint
-      if string.find(provider._opts.command, "eslint_d") then
-        provider_name = "eslint_d"
-      end
-      table.insert(matches, provider_name)
-    end
-  end
-
-  return matches
-end
-
-function M.get_missing_providers_by_filetype(ft)
-  local matches = {}
-  for _, provider in pairs(M.requested_providers) do
-    if vim.tbl_contains(provider.filetypes, ft) then
-      local provider_name = provider.name
-
-      table.insert(matches, provider_name)
-    end
-  end
-
-  return matches
-end
-
-local function register_failed_request(ft, provider, operation)
-  if not lvim.lang[ft][operation]._failed_requests then
-    lvim.lang[ft][operation]._failed_requests = {}
-  end
-  table.insert(lvim.lang[ft][operation]._failed_requests, provider)
-end
-
-local function validate_nodejs_provider(provider)
-  local command_path
-  local root_dir
-  if lvim.builtin.rooter.active then
-    --- use vim-rooter to set root_dir
-    vim.cmd "let root_dir = FindRootDirectory()"
-    root_dir = vim.api.nvim_get_var "root_dir"
-  else
-    --- use LSP to set root_dir
-    local ts_client = require("utils").get_active_client_by_ft "typescript"
-    if ts_client == nil then
-      Log:get_default().error "Unable to determine root directory since tsserver didn't start correctly"
-      return
-    end
-    root_dir = ts_client.config.root_dir
-  end
-  local local_nodejs_command = root_dir .. "/node_modules/.bin/" .. provider._opts.command
-  Log:get_default().debug("checking for local node module: ", vim.inspect(provider))
-
-  if vim.fn.executable(local_nodejs_command) == 1 then
-    command_path = local_nodejs_command
-  elseif vim.fn.executable(provider._opts.command) == 1 then
-    Log:get_default().debug("checking in global path instead for node module", provider._opts.command)
-    command_path = provider._opts.command
-  else
-    Log:get_default().debug("Unable to find node module", provider._opts.command)
-  end
-  return command_path
-end
-
-local function validate_provider_request(provider)
-  if provider == "" or provider == nil then
-    return
-  end
-  -- NOTE: we can't use provider.name because eslint_d uses eslint name
-  if vim.tbl_contains(nodejs_local_providers, provider._opts.command) then
-    return validate_nodejs_provider(provider)
-  end
-  if vim.fn.executable(provider._opts.command) ~= 1 then
-    Log:get_default().debug("Unable to find the path for", vim.inspect(provider))
-    Log:get_default().warn("Unable to find the path for ", provider._opts.command)
-    return
-  end
-  return provider._opts.command
-end
-
--- TODO: for linters and formatters with spaces and '-' replace with '_'
-function M.setup(filetype)
-  for _, formatter in pairs(lvim.lang[filetype].formatters) do
-    Log:get_default().debug("validating format provider: ", formatter.exe)
-    local builtin_formatter = null_ls.builtins.formatting[formatter.exe]
-    if not vim.tbl_contains(M.requested_providers, builtin_formatter) then
-      -- FIXME: why doesn't this work?
-      builtin_formatter._opts.args = formatter.args or builtin_formatter._opts.args
-      -- builtin_formatter._opts.to_stdin = formatter.stdin or builtin_formatter._opts.to_stdin
-      local resolved_path = validate_provider_request(builtin_formatter)
-      if resolved_path then
-        builtin_formatter._opts.command = resolved_path
-        table.insert(M.requested_providers, builtin_formatter)
-        Log:get_default().info("Using format provider", builtin_formatter.name)
-      else
-        -- mark it here to avoid re-doing the lookup again
-        register_failed_request(filetype, formatter.exe, "formatters")
-      end
-    end
-  end
-
-  for _, linter in pairs(lvim.lang[filetype].linters) do
-    local builtin_diagnoser = null_ls.builtins.diagnostics[linter.exe]
-    Log:get_default().debug("validating lint provider: ", linter.exe)
-    -- special case: fallback to "eslint"
-    -- https://github.com/jose-elias-alvarez/null-ls.nvim/blob/9b8458bd1648e84169a7e8638091ba15c2f20fc0/doc/BUILTINS.md#eslint
-    -- if provider.exe
-    if linter.exe == "eslint_d" then
-      builtin_diagnoser = null_ls.builtins.diagnostics.eslint.with { command = "eslint_d" }
-    end
-    if not vim.tbl_contains(M.requested_providers, builtin_diagnoser) then
-      -- FIXME: why doesn't this work?
-      -- builtin_diagnoser._opts.args = linter.args or builtin_diagnoser._opts.args
-      -- builtin_diagnoser._opts.to_stdin = linter.stdin or builtin_diagnoser._opts.to_stdin
-      local resolved_path = validate_provider_request(builtin_diagnoser)
-      if resolved_path then
-        builtin_diagnoser._opts.command = resolved_path
-        table.insert(M.requested_providers, builtin_diagnoser)
-        Log:get_default().info("Using linter provider", builtin_diagnoser.name)
-      else
-        -- mark it here to avoid re-doing the lookup again
-        register_failed_request(filetype, linter.exe, "linters")
-      end
-    end
-  end
-
-  null_ls.register { sources = M.requested_providers }
-end
-
-return M
diff --git a/lua/lsp/null-ls/formatters.lua b/lua/lsp/null-ls/formatters.lua
new file mode 100644
index 00000000..dd88fa60
--- /dev/null
+++ b/lua/lsp/null-ls/formatters.lua
@@ -0,0 +1,79 @@
+local M = {}
+local formatters_by_ft = {}
+
+local null_ls = require "null-ls"
+local services = require "lsp.null-ls.services"
+local logger = require("core.log"):get_default()
+
+local function list_names(formatters, options)
+  options = options or {}
+  local names = {}
+
+  local filter = options.filter or "supported"
+  for name, _ in pairs(formatters[filter]) do
+    table.insert(names, name)
+  end
+
+  return names
+end
+
+function M.list_supported_names(filetype)
+  if not formatters_by_ft[filetype] then
+    return {}
+  end
+  return list_names(formatters_by_ft[filetype], { filter = "supported" })
+end
+
+function M.list_unsupported_names(filetype)
+  if not formatters_by_ft[filetype] then
+    return {}
+  end
+  return list_names(formatters_by_ft[filetype], { filter = "unsupported" })
+end
+
+function M.list_available(filetype)
+  local formatters = {}
+  for _, provider in pairs(null_ls.builtins.formatting) do
+    -- TODO: Add support for wildcard filetypes
+    if vim.tbl_contains(provider.filetypes or {}, filetype) then
+      table.insert(formatters, provider.name)
+    end
+  end
+
+  return formatters
+end
+
+function M.list_configured(formatter_configs)
+  local formatters, errors = {}, {}
+
+  for _, fmt_config in ipairs(formatter_configs) do
+    local formatter = null_ls.builtins.formatting[fmt_config.exe]
+
+    if not formatter then
+      logger.error("Not a valid formatter:", fmt_config.exe)
+      errors[fmt_config.exe] = {} -- Add data here when necessary
+    else
+      local formatter_cmd = services.find_command(formatter._opts.command)
+      if not formatter_cmd then
+        logger.warn("Not found:", formatter._opts.command)
+        errors[fmt_config.exe] = {} -- Add data here when necessary
+      else
+        logger.info("Using formatter:", formatter_cmd)
+        formatters[fmt_config.exe] = formatter.with { command = formatter_cmd, args = fmt_config.args }
+      end
+    end
+  end
+
+  return { supported = formatters, unsupported = errors }
+end
+
+function M.setup(filetype, options)
+  if formatters_by_ft[filetype] and not options.force_reload then
+    return
+  end
+
+  formatters_by_ft[filetype] = M.list_configured(lvim.lang[filetype].formatters)
+  null_ls.register { sources = formatters_by_ft[filetype].supported }
+end
+
+return M
diff --git a/lua/lsp/null-ls/init.lua b/lua/lsp/null-ls/init.lua
new file mode 100644
index 00000000..8691982e
--- /dev/null
+++ b/lua/lsp/null-ls/init.lua
@@ -0,0 +1,44 @@
+local M = {}
+
+function M.list_supported_provider_names(filetype)
+  local names = {}
+
+  local formatters = require "lsp.null-ls.formatters"
+  local linters = require "lsp.null-ls.linters"
+
+  vim.list_extend(names, formatters.list_supported_names(filetype))
+  vim.list_extend(names, linters.list_supported_names(filetype))
+
+  return names
+end
+
+function M.list_unsupported_provider_names(filetype)
+  local names = {}
+
+  local formatters = require "lsp.null-ls.formatters"
+  local linters = require "lsp.null-ls.linters"
+
+  vim.list_extend(names, formatters.list_unsupported_names(filetype))
+  vim.list_extend(names, linters.list_unsupported_names(filetype))
+
+  return names
+end
+
+-- TODO: for linters and formatters with spaces and '-' replace with '_'
+function M.setup(filetype, options)
+  options = options or {}
+
+  local ok, _ = pcall(require, "null-ls")
+  if not ok then
+    require("core.log"):get_default().error "Missing null-ls dependency"
+    return
+  end
+
+  local formatters = require "lsp.null-ls.formatters"
+  local linters = require "lsp.null-ls.linters"
+
+  formatters.setup(filetype, options)
+  linters.setup(filetype, options)
+end
+
+return M
diff --git a/lua/lsp/null-ls/linters.lua b/lua/lsp/null-ls/linters.lua
new file mode 100644
index 00000000..780a9c4d
--- /dev/null
+++ b/lua/lsp/null-ls/linters.lua
@@ -0,0 +1,79 @@
+local M = {}
+local linters_by_ft = {}
+
+local null_ls = require "null-ls"
+local services = require "lsp.null-ls.services"
+local logger = require("core.log"):get_default()
+
+local function list_names(linters, options)
+  options = options or {}
+  local names = {}
+
+  local filter = options.filter or "supported"
+  for name, _ in pairs(linters[filter]) do
+    table.insert(names, name)
+  end
+
+  return names
+end
+
+function M.list_supported_names(filetype)
+  if not linters_by_ft[filetype] then
+    return {}
+  end
+  return list_names(linters_by_ft[filetype], { filter = "supported" })
+end
+
+function M.list_unsupported_names(filetype)
+  if not linters_by_ft[filetype] then
+    return {}
+  end
+  return list_names(linters_by_ft[filetype], { filter = "unsupported" })
+end
+
+function M.list_available(filetype)
+  local linters = {}
+  for _, provider in pairs(null_ls.builtins.diagnostics) do
+    -- TODO: Add support for wildcard filetypes
+    if vim.tbl_contains(provider.filetypes or {}, filetype) then
+      table.insert(linters, provider.name)
+    end
+  end
+
+  return linters
+end
+
+function M.list_configured(linter_configs)
+  local linters, errors = {}, {}
+
+  for _, lnt_config in pairs(linter_configs) do
+    local linter = null_ls.builtins.diagnostics[lnt_config.exe]
+
+    if not linter then
+      logger.error("Not a valid linter:", lnt_config.exe)
+      errors[lnt_config.exe] = {} -- Add data here when necessary
+    else
+      local linter_cmd = services.find_command(linter._opts.command)
+      if not linter_cmd then
+        logger.warn("Not found:", linter._opts.command)
+        errors[lnt_config.exe] = {} -- Add data here when necessary
+      else
+        logger.info("Using linter:", linter_cmd)
+        linters[lnt_config.exe] = linter.with { command = linter_cmd, args = lnt_config.args }
+      end
+    end
+  end
+
+  return { supported = linters, unsupported = errors }
+end
+
+function M.setup(filetype, options)
+  if linters_by_ft[filetype] and not options.force_reload then
+    return
+  end
+
+  linters_by_ft[filetype] = M.list_configured(lvim.lang[filetype].linters)
+  null_ls.register { sources = linters_by_ft[filetype].supported }
+end
+
+return M
diff --git a/lua/lsp/null-ls/services.lua b/lua/lsp/null-ls/services.lua
new file mode 100644
index 00000000..89073e5c
--- /dev/null
+++ b/lua/lsp/null-ls/services.lua
@@ -0,0 +1,55 @@
+local M = {}
+
+local logger = require("core.log"):get_default()
+
+local function find_root_dir()
+  if lvim.builtin.rooter.active then
+    --- use vim-rooter to set root_dir
+    vim.cmd "let root_dir = FindRootDirectory()"
+    return vim.api.nvim_get_var "root_dir"
+  end
+
+  -- TODO: Rework this to not make it javascript specific
+  --- use LSP to set root_dir
+  local lsp_utils = require "lsp.utils"
+  local ts_client = lsp_utils.get_active_client_by_ft "typescript"
+  if ts_client == nil then
+    logger.error "Unable to determine root directory since tsserver didn't start correctly"
+    return nil
+  end
+
+  return ts_client.config.root_dir
+end
+
+local function from_node_modules(command)
+  local root_dir = find_root_dir()
+  if not root_dir then
+    return nil
+  end
+
+  return root_dir .. "/node_modules/.bin/" .. command
+end
+
+local local_providers = {
+  prettier = { find = from_node_modules },
+  prettierd = { find = from_node_modules },
+  prettier_d_slim = { find = from_node_modules },
+  eslint_d = { find = from_node_modules },
+  eslint = { find = from_node_modules },
+}
+
+function M.find_command(command)
+  if local_providers[command] then
+    local local_command = local_providers[command].find(command)
+    if local_command and vim.fn.executable(local_command) == 1 then
+      return local_command
+    end
+  end
+
+  if vim.fn.executable(command) == 1 then
+    return command
+  end
+  return nil
+end
+
+return M
diff --git a/lua/lsp/utils.lua b/lua/lsp/utils.lua
new file mode 100644
index 00000000..e28c6085
--- /dev/null
+++ b/lua/lsp/utils.lua
@@ -0,0 +1,27 @@
+local M = {}
+
+function M.is_client_active(name)
+  local clients = vim.lsp.get_active_clients()
+  for _, client in pairs(clients) do
+    if client.name == name then
+      return true
+    end
+  end
+  return false
+end
+
+function M.get_active_client_by_ft(filetype)
+  if not lvim.lang[filetype] or not lvim.lang[filetype].lsp then
+    return nil
+  end
+
+  local clients = vim.lsp.get_active_clients()
+  for _, client in pairs(clients) do
+    if client.name == lvim.lang[filetype].lsp.provider then
+      return client
+    end
+  end
+  return nil
+end
+
+return M
-- 
cgit v1.2.3


From 6e0f56f09ec66f7e00ec095456fb113fdf6b07cb Mon Sep 17 00:00:00 2001
From: Luc Sinet <Tastyep@users.noreply.github.com>
Date: Sat, 14 Aug 2021 22:02:17 +0200
Subject: [Bugfix] Support extending null builtin args (#1317)

---
 lua/lsp/null-ls/formatters.lua | 9 ++-------
 lua/lsp/null-ls/linters.lua    | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'lua/lsp')

diff --git a/lua/lsp/null-ls/formatters.lua b/lua/lsp/null-ls/formatters.lua
index dd88fa60..d6ede29d 100644
--- a/lua/lsp/null-ls/formatters.lua
+++ b/lua/lsp/null-ls/formatters.lua
@@ -7,14 +7,9 @@ local logger = require("core.log"):get_default()
 
 local function list_names(formatters, options)
   options = options or {}
-  local names = {}
-
   local filter = options.filter or "supported"
-  for name, _ in pairs(formatters[filter]) do
-    table.insert(names, name)
-  end
 
-  return names
+  return vim.tbl_keys(formatters[filter])
 end
 
 function M.list_supported_names(filetype)
@@ -59,7 +54,7 @@ function M.list_configured(formatter_configs)
         errors[fmt_config.exe] = {} -- Add data here when necessary
       else
         logger.info("Using formatter:", formatter_cmd)
-        formatters[fmt_config.exe] = formatter.with { command = formatter_cmd, args = fmt_config.args }
+        formatters[fmt_config.exe] = formatter.with { command = formatter_cmd, extra_args = fmt_config.args }
       end
     end
   end
diff --git a/lua/lsp/null-ls/linters.lua b/lua/lsp/null-ls/linters.lua
index 780a9c4d..64d2db4a 100644
--- a/lua/lsp/null-ls/linters.lua
+++ b/lua/lsp/null-ls/linters.lua
@@ -7,14 +7,9 @@ local logger = require("core.log"):get_default()
 
 local function list_names(linters, options)
   options = options or {}
-  local names = {}
-
   local filter = options.filter or "supported"
-  for name, _ in pairs(linters[filter]) do
-    table.insert(names, name)
-  end
 
-  return names
+  return vim.tbl_keys(linters[filter])
 end
 
 function M.list_supported_names(filetype)
@@ -59,7 +54,7 @@ function M.list_configured(linter_configs)
         errors[lnt_config.exe] = {} -- Add data here when necessary
       else
         logger.info("Using linter:", linter_cmd)
-        linters[lnt_config.exe] = linter.with { command = linter_cmd, args = lnt_config.args }
+        linters[lnt_config.exe] = linter.with { command = linter_cmd, extra_args = lnt_config.args }
       end
     end
   end
-- 
cgit v1.2.3


From 335e707b2aae38c0cd5d0d962b27038ab1117aa6 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Tue, 17 Aug 2021 17:20:18 +0200
Subject: [Feature] Make the rest of the builtins configurable (#1318)

---
 lua/lsp/init.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lua/lsp')

diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index 891147e5..920aceb3 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -34,7 +34,11 @@ local function lsp_highlight_document(client)
 end
 
 local function add_lsp_buffer_keybindings(bufnr)
-  local wk = require "which-key"
+  local status_ok, wk = pcall(require, "which-key")
+  if not status_ok then
+    return
+  end
+
   local keys = {
     ["K"] = { "<cmd>lua vim.lsp.buf.hover()<CR>", "Show hover" },
     ["gd"] = { "<cmd>lua vim.lsp.buf.definition()<CR>", "Goto Definition" },
-- 
cgit v1.2.3


From 08c0dca3071ec2df16553dd724836307999e6aef Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Tue, 17 Aug 2021 17:26:59 +0200
Subject: [Refactor]: Remove vim-rooter dependency (#1319)

---
 lua/lsp/null-ls/services.lua | 26 ++++++++++----------------
 lua/lsp/utils.lua            |  3 ++-
 2 files changed, 12 insertions(+), 17 deletions(-)

(limited to 'lua/lsp')

diff --git a/lua/lsp/null-ls/services.lua b/lua/lsp/null-ls/services.lua
index 89073e5c..6f3516ad 100644
--- a/lua/lsp/null-ls/services.lua
+++ b/lua/lsp/null-ls/services.lua
@@ -1,29 +1,23 @@
 local M = {}
 
-local logger = require("core.log"):get_default()
-
 local function find_root_dir()
-  if lvim.builtin.rooter.active then
-    --- use vim-rooter to set root_dir
-    vim.cmd "let root_dir = FindRootDirectory()"
-    return vim.api.nvim_get_var "root_dir"
-  end
-
-  -- TODO: Rework this to not make it javascript specific
-  --- use LSP to set root_dir
+  local util = require "lspconfig/util"
   local lsp_utils = require "lsp.utils"
-  local ts_client = lsp_utils.get_active_client_by_ft "typescript"
-  if ts_client == nil then
-    logger.error "Unable to determine root directory since tsserver didn't start correctly"
-    return nil
-  end
 
-  return ts_client.config.root_dir
+  local status_ok, ts_client = lsp_utils.is_client_active "typescript"
+  if status_ok then
+    return ts_client.config.root_dir
+  end
+  local dirname = vim.fn.expand "%:p:h"
+  return util.root_pattern "package.json"(dirname)
 end
 
 local function from_node_modules(command)
+  local logger = require("core.log"):get_default()
   local root_dir = find_root_dir()
+
   if not root_dir then
+    logger.error(string.format("Unable to find the [%s] node module.", command))
     return nil
   end
 
diff --git a/lua/lsp/utils.lua b/lua/lsp/utils.lua
index e28c6085..17b9c3bc 100644
--- a/lua/lsp/utils.lua
+++ b/lua/lsp/utils.lua
@@ -4,12 +4,13 @@ function M.is_client_active(name)
   local clients = vim.lsp.get_active_clients()
   for _, client in pairs(clients) do
     if client.name == name then
-      return true
+      return true, client
     end
   end
   return false
 end
 
+-- FIXME: this should return a list instead
 function M.get_active_client_by_ft(filetype)
   if not lvim.lang[filetype] or not lvim.lang[filetype].lsp then
     return nil
-- 
cgit v1.2.3


From 21b621c95af592d0da46a29fe4dcc02e5d16c6eb Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Tue, 17 Aug 2021 21:08:19 +0200
Subject: fix: remove wrongful log entry from null-ls setup (#1341)

---
 lua/lsp/null-ls/services.lua | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lua/lsp')

diff --git a/lua/lsp/null-ls/services.lua b/lua/lsp/null-ls/services.lua
index 6f3516ad..a1e3a06c 100644
--- a/lua/lsp/null-ls/services.lua
+++ b/lua/lsp/null-ls/services.lua
@@ -13,11 +13,9 @@ local function find_root_dir()
 end
 
 local function from_node_modules(command)
-  local logger = require("core.log"):get_default()
   local root_dir = find_root_dir()
 
   if not root_dir then
-    logger.error(string.format("Unable to find the [%s] node module.", command))
     return nil
   end
 
-- 
cgit v1.2.3


From b9b9c69615b469146e3cc75adcf9bd61047404eb Mon Sep 17 00:00:00 2001
From: Ahmed Khalf <ahmedkhalf567@gmail.com>
Date: Wed, 18 Aug 2021 09:34:26 +0400
Subject: [Refactor]: Remove vim-rooter and smart-cwd; then use project.nvim
 (#1315)

* Replace vim-rooter with project.nvim

* Implement stylua format

* Remove smart_cwd

* Implicitly update nvim-tree dir when project active

* Link datapath to cache

* Fix stylua

* Fix lint

* Fix telescope bug

* Fix telescope dependency

* Fix telescope once and for all

* Fix telescope once again
---
 lua/lsp/init.lua | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'lua/lsp')

diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index 920aceb3..1a6ceda3 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -55,14 +55,6 @@ local function add_lsp_buffer_keybindings(bufnr)
   wk.register(keys, { mode = "n", buffer = bufnr })
 end
 
-local function set_smart_cwd(client)
-  local proj_dir = client.config.root_dir
-  if lvim.lsp.smart_cwd and proj_dir ~= "/" then
-    vim.api.nvim_set_current_dir(proj_dir)
-    require("core.nvimtree").change_tree_dir(proj_dir)
-  end
-end
-
 function M.common_capabilities()
   local capabilities = vim.lsp.protocol.make_client_capabilities()
   capabilities.textDocument.completion.completionItem.snippetSupport = true
@@ -127,7 +119,6 @@ function M.common_on_attach(client, bufnr)
   end
   lsp_highlight_document(client)
   add_lsp_buffer_keybindings(bufnr)
-  set_smart_cwd(client)
   require("lsp.null-ls").setup(vim.bo.filetype)
 end
 
-- 
cgit v1.2.3


From 1f45d1531d3636102f8971f8b2103b5302f48b68 Mon Sep 17 00:00:00 2001
From: Abouzar Parvan <abzcoding@users.noreply.github.com>
Date: Thu, 19 Aug 2021 18:30:44 +0430
Subject: [Bugfix] fix formatter/linter nil issue (#1353)

* fix formatter/linter issue for undefined lang/filetypes

* revrese the order
---
 lua/lsp/null-ls/formatters.lua | 2 +-
 lua/lsp/null-ls/linters.lua    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lua/lsp')

diff --git a/lua/lsp/null-ls/formatters.lua b/lua/lsp/null-ls/formatters.lua
index d6ede29d..cae1fa7d 100644
--- a/lua/lsp/null-ls/formatters.lua
+++ b/lua/lsp/null-ls/formatters.lua
@@ -63,7 +63,7 @@ function M.list_configured(formatter_configs)
 end
 
 function M.setup(filetype, options)
-  if formatters_by_ft[filetype] and not options.force_reload then
+  if not lvim.lang[filetype] or (formatters_by_ft[filetype] and not options.force_reload) then
     return
   end
 
diff --git a/lua/lsp/null-ls/linters.lua b/lua/lsp/null-ls/linters.lua
index 64d2db4a..b449a4f2 100644
--- a/lua/lsp/null-ls/linters.lua
+++ b/lua/lsp/null-ls/linters.lua
@@ -63,7 +63,7 @@ function M.list_configured(linter_configs)
 end
 
 function M.setup(filetype, options)
-  if linters_by_ft[filetype] and not options.force_reload then
+  if not lvim.lang[filetype] or (linters_by_ft[filetype] and not options.force_reload) then
     return
   end
 
-- 
cgit v1.2.3


From 2bcbed14999f3c846028037c56ca855ef374d86c Mon Sep 17 00:00:00 2001
From: Abouzar Parvan <abzcoding@users.noreply.github.com>
Date: Fri, 20 Aug 2021 16:34:02 +0430
Subject: [feature] Move common parts of language server setup to lsp/init
 (#1355)

* moving common parts of language server setup to lsp/init

* fix formatting
---
 lua/lsp/init.lua | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'lua/lsp')

diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index 1a6ceda3..631f142a 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -138,6 +138,17 @@ function M.setup(lang)
 
   if lsp.provider ~= nil and lsp.provider ~= "" then
     local lspconfig = require "lspconfig"
+
+    if not lsp.setup.on_attach then
+      lsp.setup.on_attach = M.common_on_attach
+    end
+    if not lsp.setup.on_init then
+      lsp.setup.on_init = M.common_on_init
+    end
+    if not lsp.setup.capabilities then
+      lsp.setup.capabilities = M.common_capabilities()
+    end
+
     lspconfig[lsp.provider].setup(lsp.setup)
   end
 end
-- 
cgit v1.2.3


From 5b94e3cee2c4405e98c9c0e8769670723a1f4bae Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Thu, 26 Aug 2021 12:49:29 +0200
Subject: fix logging when plenary is not available (#1390)

---
 lua/lsp/init.lua               | 6 ++----
 lua/lsp/null-ls/formatters.lua | 8 ++++----
 lua/lsp/null-ls/init.lua       | 2 +-
 lua/lsp/null-ls/linters.lua    | 8 ++++----
 4 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'lua/lsp')

diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index 631f142a..94fcf550 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -99,16 +99,14 @@ end
 function M.common_on_init(client, bufnr)
   if lvim.lsp.on_init_callback then
     lvim.lsp.on_init_callback(client, bufnr)
-    Log:get_default().info "Called lsp.on_init_callback"
+    Log:info "Called lsp.on_init_callback"
     return
   end
 
   local formatters = lvim.lang[vim.bo.filetype].formatters
   if not vim.tbl_isempty(formatters) and formatters[1]["exe"] ~= nil and formatters[1].exe ~= "" then
     client.resolved_capabilities.document_formatting = false
-    Log:get_default().info(
-      string.format("Overriding language server [%s] with format provider [%s]", client.name, formatters[1].exe)
-    )
+    Log:info(string.format("Overriding language server [%s] with format provider [%s]", client.name, formatters[1].exe))
   end
 end
 
diff --git a/lua/lsp/null-ls/formatters.lua b/lua/lsp/null-ls/formatters.lua
index cae1fa7d..05e0ec62 100644
--- a/lua/lsp/null-ls/formatters.lua
+++ b/lua/lsp/null-ls/formatters.lua
@@ -3,7 +3,7 @@ local formatters_by_ft = {}
 
 local null_ls = require "null-ls"
 local services = require "lsp.null-ls.services"
-local logger = require("core.log"):get_default()
+local Log = require "core.log"
 
 local function list_names(formatters, options)
   options = options or {}
@@ -45,15 +45,15 @@ function M.list_configured(formatter_configs)
     local formatter = null_ls.builtins.formatting[fmt_config.exe]
 
     if not formatter then
-      logger.error("Not a valid formatter:", fmt_config.exe)
+      Log:error("Not a valid formatter:", fmt_config.exe)
       errors[fmt_config.exe] = {} -- Add data here when necessary
     else
       local formatter_cmd = services.find_command(formatter._opts.command)
       if not formatter_cmd then
-        logger.warn("Not found:", formatter._opts.command)
+        Log:warn("Not found:", formatter._opts.command)
         errors[fmt_config.exe] = {} -- Add data here when necessary
       else
-        logger.info("Using formatter:", formatter_cmd)
+        Log:info("Using formatter:", formatter_cmd)
         formatters[fmt_config.exe] = formatter.with { command = formatter_cmd, extra_args = fmt_config.args }
       end
     end
diff --git a/lua/lsp/null-ls/init.lua b/lua/lsp/null-ls/init.lua
index 8691982e..ce4c07d9 100644
--- a/lua/lsp/null-ls/init.lua
+++ b/lua/lsp/null-ls/init.lua
@@ -30,7 +30,7 @@ function M.setup(filetype, options)
 
   local ok, _ = pcall(require, "null-ls")
   if not ok then
-    require("core.log"):get_default().error "Missing null-ls dependency"
+    require("core.log"):error "Missing null-ls dependency"
     return
   end
 
diff --git a/lua/lsp/null-ls/linters.lua b/lua/lsp/null-ls/linters.lua
index b449a4f2..70c59974 100644
--- a/lua/lsp/null-ls/linters.lua
+++ b/lua/lsp/null-ls/linters.lua
@@ -3,7 +3,7 @@ local linters_by_ft = {}
 
 local null_ls = require "null-ls"
 local services = require "lsp.null-ls.services"
-local logger = require("core.log"):get_default()
+local Log = require "core.log"
 
 local function list_names(linters, options)
   options = options or {}
@@ -45,15 +45,15 @@ function M.list_configured(linter_configs)
     local linter = null_ls.builtins.diagnostics[lnt_config.exe]
 
     if not linter then
-      logger.error("Not a valid linter:", lnt_config.exe)
+      Log:error("Not a valid linter:", lnt_config.exe)
       errors[lnt_config.exe] = {} -- Add data here when necessary
     else
       local linter_cmd = services.find_command(linter._opts.command)
       if not linter_cmd then
-        logger.warn("Not found:", linter._opts.command)
+        Log:warn("Not found:", linter._opts.command)
         errors[lnt_config.exe] = {} -- Add data here when necessary
       else
-        logger.info("Using linter:", linter_cmd)
+        Log:info("Using linter:", linter_cmd)
         linters[lnt_config.exe] = linter.with { command = linter_cmd, extra_args = lnt_config.args }
       end
     end
-- 
cgit v1.2.3


From 27679f988fe187f9831ba7895c9c3a7ce2dd14f4 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Thu, 26 Aug 2021 20:32:16 +0200
Subject: [Refactor]: only allow a single logger (#1405)

---
 lua/lsp/init.lua               | 8 +++++---
 lua/lsp/null-ls/formatters.lua | 2 +-
 lua/lsp/null-ls/linters.lua    | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'lua/lsp')

diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index 94fcf550..f3b019aa 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -99,21 +99,23 @@ end
 function M.common_on_init(client, bufnr)
   if lvim.lsp.on_init_callback then
     lvim.lsp.on_init_callback(client, bufnr)
-    Log:info "Called lsp.on_init_callback"
+    Log:debug "Called lsp.on_init_callback"
     return
   end
 
   local formatters = lvim.lang[vim.bo.filetype].formatters
   if not vim.tbl_isempty(formatters) and formatters[1]["exe"] ~= nil and formatters[1].exe ~= "" then
     client.resolved_capabilities.document_formatting = false
-    Log:info(string.format("Overriding language server [%s] with format provider [%s]", client.name, formatters[1].exe))
+    Log:debug(
+      string.format("Overriding language server [%s] with format provider [%s]", client.name, formatters[1].exe)
+    )
   end
 end
 
 function M.common_on_attach(client, bufnr)
   if lvim.lsp.on_attach_callback then
     lvim.lsp.on_attach_callback(client, bufnr)
-    Log:get_default().info "Called lsp.on_init_callback"
+    Log:debug "Called lsp.on_init_callback"
   end
   lsp_highlight_document(client)
   add_lsp_buffer_keybindings(bufnr)
diff --git a/lua/lsp/null-ls/formatters.lua b/lua/lsp/null-ls/formatters.lua
index 05e0ec62..26be00da 100644
--- a/lua/lsp/null-ls/formatters.lua
+++ b/lua/lsp/null-ls/formatters.lua
@@ -53,7 +53,7 @@ function M.list_configured(formatter_configs)
         Log:warn("Not found:", formatter._opts.command)
         errors[fmt_config.exe] = {} -- Add data here when necessary
       else
-        Log:info("Using formatter:", formatter_cmd)
+        Log:debug("Using formatter:", formatter_cmd)
         formatters[fmt_config.exe] = formatter.with { command = formatter_cmd, extra_args = fmt_config.args }
       end
     end
diff --git a/lua/lsp/null-ls/linters.lua b/lua/lsp/null-ls/linters.lua
index 70c59974..bc191d7e 100644
--- a/lua/lsp/null-ls/linters.lua
+++ b/lua/lsp/null-ls/linters.lua
@@ -53,7 +53,7 @@ function M.list_configured(linter_configs)
         Log:warn("Not found:", linter._opts.command)
         errors[lnt_config.exe] = {} -- Add data here when necessary
       else
-        Log:info("Using linter:", linter_cmd)
+        Log:debug("Using linter:", linter_cmd)
         linters[lnt_config.exe] = linter.with { command = linter_cmd, extra_args = lnt_config.args }
       end
     end
-- 
cgit v1.2.3


From d0083e488d8b0d4e38ca71558787a427688b1cb2 Mon Sep 17 00:00:00 2001
From: Chae SM <smchae9@gmail.com>
Date: Thu, 26 Aug 2021 21:05:47 -0700
Subject: Remap 'Goto implementation' binding from gi to gI

---
 lua/lsp/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lua/lsp')

diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index f3b019aa..9c948803 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -44,7 +44,7 @@ local function add_lsp_buffer_keybindings(bufnr)
     ["gd"] = { "<cmd>lua vim.lsp.buf.definition()<CR>", "Goto Definition" },
     ["gD"] = { "<cmd>lua vim.lsp.buf.declaration()<CR>", "Goto declaration" },
     ["gr"] = { "<cmd>lua vim.lsp.buf.references()<CR>", "Goto references" },
-    ["gi"] = { "<cmd>lua vim.lsp.buf.implementation()<CR>", "Goto implementation" },
+    ["gI"] = { "<cmd>lua vim.lsp.buf.implementation()<CR>", "Goto Implementation" },
     ["gs"] = { "<cmd>lua vim.lsp.buf.signature_help()<CR>", "show signature help" },
     ["gp"] = { "<cmd>lua require'lsp.peek'.Peek('definition')<CR>", "Peek definition" },
     ["gl"] = {
-- 
cgit v1.2.3