fix(files): stop re-opening floating window when opening file from fuzzy search, also force stopinsert on <esc> to fix #189

Author: cseickel

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

@@ -38,6 +38,9 @@ local follow_internal = function(callback, force_show)
   end
 
   local state = get_state()
+  if state.current_position == "float" then
+    return false
+  end
   if not state.path then
     return false
   end
@@ -183,7 +186,6 @@ M.reset_search = function(state, refresh, open_current_node)
   end
   state.search_pattern = nil
   state.open_folders_before_search = nil
-  if refresh then
     if open_current_node then
       local success, node = pcall(state.tree.get_node, state.tree)
       if success and node then
@@ -195,15 +197,13 @@ M.reset_search = function(state, refresh, open_current_node)
             pcall(renderer.focus_node, state, path, false)
           end)
         else
-          if state.current_position == "current" then
-            utils.open_file(state, node:get_id())
-          else
-            utils.open_file(state, path)
+          utils.open_file(state, path)
+          if refresh and state.current_position ~= "current" and state.current_position ~= "float" then
             M.navigate(state, nil, path)
           end
         end
       end
-    else
+    else if refresh then
       M.navigate(state)
     end
   end

lua/neo-tree/sources/filesystem/lib/filter.lua

@@ -62,9 +62,7 @@ M.show_filter = function(state, search_as_you_type, fuzzy_finder_mode)
         fs.reset_search(state)
       else
         if search_as_you_type and fuzzy_finder_mode then
-          state.search_pattern = nil
           fs.reset_search(state, true, true)
-          require("neo-tree.sources.filesystem.commands").open(state)
           return
         end
         state.search_pattern = value
@@ -149,6 +147,7 @@ M.show_filter = function(state, search_as_you_type, fuzzy_finder_mode)
     end
   end)
   input:map("i", "<esc>", function(bufnr)
+    vim.cmd("stopinsert")
     input:unmount()
     if fuzzy_finder_mode and utils.truthy(state.search_pattern) then
       fs.reset_search(state, true)
@@ -157,6 +156,7 @@ M.show_filter = function(state, search_as_you_type, fuzzy_finder_mode)
   end, { noremap = true })
 
   input:on({ event.BufLeave, event.BufDelete }, function()
+    vim.cmd("stopinsert")
     input:unmount()
     -- If this was closed due to submit, that function will handle the reset_search
     vim.defer_fn(function ()

lua/neo-tree/ui/inputs.lua

@@ -1,7 +1,5 @@
 local vim = vim
 local Input = require("nui.input")
-local NuiText = require("nui.text")
-local highlights = require("neo-tree.ui.highlights")
 local popups = require("neo-tree.ui.popups")
 local utils = require("neo-tree.utils")
 
@@ -15,7 +13,8 @@ end
 M.show_input = function(input, callback)
   input:mount()
 
-  input:map("i", "<esc>", function(bufnr)
+  input:map("i", "<esc>", function()
+    vim.cmd("stopinsert")
     input:unmount()
   end, { noremap = true })