fix: fzf_live|actions append to fzf events

Author: ibhagwan

lua/fzf-lua/config.lua

@@ -381,6 +381,9 @@ function M.normalize_opts(opts, globals, __resume_key)
     end
   end
 
+  -- `fzf_cli_args` is string, `_fzf_cli_args` is a table used internally
+  opts._fzf_cli_args = {}
+
   -- backward compatibility, rhs overrides lhs
   -- (rhs being the "old" option)
   local backward_compat = {
@@ -921,8 +924,8 @@ function M.normalize_opts(opts, globals, __resume_key)
     utils.warn("'line_query' requires fzf >= 0.59, ignoring.")
   elseif opts.line_query then
     utils.map_set(opts, "winopts.preview.winopts.cursorline", true)
-    utils.map_set(opts, "keymap.fzf.change",
-      "transform:" .. FzfLua.shell.stringify_data(function(q, _, _)
+    table.insert(opts._fzf_cli_args, "--bind=" .. libuv.shellescape("change:+transform:"
+      .. FzfLua.shell.stringify_data(function(q, _, _)
         local lnum = q[1]:match(":(%d+)$")
         local new_q, subs = q[1]:gsub(":%d*$", "")
         -- No subs made, no ":" at end of string, do nothing
@@ -936,7 +939,7 @@ function M.normalize_opts(opts, globals, __resume_key)
           trans = string.format("%s+change-preview-window(%s:%s)", trans, optstr, offset)
         end
         return trans
-      end, opts, "{q}"))
+      end, opts, "{q}")))
   end
 
   if type(opts.enrich) == "function" then

lua/fzf-lua/core.lua

@@ -315,6 +315,8 @@ M.fzf = function(contents, opts)
     opts = config.normalize_opts(opts or {}, {})
     if not opts then return end
   end
+  -- Store contents for unhide
+  opts._contents = contents
   -- flag used to print the query on stdout line 1
   -- later to be removed from the result by M.fzf()
   -- this provides a solution for saving the query
@@ -371,7 +373,8 @@ M.fzf = function(contents, opts)
     -- fzf 0.40 added 'zero' event for when there's no match
     -- clears the preview when there are no matching entries
     if utils.has(opts, "fzf", { 0, 40 }) and previewer.zero then
-      utils.map_set(opts, "keymap.fzf.zero", previewer:zero())
+      table.insert(opts._fzf_cli_args, "--bind="
+        .. libuv.shellescape("zero:+" .. previewer:zero()))
     end
     if type(previewer.preview_window) == "function" then
       -- do we need to override the preview_window args?
@@ -751,8 +754,14 @@ M.build_fzf_cli = function(opts, fzf_win)
     end
   end
   for _, o in ipairs({ "fzf_args", "fzf_raw_args", "fzf_cli_args", "_fzf_cli_args" }) do
-    if opts[o] then
-      table.insert(cli_args, type(opts[o]) == "table" and opts[o] or tostring(opts[o]))
+    local args = opts[o]
+    if args then
+      if type(args) ~= "table" then
+        args = { tostring(args) }
+      end
+      for _, arg in ipairs(args) do
+        table.insert(cli_args, arg)
+      end
     end
   end
   return cli_args
@@ -1087,19 +1096,11 @@ M.convert_reload_actions = function(reload_cmd, opts)
       }
     end
   end
-  opts.keymap.fzf.load = (function()
-    -- NOTE: this fixes existence of both load as function and rebind, e.g. git_status with:
-    -- setup({ keymap = { fzf = { true, load = function() _G._fzf_load_called = true end } } }
-    if type(opts.keymap.fzf.load) == "function" then
-      opts.keymap.fzf.load = "execute-silent:"
-          .. shell.stringify_data(opts.keymap.fzf.load, opts, nil, true)
-    end
-    if rebind and type(opts.keymap.fzf.load) == "string" then
-      return string.format("%s+%s", rebind, opts.keymap.fzf.load)
-    else
-      return rebind or opts.keymap.fzf.load
-    end
-  end)()
+
+  if rebind then
+    table.insert(opts._fzf_cli_args,
+      "--bind=" .. libuv.shellescape(string.format("load:+%s", rebind)))
+  end
   return opts
 end
 
@@ -1218,20 +1219,20 @@ M.setup_fzf_interactive_flags = function(command, fzf_field_index, opts)
     opts.fzf_opts["--query"] = nil
     opts.query = nil
     -- setup as interactive
-    opts._fzf_cli_args = string.format("--interactive --cmd %s",
-      libuv.shellescape(no_query_condi .. reload_command))
+    table.insert(opts._fzf_cli_args, string.format("--interactive --cmd %s",
+      libuv.shellescape(no_query_condi .. reload_command)))
   else
     opts.fzf_opts["--disabled"] = true
     opts.fzf_opts["--query"] = opts.query
     -- OR with true to avoid fzf's "Command failed:" message
     if opts.silent_fail ~= false then
       reload_command = reload_command .. " || " .. utils.shell_nop()
     end
-    opts._fzf_cli_args = string.format("--bind=%s", libuv.shellescape(
-      string.format("change:reload:%s%s", no_query_condi, reload_command)))
+    table.insert(opts._fzf_cli_args, "--bind="
+      .. libuv.shellescape(string.format("change:+reload:%s%s", no_query_condi, reload_command)))
     if utils.has(opts, "fzf", { 0, 35 }) then
-      opts._fzf_cli_args = opts._fzf_cli_args .. string.format(" --bind=%s",
-        libuv.shellescape(string.format("start:reload:%s%s", no_query_condi, reload_command)))
+      table.insert(opts._fzf_cli_args, "--bind="
+        .. libuv.shellescape(string.format("start:+reload:%s%s", no_query_condi, reload_command)))
     end
   end
 

lua/fzf-lua/profiles/hide.lua

@@ -1,6 +1,7 @@
 local uv = vim.uv or vim.loop
 local fzf = require("fzf-lua")
 local shell = require "fzf-lua.shell"
+local libuv = require "fzf-lua.libuv"
 return {
   desc     = "hide interface instead of abort",
   keymap   = {
@@ -84,14 +85,18 @@ return {
         return act
       end, opts.actions)
       -- Hijack the resize event to reload buffer/tab list on unhide
-      opts.keymap.fzf.resize = "transform:" .. shell.stringify_data(function(_, _, _)
-        if opts._unhide_called then
-          opts._unhide_called = nil
-          if opts.__reload_cmd then
-            return string.format("reload:%s", opts.__reload_cmd)
+      table.insert(opts._fzf_cli_args, "--bind=" .. libuv.shellescape("resize:+transform:"
+        .. shell.stringify_data(function(_, _, _)
+          if opts._unhide_called then
+            opts._unhide_called = nil
+            if type(opts._contents) == "string"
+                and type(opts.reload_on_unhide) == "function"
+                and opts.reload_on_unhide(opts)
+            then
+              return string.format("reload:%s", opts._contents)
+            end
           end
-        end
-      end, opts, "{q}")
+        end, opts)))
       return opts
     end,
   },

lua/fzf-lua/providers/buffers.lua

@@ -2,6 +2,7 @@ local uv = vim.uv or vim.loop
 local core = require "fzf-lua.core"
 local path = require "fzf-lua.path"
 local utils = require "fzf-lua.utils"
+local libuv = require "fzf-lua.libuv"
 local config = require "fzf-lua.config"
 local base64 = require "fzf-lua.lib.base64"
 local devicons = require "fzf-lua.devicons"
@@ -383,8 +384,8 @@ M.tabs = function(opts)
 
   if opts.locate and utils.has(opts, "fzf", { 0, 36 }) then
     -- Set cursor to current buffer
-    utils.map_set(opts, "keymap.fzf.load",
-      "transform:" .. FzfLua.shell.stringify_data(function(_, _, _)
+    table.insert(opts._fzf_cli_args, "--bind=" .. libuv.shellescape("load:+transform:"
+      .. FzfLua.shell.stringify_data(function(_, _, _)
         local pos = 0
         for tabnr, tabh in ipairs(vim.api.nvim_list_tabpages()) do
           pos = pos + 1
@@ -398,7 +399,7 @@ M.tabs = function(opts)
             end
           end
         end
-      end, opts))
+      end, opts)))
   end
 
   local contents = function(cb)

lua/fzf-lua/test/helpers.lua

@@ -139,10 +139,12 @@ M.new_child_neovim = function()
             _G._fzf_load_called = nil
           end,
         },
-        keymap = { fzf = {
-          true,
-          load = function() _G._fzf_load_called = true end,
-        } }
+        -- TODO: why is gc called with builtin with this one?
+        -- keymap = { fzf = { true, load = function() _G._fzf_load_called = true end } }
+        fzf_cli_args = "--bind=" .. FzfLua.libuv.shellescape("load:+execute-silent:"
+          .. FzfLua.shell.stringify_data(function(_, _, _)
+              _G._fzf_load_called = true
+            end, {}))
       }))
     ]])
         -- using "FZF_DEFAULT_OPTS" hangs the command on the

tests/api_spec.lua

@@ -55,6 +55,7 @@ T["api"]["fzf_exec"]["rg"] = new_set({ parametrize = { { true }, { false }, { 1
       [['rg --files -g "!.git" --sort=path']],
       {
         __expect_lines = true,
+        __postprocess_wait = true,
         debug = 1,
         multiprocess = multiprocess,
       })

tests/win_spec.lua

@@ -26,8 +26,7 @@ T["win"]["hide"] = new_set()
 T["win"]["hide"]["ensure gc called after win hidden (#1782)"] = function()
   child.lua([[
     _G._gc_called = nil
-    local utils = FzfLua.utils
-    utils.setmetatable__gc = function(t, mt)
+    FzfLua.utils.setmetatable__gc = function(t, mt)
       local prox = newproxy(true)
       getmetatable(prox).__gc = function()
         _G._gc_called = true
@@ -46,7 +45,9 @@ T["win"]["hide"]["ensure gc called after win hidden (#1782)"] = function()
         child.api.nvim_chan_send(chan, vim.keycode("<c-c>"))
       end
     end
-    child.lua([[FzfLua.files{ previewer = 'builtin' }]])
+    -- TODO: why isn't gc called with the builtin previewr
+    -- child.lua([[FzfLua.files{ previewer = 'builtin' }]])
+    child.lua([[FzfLua.files{ previewer = false }]])
     child.wait_until(function()
       return child.lua_get([[_G._fzf_load_called]]) == true
     end)