From 64073cbed0ce23e988160bfd1a148a75b6af94cc Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 6 Dec 2024 03:19:39 -0800 Subject: Revert "refactor: use simpler file existence check" #3495 This reverts commit 90c1c6cc822b1836209514c096069b9bbeab63d9. Fix #3485 --- lua/lspconfig/util.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lua/lspconfig/util.lua') diff --git a/lua/lspconfig/util.lua b/lua/lspconfig/util.lua index dbd3e789..1b186e85 100644 --- a/lua/lspconfig/util.lua +++ b/lua/lspconfig/util.lua @@ -240,7 +240,7 @@ function M.find_git_ancestor(startpath) return M.search_ancestors(startpath, function(path) -- Support git directories and git files (worktrees) local gitpath = M.path.join(path, '.git') - if vim.fn.isdirectory(gitpath) == 1 or (vim.fn.getftype(gitpath) == 'file') then + if vim.fn.isdirectory(gitpath) == 1 or (vim.loop.fs_stat(gitpath) or {}).type == 'file' then return path end end) @@ -257,7 +257,7 @@ 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.fn.getftype(jsonpath) == 'file' then + if (vim.loop.fs_stat(jsonpath) or {}).type == 'file' then return path end end) @@ -374,11 +374,11 @@ function M.path.is_dir(filename) return vim.fn.isdirectory(filename) == 1 end ---- @deprecated use `vim.fn.getftype(path) == 'file'` instead +--- @deprecated use `(vim.loop.fs_stat(path) or {}).type == 'file'` instead --- @param path string --- @return boolean function M.path.is_file(path) - return vim.fn.getftype(path) == 'file' + return (vim.loop.fs_stat(path) or {}).type == 'file' end --- @deprecated use `vim.fs.dirname` instead -- cgit v1.2.3-70-g09d2