fix: ui freeze when action error

regression of a234df1

Author: phanen

lua/fzf-lua/shell.lua

@@ -426,11 +426,17 @@ M.stringify = function(contents, opts, fzf_field_index)
         return on_write(data, cb)
       end
 
-      if type(contents) == "table" then
-        vim.tbl_map(function(x) on_write_nl(x) end, contents)
+      local ok, err = pcall(function()
+        if type(contents) == "table" then
+          vim.tbl_map(function(x) on_write_nl(x) end, contents)
+          on_finish()
+        elseif type(contents) == "function" then
+          contents(on_write_nl, on_write, unpack(args))
+        end
+      end)
+      if not ok and err then
         on_finish()
-      elseif type(contents) == "function" then
-        contents(on_write_nl, on_write, unpack(args))
+        error(err)
       end
     end
   end, fzf_field_index or "", opts.debug)

tests/actions_spec.lua

@@ -0,0 +1,37 @@
+---@diagnostic disable: unused-local, unused-function
+local MiniTest = require("mini.test")
+local helpers = require("fzf-lua.test.helpers")
+local child = helpers.new_child_neovim()
+local expect, eq = helpers.expect, helpers.expect.equality
+local new_set = MiniTest.new_set
+
+---@format disable-next
+local reload = function(config) child.unload(); child.setup(config) end
+local sleep = function(ms) helpers.sleep(ms, child) end
+local exec_lua = child.lua
+--stylua: ignore end
+
+local T = helpers.new_set_with_child(child)
+
+T["actions"] = new_set({ n_retry = not helpers.IS_LINUX() and 5 or nil })
+
+T["actions"]["ui don't freeze on error"] = function()
+  -- reload({ "hide" })
+  exec_lua(
+    [[FzfLua.fzf_exec({ "aaa", "bbb" }, {
+      actions = { enter = { fn = error, exec_silent = true } },
+    })]])
+  child.wait_until(function() return child.lua_get([[_G._fzf_load_called]]) == true end)
+  child.type_keys("<cr>")
+  child.type_keys("ui should not freeze on action error")
+  vim.uv.sleep(100 * (not helpers.IS_LINUX() and 5 or 1))
+  child.expect_screen_lines({ redraw = true })
+
+  exec_lua([[FzfLua.fzf_exec(function(cb) cb(1) cb(2) error("eff") end)]])
+  child.wait_until(function() return child.lua_get([[_G._fzf_load_called]]) == true end)
+  child.type_keys("ui should not freeze on content error")
+  vim.uv.sleep(100 * (not helpers.IS_LINUX() and 5 or 1))
+  child.expect_screen_lines({ ignore_text = { 28 } })
+end
+
+return T

tests/screenshots/tests-actions_spec.lua---actions---ui-don't-freeze-on-error

@@ -0,0 +1,29 @@
+--|---------|---------|---------|---------|---------|---------|----
+01|                                                                
+02|~                                                               
+03|~      ╭─────────────────────────────────────────────────╮      
+04|~      │> ui should not freeze on action error       0/2 │      
+05|~      │──────────────────────────────────────────────── │      
+06|~      │                                                 │      
+07|~      │                                                 │      
+08|~      │                                                 │      
+09|~      │                                                 │      
+10|~      │                                                 │      
+11|~      │                                                 │      
+12|~      │                                                 │      
+13|~      │                                                 │      
+14|~      │                                                 │      
+15|~      │                                                 │      
+16|~      │                                                 │      
+17|~      │                                                 │      
+18|~      │                                                 │      
+19|~      │                                                 │      
+20|~      │                                                 │      
+21|~      │                                                 │      
+22|~      ╰─────────────────────────────────────────────────╯      
+23|~                                                               
+24|[No Name]                                     0,0-1          All
+25|                                                                
+26|                                                                
+27|                                                                
+28|-- TERMINAL --                                1,3           All 

tests/screenshots/tests-actions_spec.lua---actions---ui-don't-freeze-on-error-002

@@ -0,0 +1,29 @@
+--|---------|---------|---------|---------|---------|---------|----
+01|                                                                
+02|~                                                               
+03|~      ╭─────────────────────────────────────────────────╮      
+04|~      │> ui should not freeze on content error      0/2 │      
+05|~      │──────────────────────────────────────────────── │      
+06|~      │                                                 │      
+07|~      │                                                 │      
+08|~      │                                                 │      
+09|~      │                                                 │      
+10|~      │                                                 │      
+11|~      │                                                 │      
+12|~      │                                                 │      
+13|~      │                                                 │      
+14|~      │                                                 │      
+15|~      │                                                 │      
+16|~      │                                                 │      
+17|~      │                                                 │      
+18|~      │                                                 │      
+19|~      │                                                 │      
+20|~      │                                                 │      
+21|~      │                                                 │      
+22|~      ╰─────────────────────────────────────────────────╯      
+23|~                                                               
+24|[No Name]                                     0,0-1          All
+25|                                                                
+26|                                                                
+27|                                                                
+28|-- TERMINAL --                                1,0-38        All