move watcher to DirectoryNode

Author: alex-courtis

lua/nvim-tree/api.lua

@@ -217,9 +217,6 @@ local function open_or_expand_or_dir_up(mode, toggle_group)
     if node.name == ".." then
       actions.root.change_dir.fn("..")
     elseif node:is(DirectoryNode) then
-      ---
-      ---@cast node DirectoryNode
-      ---
       node:expand_or_collapse(toggle_group)
     elseif not toggle_group then
       edit(mode, node)

lua/nvim-tree/node/directory.lua

@@ -8,6 +8,7 @@ local Node = require("nvim-tree.node")
 ---@field group_next DirectoryNode? -- If node is grouped, this points to the next child dir/link node
 ---@field nodes Node[]
 ---@field open boolean
+---@field watcher Watcher?
 ---@field hidden_stats table? -- Each field of this table is a key for source and value for count
 local DirectoryNode = Node:new()
 
@@ -51,12 +52,18 @@ function DirectoryNode:create(explorer, parent, absolute_path, name, fs_stat)
 end
 
 function DirectoryNode:destroy()
-  Node.destroy(self)
+  if self.watcher then
+    self.watcher:destroy()
+    self.watcher = nil
+  end
+
   if self.nodes then
     for _, node in pairs(self.nodes) do
       node:destroy()
     end
   end
+
+  Node.destroy(self)
 end
 
 ---Update the GitStatus of the directory

lua/nvim-tree/node/file.lua

@@ -27,7 +27,6 @@ function FileNode:create(explorer, parent, absolute_path, name, fs_stat)
     is_dot = false,
     name = name,
     parent = parent,
-    watcher = nil,
     diag_status = nil,
 
     extension = string.match(name, ".?[^.]+%.(.*)") or "",

lua/nvim-tree/node/init.lua

@@ -18,23 +18,19 @@ local Class = require("nvim-tree.class")
 ---@field hidden boolean
 ---@field name string
 ---@field parent DirectoryNode?
----@field watcher Watcher?
 ---@field diag_status DiagStatus?
 ---@field is_dot boolean cached is_dotfile
 local Node = Class:new()
 
 function Node:destroy()
-  if self.watcher then
-    self.watcher:destroy()
-    self.watcher = nil
-  end
 end
 
 --luacheck: push ignore 212
 ---Update the GitStatus of the node
 ---@param parent_ignored boolean
 ---@param status table?
 function Node:update_git_status(parent_ignored, status) ---@diagnostic disable-line: unused-local
+  ---TODO find a way to declare abstract methods
 end
 
 --luacheck: pop
@@ -149,7 +145,6 @@ function Node:clone()
     is_dot = self.is_dot,
     name = self.name,
     parent = nil,
-    watcher = nil,
     diag_status = nil,
   }