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/null-ls/services.lua | 55 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 lua/lsp/null-ls/services.lua

(limited to 'lua/lsp/null-ls/services.lua')

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
-- 
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 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

(limited to 'lua/lsp/null-ls/services.lua')

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
 
-- 
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/null-ls/services.lua')

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