extract node factory, remove unused code

Author: alex-courtis

lua/nvim-tree/explorer/init.lua

@@ -1,14 +1,13 @@
-local git = require("nvim-tree.git")
-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 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 git = require "nvim-tree.git"
+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 Watcher = require "nvim-tree.watcher"
 
 local Iterator = require("nvim-tree.iterators.node-iterator")
 local NodeIterator = require("nvim-tree.iterators.node-iterator")
@@ -150,17 +149,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
@@ -365,6 +354,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
+<<<<<<< HEAD
         -- 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 = nil
@@ -378,6 +368,9 @@ function Explorer:populate_children(handle, cwd, node, git_status, parent)
             child = link
           end
         end
+=======
+        local child = node_factory.create_node(self, node, abs, stat, name)
+>>>>>>> c02c98b (extract node factory, remove unused code)
         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