feat(#3310): minimum neovim version 0.10

Author: alex-courtis

lua/nvim-tree/actions/finders/find-file.lua

@@ -19,7 +19,7 @@ function M.fn(path)
   end
 
   -- always match against the real path
-  local path_real = vim.loop.fs_realpath(path)
+  local path_real = vim.uv.fs_realpath(path)
   if not path_real then
     return
   end

lua/nvim-tree/actions/finders/search-node.lua

@@ -25,23 +25,23 @@ local function search(search_dir, input_path)
 
     local filter_status = explorer.filters:prepare()
 
-    handle, _ = vim.loop.fs_scandir(dir)
+    handle, _ = vim.uv.fs_scandir(dir)
     if not handle then
       return
     end
 
-    realpath, _ = vim.loop.fs_realpath(dir)
+    realpath, _ = vim.uv.fs_realpath(dir)
     if not realpath or vim.tbl_contains(realpaths_searched, realpath) then
       return
     end
     table.insert(realpaths_searched, realpath)
 
-    name, _ = vim.loop.fs_scandir_next(handle)
+    name, _ = vim.uv.fs_scandir_next(handle)
     while name do
       path = dir .. "/" .. name
 
       ---@type uv.fs_stat.result|nil
-      stat, _ = vim.loop.fs_stat(path)
+      stat, _ = vim.uv.fs_stat(path)
       if not stat then
         break
       end
@@ -59,7 +59,7 @@ local function search(search_dir, input_path)
         end
       end
 
-      name, _ = vim.loop.fs_scandir_next(handle)
+      name, _ = vim.uv.fs_scandir_next(handle)
     end
   end
 

lua/nvim-tree/actions/fs/clipboard.lua

@@ -48,7 +48,7 @@ end
 ---@return boolean
 ---@return string|nil
 local function do_copy(source, destination)
-  local source_stats, err = vim.loop.fs_stat(source)
+  local source_stats, err = vim.uv.fs_stat(source)
 
   if not source_stats then
     log.line("copy_paste", "do_copy fs_stat '%s' failed '%s'", source, err)
@@ -64,15 +64,15 @@ local function do_copy(source, destination)
 
   if source_stats.type == "file" then
     local success
-    success, err = vim.loop.fs_copyfile(source, destination)
+    success, err = vim.uv.fs_copyfile(source, destination)
     if not success then
       log.line("copy_paste", "do_copy fs_copyfile failed '%s'", err)
       return false, err
     end
     return true
   elseif source_stats.type == "directory" then
     local handle
-    handle, err = vim.loop.fs_scandir(source)
+    handle, err = vim.uv.fs_scandir(source)
     if type(handle) == "string" then
       return false, handle
     elseif not handle then
@@ -81,14 +81,14 @@ local function do_copy(source, destination)
     end
 
     local success
-    success, err = vim.loop.fs_mkdir(destination, source_stats.mode)
+    success, err = vim.uv.fs_mkdir(destination, source_stats.mode)
     if not success then
       log.line("copy_paste", "do_copy fs_mkdir '%s' failed '%s'", destination, err)
       return false, err
     end
 
     while true do
-      local name, _ = vim.loop.fs_scandir_next(handle)
+      local name, _ = vim.uv.fs_scandir_next(handle)
       if not name then
         break
       end
@@ -228,7 +228,7 @@ function Clipboard:resolve_conflicts(conflict, destination, action, action_fn)
           self:finish_paste(action)
           return
         end
-        if vim.loop.fs_stat(new_dest) then
+        if vim.uv.fs_stat(new_dest) then
           self:resolve_conflicts({ { node = conflict[1].node, dest = new_dest } }, destination, action, action_fn)
         else
           do_paste_one(source, new_dest, action, action_fn)
@@ -285,7 +285,7 @@ function Clipboard:resolve_conflicts(conflict, destination, action, action_fn)
             local extension = vim.fn.fnamemodify(item.node.name, ":e")
             local new_name = extension ~= "" and (basename .. suffix .. "." .. extension) or (item.node.name .. suffix)
             local new_dest = utils.path_join({ destination, new_name })
-            local stats = vim.loop.fs_stat(new_dest)
+            local stats = vim.uv.fs_stat(new_dest)
             if stats then
               table.insert(still_conflict, { node = item.node, dest = new_dest })
             else
@@ -324,7 +324,7 @@ function Clipboard:do_paste(node, action, action_fn)
   end
 
   local destination = node.absolute_path
-  local stats, err, err_name = vim.loop.fs_stat(destination)
+  local stats, err, err_name = vim.uv.fs_stat(destination)
   if not stats and err_name ~= "ENOENT" then
     log.line("copy_paste", "do_paste fs_stat '%s' failed '%s'", destination, err)
     notify.error("Could not " .. action .. " " .. notify.render_path(destination) .. " - " .. (err or "???"))
@@ -340,7 +340,7 @@ function Clipboard:do_paste(node, action, action_fn)
   local conflict = {}
   for _, _node in ipairs(clip) do
     local dest = utils.path_join({ destination, _node.name })
-    local dest_stats = vim.loop.fs_stat(dest)
+    local dest_stats = vim.uv.fs_stat(dest)
     if dest_stats then
       table.insert(conflict, { node = _node, dest = dest })
     else
@@ -374,7 +374,7 @@ local function do_cut(source, destination)
   end
 
   events._dispatch_will_rename_node(source, destination)
-  local success, errmsg = vim.loop.fs_rename(source, destination)
+  local success, errmsg = vim.uv.fs_rename(source, destination)
   if not success then
     log.line("copy_paste", "do_cut fs_rename failed '%s'", errmsg)
     return false, errmsg

lua/nvim-tree/actions/fs/create-file.lua

@@ -13,12 +13,12 @@ local M = {}
 ---@param file string
 local function create_and_notify(file)
   events._dispatch_will_create_file(file)
-  local ok, fd = pcall(vim.loop.fs_open, file, "w", 420)
+  local ok, fd = pcall(vim.uv.fs_open, file, "w", 420)
   if not ok or type(fd) ~= "number" then
     notify.error("Couldn't create file " .. notify.render_path(file))
     return
   end
-  vim.loop.fs_close(fd)
+  vim.uv.fs_close(fd)
   events._dispatch_file_created(file)
 end
 
@@ -84,7 +84,7 @@ function M.fn(node)
       if is_last_path_file and idx == num_nodes then
         create_and_notify(path_to_create)
       elseif not utils.file_exists(path_to_create) then
-        local success = vim.loop.fs_mkdir(path_to_create, 493)
+        local success = vim.uv.fs_mkdir(path_to_create, 493)
         if not success then
           notify.error("Could not create folder " .. notify.render_path(path_to_create))
           is_error = true

lua/nvim-tree/actions/fs/remove-file.lua

@@ -62,26 +62,26 @@ end
 ---@param cwd string
 ---@return boolean|nil
 local function remove_dir(cwd)
-  local handle, err = vim.loop.fs_scandir(cwd)
+  local handle, err = vim.uv.fs_scandir(cwd)
   if not handle then
     notify.error(err)
     return
   end
 
   while true do
-    local name, _ = vim.loop.fs_scandir_next(handle)
+    local name, _ = vim.uv.fs_scandir_next(handle)
     if not name then
       break
     end
 
     local new_cwd = utils.path_join({ cwd, name })
 
     -- Type must come from fs_stat and not fs_scandir_next to maintain sshfs compatibility
-    local stat = vim.loop.fs_stat(new_cwd)
+    local stat = vim.uv.fs_stat(new_cwd)
     -- TODO remove once 0.12 is the minimum neovim version
     -- path incorrectly specified as an integer, fixed upstream for neovim 0.12 https://github.com/neovim/neovim/pull/33872
     ---@diagnostic disable-next-line: param-type-mismatch
-    local lstat = vim.loop.fs_lstat(new_cwd)
+    local lstat = vim.uv.fs_lstat(new_cwd)
 
     local type = stat and stat.type or nil
     -- Checks if file is a link file to ensure deletion of the symlink instead of the file it points to
@@ -93,15 +93,15 @@ local function remove_dir(cwd)
         return false
       end
     else
-      local success = vim.loop.fs_unlink(new_cwd)
+      local success = vim.uv.fs_unlink(new_cwd)
       if not success then
         return false
       end
       clear_buffer(new_cwd)
     end
   end
 
-  return vim.loop.fs_rmdir(cwd)
+  return vim.uv.fs_rmdir(cwd)
 end
 
 --- Remove a node, notify errors, dispatch events
@@ -118,7 +118,7 @@ function M.remove(node)
     events._dispatch_folder_removed(node.absolute_path)
   else
     events._dispatch_will_remove_file(node.absolute_path)
-    local success = vim.loop.fs_unlink(node.absolute_path)
+    local success = vim.uv.fs_unlink(node.absolute_path)
     if not success then
       notify.error("Could not remove " .. notify_node)
       return false

lua/nvim-tree/actions/fs/rename-file.lua

@@ -74,14 +74,14 @@ function M.rename(node, to)
 
     if idx == num_nodes then
       events._dispatch_will_rename_node(node.absolute_path, to)
-      local success, err = vim.loop.fs_rename(node.absolute_path, to)
+      local success, err = vim.uv.fs_rename(node.absolute_path, to)
 
       if not success then
         notify.warn(err_fmt(notify_from, notify_to, err))
         return
       end
     elseif not rename_file_exists(notify_from, path_to_create) then
-      local success = vim.loop.fs_mkdir(path_to_create, 493)
+      local success = vim.uv.fs_mkdir(path_to_create, 493)
       if not success then
         notify.error("Could not create folder " .. notify.render_path(path_to_create))
         is_error = true

lua/nvim-tree/autocmd.lua

@@ -30,7 +30,7 @@ function M.global()
     vim.api.nvim_create_autocmd("DirChanged", {
       group = augroup_id,
       callback = function()
-        require("nvim-tree.actions.tree.change-dir").fn(vim.loop.cwd())
+        require("nvim-tree.actions.tree.change-dir").fn(vim.uv.cwd())
       end,
     })
   end

lua/nvim-tree/core.lua

@@ -22,9 +22,9 @@ function M.init(foldername)
   local err, path
 
   if foldername then
-    path, err = vim.loop.fs_realpath(foldername)
+    path, err = vim.uv.fs_realpath(foldername)
   else
-    path, err = vim.loop.cwd()
+    path, err = vim.uv.cwd()
   end
   if path then
     TreeExplorer = require("nvim-tree.explorer")({ path = path })

lua/nvim-tree/explorer/filters.lua

@@ -177,7 +177,7 @@ function Filters:custom(path)
   end
 
   -- filter custom regexes
-  local relpath = utils.path_relative(path, vim.loop.cwd())
+  local relpath = utils.path_relative(path, vim.uv.cwd())
   for pat, _ in pairs(self.ignore_list) do
     if vim.fn.match(relpath, pat) ~= -1 or vim.fn.match(basename, pat) ~= -1 then
       return true

lua/nvim-tree/explorer/init.lua

@@ -27,7 +27,7 @@ local FILTER_REASON = require("nvim-tree.enum").FILTER_REASON
 local find_file = require("nvim-tree.actions.finders.find-file")
 
 ---@class (exact) Explorer: RootNode
----@field uid_explorer number vim.loop.hrtime() at construction time
+---@field uid_explorer number vim.uv.hrtime() at construction time
 ---@field opts table user options
 ---@field augroup_id integer
 ---@field current_tab integer
@@ -54,7 +54,7 @@ function Explorer:new(args)
     name          = "..",
   })
 
-  self.uid_explorer = vim.loop.hrtime()
+  self.uid_explorer = vim.uv.hrtime()
   self.augroup_id   = vim.api.nvim_create_augroup("NvimTree_Explorer_" .. self.uid_explorer, {})
 
   self.open         = true
@@ -203,7 +203,7 @@ end
 ---@return Node[]?
 function Explorer:reload(node, project)
   local cwd = node.link_to or node.absolute_path
-  local handle = vim.loop.fs_scandir(cwd)
+  local handle = vim.uv.fs_scandir(cwd)
   if not handle then
     return
   end
@@ -233,7 +233,7 @@ function Explorer:reload(node, project)
   })
 
   while true do
-    local name, _ = vim.loop.fs_scandir_next(handle)
+    local name, _ = vim.uv.fs_scandir_next(handle)
     if not name then
       break
     end
@@ -243,7 +243,7 @@ function Explorer:reload(node, project)
     -- TODO remove once 0.12 is the minimum neovim version
     -- path incorrectly specified as an integer, fixed upstream for neovim 0.12 https://github.com/neovim/neovim/pull/33872
     ---@diagnostic disable-next-line: param-type-mismatch
-    local stat = vim.loop.fs_lstat(abs)
+    local stat = vim.uv.fs_lstat(abs)
 
     local filter_reason = self.filters:should_filter_as_reason(abs, stat, filter_status)
     if filter_reason == FILTER_REASON.none then
@@ -391,7 +391,7 @@ function Explorer:populate_children(handle, cwd, node, project, parent)
   })
 
   while true do
-    local name, _ = vim.loop.fs_scandir_next(handle)
+    local name, _ = vim.uv.fs_scandir_next(handle)
     if not name then
       break
     end
@@ -404,7 +404,7 @@ function Explorer:populate_children(handle, cwd, node, project, parent)
       -- TODO remove once 0.12 is the minimum neovim version
       -- path incorrectly specified as an integer, fixed upstream for neovim 0.12 https://github.com/neovim/neovim/pull/33872
       ---@diagnostic disable-next-line: param-type-mismatch
-      local stat = vim.loop.fs_lstat(abs)
+      local stat = vim.uv.fs_lstat(abs)
 
       local filter_reason = parent.filters:should_filter_as_reason(abs, stat, filter_status)
       if filter_reason == FILTER_REASON.none and not nodes_by_path[abs] then
@@ -440,7 +440,7 @@ end
 ---@return Node[]|nil
 function Explorer:explore(node, project, parent)
   local cwd = node.link_to or node.absolute_path
-  local handle = vim.loop.fs_scandir(cwd)
+  local handle = vim.uv.fs_scandir(cwd)
   if not handle then
     return
   end