extract node factory, remove unused code

Author: alex-courtis

lua/nvim-tree/explorer/init.lua

@@ -3,11 +3,10 @@ local log = require "nvim-tree.log"
 local notify = require "nvim-tree.notify"
 local utils = require "nvim-tree.utils"
 local view = require "nvim-tree.view"
+local node_factory = require "nvim-tree.node.factory"
 
 local BaseNode = require "nvim-tree.node"
 local DirectoryNode = require "nvim-tree.node.directory"
-local FileNode = require "nvim-tree.node.file"
-local LinkNode = require "nvim-tree.node.link"
 local Watcher = require "nvim-tree.watcher"
 
 local Iterator = require "nvim-tree.iterators.node-iterator"
@@ -147,17 +146,7 @@ function Explorer:reload(node, git_status)
       end
 
       if not nodes_by_path[abs] then
-        local new_child = nil
-        if t == "directory" and vim.loop.fs_access(abs, "R") and Watcher.is_fs_event_capable(abs) then
-          new_child = DirectoryNode:new(self, node, abs, name, stat)
-        elseif t == "file" then
-          new_child = FileNode:new(self, node, abs, name, stat)
-        elseif t == "link" then
-          local link = LinkNode:new(self, node, abs, name, stat)
-          if link.link_to ~= nil then
-            new_child = link
-          end
-        end
+        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
@@ -348,7 +337,7 @@ function Explorer:populate_children(handle, cwd, node, git_status, parent)
   })
 
   while true do
-    local name, t = vim.loop.fs_scandir_next(handle)
+    local name, _ = vim.loop.fs_scandir_next(handle)
     if not name then
       break
     end
@@ -362,17 +351,7 @@ function Explorer:populate_children(handle, cwd, node, git_status, parent)
       local stat = vim.loop.fs_stat(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
-        local child = nil
-        if t == "directory" and vim.loop.fs_access(abs, "R") then
-          child = DirectoryNode:new(self, node, abs, name, stat)
-        elseif t == "file" then
-          child = FileNode:new(self, node, abs, name, stat)
-        elseif t == "link" then
-          local link = LinkNode:new(self, node, abs, name, stat)
-          if link.link_to ~= nil then
-            child = link
-          end
-        end
+        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

@@ -0,0 +1,33 @@
+local DirectoryNode = require "nvim-tree.node.directory"
+local LinkNode = require "nvim-tree.node.link"
+local FileNode = require "nvim-tree.node.file"
+local Watcher = require "nvim-tree.watcher"
+
+local M = {}
+
+---@param explorer Explorer
+-----@param parent DirectoryNode    -- TODO #2871 #2886
+---@param abs string
+---@param stat uv.fs_stat.result|nil
+---@param name string
+---@return Node|nil
+function M.create_node(explorer, parent, abs, stat, name)
+  if not stat then
+    return nil
+  end
+
+  if stat.type == "directory" and vim.loop.fs_access(abs, "R") and Watcher.is_fs_event_capable(abs) then
+    return DirectoryNode:new(explorer, parent, abs, name, stat)
+  elseif stat.type == "file" then
+    return FileNode:new(explorer, parent, abs, name, stat)
+  elseif stat.type == "link" then
+    local link = LinkNode:new(explorer, parent, abs, name, stat)
+    if link.link_to ~= nil then
+      return link
+    end
+  end
+
+  return nil
+end
+
+return M