node factory uses stat only

Author: alex-courtis

lua/nvim-tree/explorer/init.lua

@@ -122,22 +122,19 @@ function Explorer:reload(node, git_status)
     if filter_reason == FILTER_REASON.none then
       remain_childs[abs] = true
 
-      -- Type must come from fs_stat and not fs_scandir_next to maintain sshfs compatibility
-      local t = stat and stat.type or nil
-
       -- Recreate node if type changes.
       if nodes_by_path[abs] then
         local n = nodes_by_path[abs]
 
-        if n.type ~= t then
+        if not stat or n.type ~= stat.type then
           utils.array_remove(node.nodes, n)
           n:destroy()
           nodes_by_path[abs] = nil
         end
       end
 
       if not nodes_by_path[abs] then
-        local new_child = node_factory.create_node(self, node, abs, t, stat, name)
+        local new_child = node_factory.create_node(self, node, abs, stat, name)
         if new_child then
           table.insert(node.nodes, new_child)
           nodes_by_path[abs] = new_child
@@ -276,9 +273,7 @@ function Explorer:populate_children(handle, cwd, node, git_status, parent)
       local stat = vim.loop.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
-        -- Type must come from fs_stat and not fs_scandir_next to maintain sshfs compatibility
-        local t = stat and stat.type or nil
-        local child = node_factory.create_node(self, node, abs, t, stat, name)
+        local child = node_factory.create_node(self, node, abs, stat, name)
         if child then
           table.insert(node.nodes, child)
           nodes_by_path[child.absolute_path] = true

lua/nvim-tree/node/factory.lua

@@ -5,26 +5,23 @@ local Watcher = require("nvim-tree.watcher")
 
 local M = {}
 
---- TODO merge #2922 and pass just stat, as stat.type from lstat is correct
-
 ---Factory function to create the appropriate Node
 ---@param explorer Explorer
 ---@param parent Node
 ---@param abs string
----@param t string? type from vim.loop.fs_scandir_next as stat.type is incorrectly reported as a file for links
----@param stat uv.fs_stat.result?
+---@param stat uv.fs_stat.result? -- on nil stat return nil Node
 ---@param name string
 ---@return Node?
-function M.create_node(explorer, parent, abs, t, stat, name)
+function M.create_node(explorer, parent, abs, stat, name)
   if not stat then
     return nil
   end
 
-  if t == "directory" and vim.loop.fs_access(abs, "R") and Watcher.is_fs_event_capable(abs) then
+  if stat.type == "directory" and vim.loop.fs_access(abs, "R") and Watcher.is_fs_event_capable(abs) then
     return DirectoryNode:create(explorer, parent, abs, name, stat)
-  elseif t == "file" then
+  elseif stat.type == "file" then
     return FileNode:create(explorer, parent, abs, name, stat)
-  elseif t == "link" then
+  elseif stat.type == "link" then
     return LinkNode:create(explorer, parent, abs, name, stat)
   end