holm/LunarVim.LunarVim
1
0
Fork 0
mirror of https://github.com/LunarVim/LunarVim.git synced 2025-09-01 08:15:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: minor cleanup to root_dir comments (#1222)

Browse source
This commit is contained in:
kylo252 2021-08-04 08:35:51 +02:00 • committed by GitHub
commit 7cd03ff4e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lua/lsp/null-ls.lua
View file

@ -24,21 +24,19 @@ function M.get_registered_providers_by_filetype(ft)
end end
local function validate_nodejs_provider(requests, provider) local function validate_nodejs_provider(requests, provider)
local root_dir = "" local root_dir
if lvim.builtin.rooter.active then if lvim.builtin.rooter.active then
--- old logic to set root_dir --- use vim-rooter to set root_dir
vim.cmd "let root_dir = FindRootDirectory()" vim.cmd "let root_dir = FindRootDirectory()"
root_dir = vim.api.nvim_get_var "root_dir" root_dir = vim.api.nvim_get_var "root_dir"
else else
--- new logic to set root_dir --- use LSP to set root_dir
local ts_client = require("utils").get_active_client_by_ft "typescript" local ts_client = require("utils").get_active_client_by_ft "typescript"
if ts_client then
root_dir = ts_client.config.root_dir
end
if ts_client == nil then if ts_client == nil then
u.lvim_log "Unable to determine root directory since tsserver didn't start correctly" u.lvim_log "Unable to determine root directory since tsserver didn't start correctly"
return return
end end
root_dir = ts_client.config.root_dir
end end
local local_nodejs_command = root_dir .. "/node_modules/.bin/" .. provider._opts.command local local_nodejs_command = root_dir .. "/node_modules/.bin/" .. provider._opts.command
u.lvim_log(string.format("checking [%s] for local node module: [%s]", local_nodejs_command, vim.inspect(provider))) u.lvim_log(string.format("checking [%s] for local node module: [%s]", local_nodejs_command, vim.inspect(provider)))