style: remove unneeded vim local, prefer vim.uv (#1724)

Author: pynappo

lua/neo-tree.lua

@@ -1,4 +1,3 @@
-local vim = vim
 local M = {}
 
 --- To be removed in a future release, use this instead:

lua/neo-tree/command/parser.lua

@@ -1,3 +1,4 @@
+local uv = vim.uv or vim.loop
 local utils = require("neo-tree.utils")
 local _compat = require("neo-tree.utils._compat")
 
@@ -88,8 +89,8 @@ M.resolve_path = function(path, validate_type)
   local expanded = vim.fn.expand(path)
   local abs_path = vim.fn.fnamemodify(expanded, ":p")
   if validate_type then
-    local stat = vim.loop.fs_stat(abs_path)
-    if stat and stat.type ~= validate_type then
+    local stat = uv.fs_stat(abs_path)
+    if not stat or stat.type ~= validate_type then
       error("Invalid path: " .. path .. " is not a " .. validate_type)
     end
   end
@@ -141,7 +142,7 @@ local parse_arg = function(result, arg)
         end
         -- maybe it's a path
         local path = M.resolve_path(value)
-        local stat = vim.loop.fs_stat(path)
+        local stat = uv.fs_stat(path)
         if stat then
           if stat.type == "directory" then
             result["dir"] = path

lua/neo-tree/events/init.lua

@@ -1,4 +1,3 @@
-local vim = vim
 local q = require("neo-tree.events.queue")
 local log = require("neo-tree.log")
 local utils = require("neo-tree.utils")

lua/neo-tree/git/ignored.lua

@@ -1,4 +1,5 @@
 local Job = require("plenary.job")
+local uv = vim.uv or vim.loop
 
 local utils = require("neo-tree.utils")
 local log = require("neo-tree.log")
@@ -67,7 +68,7 @@ M.mark_ignored = function(state, items, callback)
       --add the trailing slash to the path manually if not on Windows.
       log.trace("IGNORED: Checking types of", #result, "items to see which ones are directories")
       for i, item in ipairs(result) do
-        local stat = vim.loop.fs_stat(item)
+        local stat = uv.fs_stat(item)
         if stat and stat.type == "directory" then
           result[i] = item .. sep
         end

lua/neo-tree/log.lua

@@ -6,7 +6,6 @@
 -- This library is free software; you can redistribute it and/or modify it
 -- under the terms of the MIT license. See LICENSE for details.
 
-local vim = vim
 -- User configuration section
 local default_config = {
   -- Name of the plugin. Prepended to log messages

lua/neo-tree/setup/netrw.lua

@@ -1,3 +1,4 @@
+local uv = vim.uv or vim.loop
 local nt = require("neo-tree")
 local utils = require("neo-tree.utils")
 local M = {}
@@ -36,7 +37,7 @@ M.hijack = function(path)
   if not utils.truthy(bufname) then
     bufname = path or ""
   end
-  local stats = vim.loop.fs_stat(bufname)
+  local stats = uv.fs_stat(bufname)
   if not stats then
     return false
   end

lua/neo-tree/sources/buffers/commands.lua

@@ -1,6 +1,5 @@
 --This file should contain all commands meant to be used by mappings.
 
-local vim = vim
 local cc = require("neo-tree.sources.common.commands")
 local buffers = require("neo-tree.sources.buffers")
 local utils = require("neo-tree.utils")

lua/neo-tree/sources/buffers/init.lua

@@ -1,7 +1,6 @@
 --This file should have all functions that are in the public api and either set
 --or read the state of this source.
 
-local vim = vim
 local utils = require("neo-tree.utils")
 local renderer = require("neo-tree.ui.renderer")
 local items = require("neo-tree.sources.buffers.lib.items")

lua/neo-tree/sources/buffers/lib/items.lua

@@ -1,4 +1,3 @@
-local vim = vim
 local renderer = require("neo-tree.ui.renderer")
 local utils = require("neo-tree.utils")
 local file_items = require("neo-tree.sources.common.file-items")

lua/neo-tree/sources/common/commands.lua

@@ -1,5 +1,4 @@
 --This file should contain all commands meant to be used by mappings.
-local vim = vim
 local fs_actions = require("neo-tree.sources.filesystem.lib.fs_actions")
 local utils = require("neo-tree.utils")
 local renderer = require("neo-tree.ui.renderer")

lua/neo-tree/sources/common/file-items.lua

@@ -1,7 +1,7 @@
-local vim = vim
 local file_nesting = require("neo-tree.sources.common.file-nesting")
 local utils = require("neo-tree.utils")
 local log = require("neo-tree.log")
+local uv = vim.uv or vim.loop
 
 local function sort_items(a, b)
   if a.type == b.type then
@@ -109,7 +109,7 @@ function create_item(context, path, _type, bufnr)
   end
 
   if _type == nil then
-    local stat = vim.loop.fs_stat(path)
+    local stat = uv.fs_stat(path)
     _type = stat and stat.type or "unknown"
   end
   local item = {
@@ -126,9 +126,9 @@ function create_item(context, path, _type, bufnr)
   end
   if item.type == "link" then
     item.is_link = true
-    item.link_to = vim.loop.fs_realpath(path)
+    item.link_to = uv.fs_realpath(path)
     if item.link_to ~= nil then
-      item.type = vim.loop.fs_stat(item.link_to).type
+      item.type = uv.fs_stat(item.link_to).type
     end
   end
   if item.type == "directory" then

lua/neo-tree/sources/common/filters/init.lua

@@ -1,7 +1,6 @@
 ---A generalization of the filter functionality to directly filter the
 ---source tree instead of relying on pre-filtered data, which is specific
 ---to the filesystem source.
-local vim = vim
 local Input = require("nui.input")
 local event = require("nui.utils.autocmd").event
 local popups = require("neo-tree.ui.popups")

lua/neo-tree/sources/common/preview.lua

@@ -1,4 +1,3 @@
-local vim = vim
 local utils = require("neo-tree.utils")
 local highlights = require("neo-tree.ui.highlights")
 local events = require("neo-tree.events")

lua/neo-tree/sources/document_symbols/commands.lua

@@ -5,8 +5,6 @@ local manager = require("neo-tree.sources.manager")
 local inputs = require("neo-tree.ui.inputs")
 local filters = require("neo-tree.sources.common.filters")
 
-local vim = vim
-
 local M = {}
 local SOURCE_NAME = "document_symbols"
 M.refresh = utils.wrap(manager.refresh, SOURCE_NAME)

lua/neo-tree/sources/document_symbols/init.lua

@@ -1,7 +1,6 @@
 --This file should have all functions that are in the public api and either set
 --or read the state of this source.
 
-local vim = vim
 local manager = require("neo-tree.sources.manager")
 local events = require("neo-tree.events")
 local utils = require("neo-tree.utils")

lua/neo-tree/sources/filesystem/commands.lua

@@ -6,6 +6,7 @@ local utils = require("neo-tree.utils")
 local filter = require("neo-tree.sources.filesystem.lib.filter")
 local renderer = require("neo-tree.ui.renderer")
 local log = require("neo-tree.log")
+local uv = vim.uv or vim.loop
 
 local M = {}
 local refresh = function(state)
@@ -141,7 +142,7 @@ local focus_next_git_modified = function(state, reverse)
   end
 
   local is_file = function(path)
-    local success, stats = pcall(vim.loop.fs_stat, path)
+    local success, stats = pcall(uv.fs_stat, path)
     return (success and stats and stats.type ~= "directory")
   end
 

lua/neo-tree/sources/filesystem/init.lua

@@ -1,7 +1,6 @@
 --This file should have all functions that are in the public api and either set
 --or read the state of this source.
 
-local vim = vim
 local utils = require("neo-tree.utils")
 local _compat = require("neo-tree.utils._compat")
 local fs_scan = require("neo-tree.sources.filesystem.lib.fs_scan")

lua/neo-tree/sources/filesystem/lib/filter.lua

@@ -1,6 +1,5 @@
 -- This file holds all code for the search function.
 
-local vim = vim
 local Input = require("nui.input")
 local event = require("nui.utils.autocmd").event
 local fs = require("neo-tree.sources.filesystem")

lua/neo-tree/sources/filesystem/lib/filter_external.lua

@@ -1,4 +1,3 @@
-local vim = vim
 local log = require("neo-tree.log")
 local Job = require("plenary.job")
 local utils = require("neo-tree.utils")

lua/neo-tree/sources/filesystem/lib/fs_actions.lua

@@ -4,9 +4,8 @@
 -- https://github.com/mhartington/dotfiles
 -- and modified to fit neo-tree's api.
 -- Permalink: https://github.com/mhartington/dotfiles/blob/7560986378753e0c047d940452cb03a3b6439b11/config/nvim/lua/mh/filetree/init.lua
-local vim = vim
 local api = vim.api
-local loop = vim.uv or vim.loop
+local uv = vim.uv or vim.loop
 local scan = require("plenary.scandir")
 local utils = require("neo-tree.utils")
 local inputs = require("neo-tree.ui.inputs")
@@ -22,8 +21,8 @@ local M = {}
 ---@param original_path string
 ---@param destination string
 ---@return boolean rename_is_safe
-local function rename_is_safe(original_path, destination)
-  if not loop.fs_stat(destination) then
+local function can_safely_rename(original_path, destination)
+  if not uv.fs_stat(destination) then
     return true
   end
 
@@ -144,12 +143,12 @@ end
 
 local function create_all_parents(path)
   local function create_all_as_folders(in_path)
-    if not loop.fs_stat(in_path) then
+    if not uv.fs_stat(in_path) then
       local parent, _ = utils.split_path(in_path)
       if parent then
         create_all_as_folders(parent)
       end
-      loop.fs_mkdir(in_path, 493)
+      uv.fs_mkdir(in_path, 493)
     end
   end
 
@@ -213,7 +212,7 @@ M.move_node = function(source, destination, callback, using_root_directory)
     end
     local function move_file()
       create_all_parents(dest)
-      loop.fs_rename(source, dest, function(err)
+      uv.fs_rename(source, dest, function(err)
         if err then
           log.error("Could not move the files from", source, "to", dest, ":", err)
           return
@@ -362,13 +361,13 @@ M.create_directory = function(in_directory, callback, using_root_directory)
         return
       end
 
-      if loop.fs_stat(destination) then
+      if uv.fs_stat(destination) then
         log.warn("Directory already exists")
         return
       end
 
       create_all_parents(destination)
-      loop.fs_mkdir(destination, 493)
+      uv.fs_mkdir(destination, 493)
 
       vim.schedule(function()
         events.fire_event(events.FILE_ADDED, destination)
@@ -420,7 +419,7 @@ M.create_node = function(in_directory, callback, using_root_directory)
       end
 
       destination = utils.normalize_path(destination)
-      if loop.fs_stat(destination) then
+      if uv.fs_stat(destination) then
         log.warn("File already exists")
         return
       end
@@ -439,19 +438,19 @@ M.create_node = function(in_directory, callback, using_root_directory)
 
       create_all_parents(destination)
       if is_dir then
-        loop.fs_mkdir(destination, 493)
+        uv.fs_mkdir(destination, 493)
       else
-        local open_mode = loop.constants.O_CREAT + loop.constants.O_WRONLY + loop.constants.O_TRUNC
-        local fd = loop.fs_open(destination, open_mode, 420)
+        local open_mode = uv.constants.O_CREAT + uv.constants.O_WRONLY + uv.constants.O_TRUNC
+        local fd = uv.fs_open(destination, open_mode, 420)
         if not fd then
-          if not loop.fs_stat(destination) then
+          if not uv.fs_stat(destination) then
             api.nvim_err_writeln("Could not create file " .. destination)
             return
           else
             log.warn("Failed to complete file creation of " .. destination)
           end
         else
-          loop.fs_close(fd)
+          uv.fs_close(fd)
         end
       end
       complete()
@@ -463,7 +462,7 @@ end
 ---@param dir_path string Directory to delete.
 ---@return boolean success Whether the directory was deleted.
 local function delete_dir(dir_path)
-  local handle = loop.fs_scandir(dir_path)
+  local handle = uv.fs_scandir(dir_path)
   if type(handle) == "string" then
     api.nvim_err_writeln(handle)
     return false
@@ -475,7 +474,7 @@ local function delete_dir(dir_path)
   end
 
   while true do
-    local child_name, t = loop.fs_scandir_next(handle)
+    local child_name, t = uv.fs_scandir_next(handle)
     if not child_name then
       break
     end
@@ -488,14 +487,14 @@ local function delete_dir(dir_path)
         return false
       end
     else
-      local success = loop.fs_unlink(child_path)
+      local success = uv.fs_unlink(child_path)
       if not success then
         return false
       end
       clear_buffer(child_path)
     end
   end
-  return loop.fs_rmdir(dir_path) or false
+  return uv.fs_rmdir(dir_path) or false
 end
 
 -- Delete Node
@@ -505,19 +504,20 @@ M.delete_node = function(path, callback, noconfirm)
 
   log.trace("Deleting node: ", path)
   local _type = "unknown"
-  local stat = loop.fs_stat(path)
+  local stat = uv.fs_stat(path)
   if stat then
     _type = stat.type
     if _type == "link" then
-      local link_to = loop.fs_readlink(path)
+      local link_to = uv.fs_readlink(path)
       if not link_to then
         log.error("Could not read link")
         return
       end
-      local target_file = loop.fs_stat(link_to)
+      local target_file = uv.fs_stat(link_to)
       if target_file then
         _type = target_file.type
       end
+      _type = uv.fs_stat(link_to).type
     end
     if _type == "directory" then
       local children = scan.scan_dir(path, {
@@ -586,7 +586,7 @@ M.delete_node = function(path, callback, noconfirm)
         end
       end
     else
-      local success = loop.fs_unlink(path)
+      local success = uv.fs_unlink(path)
       if not success then
         return api.nvim_err_writeln("Could not remove file: " .. path)
       end
@@ -653,7 +653,7 @@ local rename_node = function(msg, name, get_destination, path, callback)
     end)
 
     local function fs_rename()
-      loop.fs_rename(path, destination, function(err)
+      uv.fs_rename(path, destination, function(err)
         if err then
           log.warn("Could not rename the files")
           return