diff --git a/lua/lspconfig/configs/angularls.lua b/lua/lspconfig/configs/angularls.lua index c704f508da..91b076a1cb 100644 --- a/lua/lspconfig/configs/angularls.lua +++ b/lua/lspconfig/configs/angularls.lua @@ -4,7 +4,7 @@ local util = require 'lspconfig.util' -- in order to use your projects configured versions. -- This defaults to the vim cwd, but will get overwritten by the resolved root of the file. local function get_probe_dir(root_dir) - local project_root = vim.fs.find('node_modules', { path = root_dir, upward = true })[1] + local project_root = vim.fs.dirname(vim.fs.find('node_modules', { path = root_dir, upward = true })[1]) return project_root and (project_root .. '/node_modules') or '' end diff --git a/lua/lspconfig/configs/astro.lua b/lua/lspconfig/configs/astro.lua index 2600356dd5..23c3f76079 100644 --- a/lua/lspconfig/configs/astro.lua +++ b/lua/lspconfig/configs/astro.lua @@ -1,7 +1,7 @@ local util = require 'lspconfig.util' local function get_typescript_server_path(root_dir) - local project_root = vim.fs.find('node_modules', { path = root_dir, upward = true })[1] + local project_root = vim.fs.dirname(vim.fs.find('node_modules', { path = root_dir, upward = true })[1]) return project_root and (project_root .. '/typescript/lib') or '' end diff --git a/lua/lspconfig/configs/glint.lua b/lua/lspconfig/configs/glint.lua index 5c3c97c62c..9240a96979 100644 --- a/lua/lspconfig/configs/glint.lua +++ b/lua/lspconfig/configs/glint.lua @@ -4,7 +4,7 @@ return { default_config = { cmd = { 'glint-language-server' }, on_new_config = function(config, new_root_dir) - local project_root = vim.fs.find('node_modules', { path = new_root_dir, upward = true })[1] + local project_root = vim.fs.dirname(vim.fs.find('node_modules', { path = new_root_dir, upward = true })[1]) -- Glint should not be installed globally. local node_bin_path = project_root .. '/node_modules/.bin' local path = node_bin_path .. (vim.fn.has('win32') == 1 and ';' or ':') .. vim.env.PATH diff --git a/lua/lspconfig/configs/relay_lsp.lua b/lua/lspconfig/configs/relay_lsp.lua index 78ec20a0b9..cc8e2c5bb7 100644 --- a/lua/lspconfig/configs/relay_lsp.lua +++ b/lua/lspconfig/configs/relay_lsp.lua @@ -23,7 +23,7 @@ return { }, root_dir = util.root_pattern('relay.config.*', 'package.json'), on_new_config = function(config, root_dir) - local project_root = vim.fs.find('node_modules', { path = root_dir, upward = true })[1] + local project_root = vim.fs.dirname(vim.fs.find('node_modules', { path = root_dir, upward = true })[1]) local node_bin_path = project_root .. '/node_modules/.bin' local compiler_cmd = { node_bin_path .. '/relay-compiler', '--watch' } local path = node_bin_path .. (vim.fn.has('win32') == 1 and ';' or ':') .. vim.env.PATH diff --git a/lua/lspconfig/configs/volar.lua b/lua/lspconfig/configs/volar.lua index 1eb0ba3df5..b180f1a94c 100644 --- a/lua/lspconfig/configs/volar.lua +++ b/lua/lspconfig/configs/volar.lua @@ -1,7 +1,7 @@ local util = require 'lspconfig.util' local function get_typescript_server_path(root_dir) - local project_root = vim.fs.find('node_modules', { path = root_dir, upward = true })[1] + local project_root = vim.fs.dirname(vim.fs.find('node_modules', { path = root_dir, upward = true })[1]) return project_root and (project_root .. '/typescript/lib') or '' end