refactor: deprecate util.find_package_json_ancestor

Work on https://github.com/neovim/nvim-lspconfig/issues/2079.

5 files changed, 14 insertions, 18 deletions

diff --git a/lua/lspconfig/configs/cssmodules_ls.lua b/lua/lspconfig/configs/cssmodules_ls.lua
index 28973be7..b05d66ff 100644
--- a/lua/lspconfig/configs/cssmodules_ls.lua
+++ b/lua/lspconfig/configs/cssmodules_ls.lua
@@ -1,10 +1,10 @@
-local util = require 'lspconfig.util'
-
 return {
   default_config = {
     cmd = { 'cssmodules-language-server' },
     filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact' },
-    root_dir = util.find_package_json_ancestor,
+    root_dir = function(fname)
+      return vim.fs.find('package.json', { path = fname, upward = true })[1]
+    end,
   },
   docs = {
     description = [[
diff --git a/lua/lspconfig/configs/pug.lua b/lua/lspconfig/configs/pug.lua
index 28f7db61..444e9830 100644
--- a/lua/lspconfig/configs/pug.lua
+++ b/lua/lspconfig/configs/pug.lua
@@ -1,10 +1,10 @@
-local util = require 'lspconfig.util'
-
 return {
   default_config = {
     cmd = { 'pug-lsp' },
     filetypes = { 'pug' },
-    root_dir = util.find_package_json_ancestor,
+    root_dir = function(fname)
+      return vim.fs.find('package.json', { path = fname, upward = true })[1]
+    end,
   },
   docs = {
     description = [[
diff --git a/lua/lspconfig/configs/rome.lua b/lua/lspconfig/configs/rome.lua
index 831469e4..09a3e6c4 100644
--- a/lua/lspconfig/configs/rome.lua
+++ b/lua/lspconfig/configs/rome.lua
@@ -12,7 +12,7 @@ return {
       'typescriptreact',
     },
     root_dir = function(fname)
-      return util.find_package_json_ancestor(fname)
+      return 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)
     end,
diff --git a/lua/lspconfig/configs/tailwindcss.lua b/lua/lspconfig/configs/tailwindcss.lua
index 56ed05b4..994e90f6 100644
--- a/lua/lspconfig/configs/tailwindcss.lua
+++ b/lua/lspconfig/configs/tailwindcss.lua
@@ -109,7 +109,7 @@ return {
         'postcss.config.cjs',
         'postcss.config.mjs',
         'postcss.config.ts'
-      )(fname) or util.find_package_json_ancestor(fname) or vim.fs.find(
+      )(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)
diff --git a/lua/lspconfig/util.lua b/lua/lspconfig/util.lua
index 7b894ee3..a5cf67fd 100644
--- a/lua/lspconfig/util.lua
+++ b/lua/lspconfig/util.lua
@@ -246,18 +246,9 @@ function M.find_git_ancestor(startpath)
   end)
 end
 
-function M.find_package_json_ancestor(startpath)
-  return M.search_ancestors(startpath, function(path)
-    local jsonpath = M.path.join(path, 'package.json')
-    if (vim.loop.fs_stat(jsonpath) or {}).type == 'file' then
-      return path
-    end
-  end)
-end
-
 function M.insert_package_json(config_files, field, fname)
   local path = vim.fn.fnamemodify(fname, ':h')
-  local root_with_package = M.find_package_json_ancestor(path)
+  local root_with_package = vim.fs.find('package.json', { path = path, upward = true })[1]
 
   if root_with_package then
     -- only add package.json if it contains field parameter
@@ -397,4 +388,9 @@ function M.find_node_modules_ancestor(startpath)
   return 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]
+end
+
 return M