fix: change order of bufenter event code to ensure window are options are set

Author: cseickel

lua/neo-tree.lua

@@ -215,13 +215,6 @@ M.paste_default_config = function()
 end
 
 M.buffer_enter_event = function(args)
-  if utils.is_floating() then
-    return
-  end
-  -- if vim is trying to open a dir, then we hijack it
-  if M.hijack_netrw() then
-    return
-  end
   -- if it is a neo-tree window, just set local options
   if vim.bo.filetype == "neo-tree" then
     vim.cmd([[
@@ -240,6 +233,16 @@ M.buffer_enter_event = function(args)
     return
   end
 
+  -- there is nothing more we want to do with floating windows
+  if utils.is_floating() then
+    return
+  end
+
+  -- if vim is trying to open a dir, then we hijack it
+  if M.hijack_netrw() then
+    return
+  end
+
   -- For all others, make sure another buffer is not hijacking our window
   local prior_buf = vim.fn.bufnr("#")
   if prior_buf < 1 then

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

@@ -111,6 +111,9 @@ local follow_internal = function(callback, force_show)
 end
 
 M.follow = function(callback, force_show)
+  if vim.fn.bufname(0) == "COMMIT_EDITMSG" then
+    return false
+  end
   utils.debounce("neo-tree-follow", function()
     return follow_internal(callback, force_show)
   end, 200, utils.debounce_strategy.CALL_LAST_ONLY)