diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2024-12-06 03:19:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-06 03:19:39 -0800 |
| commit | 64073cbed0ce23e988160bfd1a148a75b6af94cc (patch) | |
| tree | e0fe72bb119de8903bd716f6bc510c2e1d4c11f7 /lua | |
| parent | fix(typst_lsp): deprecate typst_lsp to tinymist (#3493) (diff) | |
| download | nvim-lspconfig-64073cbed0ce23e988160bfd1a148a75b6af94cc.tar nvim-lspconfig-64073cbed0ce23e988160bfd1a148a75b6af94cc.tar.gz nvim-lspconfig-64073cbed0ce23e988160bfd1a148a75b6af94cc.tar.bz2 nvim-lspconfig-64073cbed0ce23e988160bfd1a148a75b6af94cc.tar.lz nvim-lspconfig-64073cbed0ce23e988160bfd1a148a75b6af94cc.tar.xz nvim-lspconfig-64073cbed0ce23e988160bfd1a148a75b6af94cc.tar.zst nvim-lspconfig-64073cbed0ce23e988160bfd1a148a75b6af94cc.zip | |
Revert "refactor: use simpler file existence check" #3495
This reverts commit 90c1c6cc822b1836209514c096069b9bbeab63d9.
Fix #3485
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lspconfig/configs/fennel_ls.lua | 2 | ||||
| -rw-r--r-- | lua/lspconfig/configs/turtle_ls.lua | 2 | ||||
| -rw-r--r-- | lua/lspconfig/util.lua | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lua/lspconfig/configs/fennel_ls.lua b/lua/lspconfig/configs/fennel_ls.lua index d1827cf4..273f1fed 100644 --- a/lua/lspconfig/configs/fennel_ls.lua +++ b/lua/lspconfig/configs/fennel_ls.lua @@ -7,7 +7,7 @@ return { root_dir = function(dir) local has_fls_project_cfg = function(path) local fnlpath = vim.fs.joinpath(path, 'flsproject.fnl') - return vim.fn.getftype(fnlpath) == 'file' + return (vim.loop.fs_stat(fnlpath) or {}).type == 'file' end return util.search_ancestors(dir, has_fls_project_cfg) or vim.fs.root(0, '.git') end, diff --git a/lua/lspconfig/configs/turtle_ls.lua b/lua/lspconfig/configs/turtle_ls.lua index e9d985e2..220953fd 100644 --- a/lua/lspconfig/configs/turtle_ls.lua +++ b/lua/lspconfig/configs/turtle_ls.lua @@ -17,7 +17,7 @@ if bin_path == nil then end for _, p in ipairs(paths) do local candidate = util.path.join(p, bin_name) - if vim.fn.getftype(candidate) == 'file' then + if (vim.loop.fs_stat(candidate) or {}).type == 'file' then full_path = candidate break end 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 |
