WIP

Author: cseickel

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

@@ -285,23 +285,9 @@ M.setup = function(config, global_config)
   if config.follow_current_file then
     manager.subscribe(M.name, {
       event = events.VIM_BUFFER_ENTER,
-      handler = wrap(manager.follow),
+      handler = M.follow,
     })
   end
-
-  --Dispose ourselves if the tab closes
-  manager.subscribe(M.name, {
-    event = events.VIM_TAB_CLOSED,
-    handler = function(args)
-      local tabnr = tonumber(args.afile)
-      if tabnr then
-        log.debug("VIM_TAB_CLOSED: disposing state for tab", tabnr)
-        manager.dispose(M.name, tabnr)
-      else
-        log.error("VIM_TAB_CLOSED: no tab number found in args.afile")
-      end
-    end,
-  })
 end
 
 ---Expands or collapses the current node.

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

@@ -122,7 +122,7 @@ M.open = cc.open
 M.open_split = cc.open_split
 M.open_vsplit = cc.open_vsplit
 
-M.refresh = gs.refresh
+M.refresh = refresh
 
 M.rename = function(state)
   cc.rename(state, refresh)

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

@@ -22,8 +22,10 @@ end
 ---@param path string Path to navigate to. If empty, will navigate to the cwd.
 M.navigate = function(path)
   local state = get_state()
+  state.path = path or vim.fn.getcwd()
   state.dirty = false
   items.get_git_status(state)
+  manager.watch_git_project(M.name, state.path)
 end
 
 ---Configures the plugin, should be called before the plugin is used.
@@ -44,14 +46,21 @@ M.setup = function(config, global_config)
   end
 
   manager.subscribe(M.name, {
-    event = events.VIM_BUFFER_CHANGED,
-    handler = wrap(manager.refresh),
+    event = events.FS_EVENT,
+    handler = function(args)
+      local state = get_state()
+      if args.path == state.git_folder then
+        M.navigate()
+      else
+        log.debug("Ignoring fs event for " .. args.path)
+      end
+    end,
   })
 
   if config.bind_to_cwd then
     manager.subscribe(M.name, {
       event = events.VIM_DIR_CHANGED,
-      handler = wrap(manager.refresh),
+      handler = wrap(manager.dir_changed),
     })
   end
 

lua/neo-tree/sources/manager.lua

@@ -8,6 +8,7 @@ local renderer = require("neo-tree.ui.renderer")
 local inputs = require("neo-tree.ui.inputs")
 local events = require("neo-tree.events")
 local log = require("neo-tree.log")
+local fs_watch = require("neo-tree.sources.filesystem.lib.fs_watch")
 
 local M = {}
 local source_data = {}
@@ -324,4 +325,34 @@ M.show = function(source_name)
   end
 end
 
+local known_dot_git_folders = {}
+M.watch_git_project = function (source_name, path)
+  local state = M.get_state(source_name)
+  local root = utils.get_git_project_root(path)
+  if not utils.truthy(root) then
+    return
+  end
+  dot_git = root .. utils.path_separator .. ".git"
+  if dot_git ~= state.git_folder then
+    log.debug("Watching .git folder: ", dot_git)
+    if utils.truthy(state.git_folder) then
+      fs_watch.unwatch_folder(state.git_folder)
+    end
+    fs_watch.watch_folder(dot_git)
+    state.git_folder = dot_git
+    if #known_dot_git_folders == 0 then
+      events.subscribe({
+        event = events.FS_EVENT,
+        handler = function(args)
+         local is_git_root = known_dot_git_folders[args.path]
+         if is_git_root then
+           events.fire_event(events.GIT_EVENT, args)
+         end
+        end,
+      })
+    end
+    known_dot_git_folders[dot_git] = true
+  end
+end
+
 return M

lua/neo-tree/utils.lua

@@ -168,8 +168,12 @@ M.get_diagnostic_counts = function()
   return lookup
 end
 
-M.get_git_project_root = function()
-  return vim.fn.systemlist("git rev-parse --show-toplevel")[1]
+M.get_git_project_root = function(path)
+  local cmd = "git rev-parse --show-toplevel"
+  if M.truthy(path) then
+    cmd = 'cd ' .. vim.fn.shellescape(path) .. " && " .. cmd
+  end
+  return vim.fn.systemlist(cmd)[1]
 end
 
 ---Parse "git status" output for the current working directory.