fix(regression): fix for vim.fs.find regression not returning parent directory (#3505)

5 files changed, 11 insertions, 12 deletions

diff --git a/lua/lspconfig/configs/cssmodules_ls.lua b/lua/lspconfig/configs/cssmodules_ls.lua
index b05d66ff..d832bcd3 100644
--- a/lua/lspconfig/configs/cssmodules_ls.lua
+++ b/lua/lspconfig/configs/cssmodules_ls.lua
@@ -3,7 +3,7 @@ return {
     cmd = { 'cssmodules-language-server' },
     filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact' },
     root_dir = function(fname)
-      return vim.fs.find('package.json', { path = fname, upward = true })[1]
+      return vim.fs.dirname(vim.fs.find('package.json', { path = fname, upward = true })[1])
     end,
   },
   docs = {
diff --git a/lua/lspconfig/configs/pug.lua b/lua/lspconfig/configs/pug.lua
index 444e9830..f4a04895 100644
--- a/lua/lspconfig/configs/pug.lua
+++ b/lua/lspconfig/configs/pug.lua
@@ -3,7 +3,7 @@ return {
     cmd = { 'pug-lsp' },
     filetypes = { 'pug' },
     root_dir = function(fname)
-      return vim.fs.find('package.json', { path = fname, upward = true })[1]
+      return vim.fs.dirname(vim.fs.find('package.json', { path = fname, upward = true })[1])
     end,
   },
   docs = {
diff --git a/lua/lspconfig/configs/rome.lua b/lua/lspconfig/configs/rome.lua
index 09a3e6c4..7a9092d5 100644
--- a/lua/lspconfig/configs/rome.lua
+++ b/lua/lspconfig/configs/rome.lua
@@ -12,8 +12,8 @@ return {
       'typescriptreact',
     },
     root_dir = function(fname)
-      return vim.fs.find('package.json', { path = fname, upward = true })[1]
-        or vim.fs.find('node_modules', { path = fname, upward = true })[1]
+      return vim.fs.dirname(vim.fs.find('package.json', { path = fname, upward = true })[1])
+        or vim.fs.dirname(vim.fs.find('node_modules', { path = fname, upward = true })[1])
         or util.find_git_ancestor(fname)
     end,
     single_file_support = true,
diff --git a/lua/lspconfig/configs/tailwindcss.lua b/lua/lspconfig/configs/tailwindcss.lua
index 994e90f6..8ef9a081 100644
--- a/lua/lspconfig/configs/tailwindcss.lua
+++ b/lua/lspconfig/configs/tailwindcss.lua
@@ -109,10 +109,9 @@ return {
         'postcss.config.cjs',
         'postcss.config.mjs',
         'postcss.config.ts'
-      )(fname) or vim.fs.find('package.json', { path = fname, upward = true })[1] or vim.fs.find(
-        'node_modules',
-        { path = fname, upward = true }
-      )[1] or util.find_git_ancestor(fname)
+      )(fname) or vim.fs.dirname(vim.fs.find('package.json', { path = fname, upward = true })[1]) or vim.fs.dirname(
+        vim.fs.find('node_modules', { path = fname, upward = true })[1]
+      ) or util.find_git_ancestor(fname)
     end,
   },
   docs = {
diff --git a/lua/lspconfig/util.lua b/lua/lspconfig/util.lua
index a5cf67fd..cc97867f 100644
--- a/lua/lspconfig/util.lua
+++ b/lua/lspconfig/util.lua
@@ -248,7 +248,7 @@ end
 
 function M.insert_package_json(config_files, field, fname)
   local path = vim.fn.fnamemodify(fname, ':h')
-  local root_with_package = vim.fs.find('package.json', { path = path, upward = true })[1]
+  local root_with_package = vim.fs.dirname(vim.fs.find('package.json', { path = path, upward = true })[1])
 
   if root_with_package then
     -- only add package.json if it contains field parameter
@@ -380,17 +380,17 @@ end
 
 --- @deprecated use `vim.fs.find('.hg', { path = startpath, upward = true })[1]` instead
 function M.find_mercurial_ancestor(startpath)
-  return vim.fs.find('.hg', { path = startpath, upward = true })[1]
+  return vim.fs.dirname(vim.fs.find('.hg', { path = startpath, upward = true })[1])
 end
 
 --- @deprecated use `vim.fs.find('node_modules', { path = startpath, upward = true })[1]` instead
 function M.find_node_modules_ancestor(startpath)
-  return vim.fs.find('node_modules', { path = startpath, upward = true })[1]
+  return vim.fs.dirname(vim.fs.find('node_modules', { path = startpath, upward = true })[1])
 end
 
 --- @deprecated use `vim.fs.find('package.json', { path = startpath, upward = true })[1]` instead
 function M.find_package_json_ancestor(startpath)
-  return vim.fs.find('package.json', { path = startpath, upward = true })[1]
+  return vim.fs.dirname(vim.fs.find('package.json', { path = startpath, upward = true })[1])
 end
 
 return M