fix(resume): do not over "protect"

Author: ibhagwan

lua/fzf-lua/core.lua

@@ -155,7 +155,8 @@ M.fzf_exec = function(contents, opts)
   -- the API accepts both tables and functions which we "stringify"
   -- We also send string commands as stringify is also responsible
   -- for multiprocess wrapping of shell commands with processing
-  contents = contents and shell.stringify(contents, opts) or nil
+  shell.clear_protected()
+  contents = contents and shell.stringify(contents, opts, nil, true) or nil
   assert(contents == nil or type(contents) == "string", "contents must be of type string")
   return M.fzf_wrap(contents, opts)
 end
@@ -172,7 +173,10 @@ M.fzf_live = function(contents, opts)
   -- AKA "live": fzf acts as a selector only (fuzzy matching is disabled)
   -- each keypress reloads fzf's input usually based on the typed query
   -- utilizes fzf's 'change:reload' event or skim's "interactive" mode
-  opts.fn_reload = shell.stringify(contents, opts)
+  -- convert "reload" actions to fzf's `reload` binds
+  -- convert "exec_silent" actions to fzf's `execute-silent` binds
+  shell.clear_protected()
+  opts.fn_reload = shell.stringify(contents, opts, nil, true)
   local fzf_field_index = M.fzf_field_index(opts)
   local cmd = M.expand_query(opts.fn_reload, fzf_field_index)
   contents, opts = M.setup_fzf_interactive_flags(cmd, fzf_field_index, opts)
@@ -190,7 +194,6 @@ M.fzf_resume = function(opts)
   assert(opts == config.__resume_data.opts)
   opts = M.set_header(opts, opts.headers or {})
   opts.cwd = opts.cwd and libuv.expand(opts.cwd) or nil
-  opts.__resuming = true
   M.fzf_wrap(config.__resume_data.contents, config.__resume_data.opts)
 end
 
@@ -199,6 +202,9 @@ end
 ---@return thread, string, table
 M.fzf_wrap = function(contents, opts)
   opts = opts or {}
+  -- Does nothing if already converted
+  opts = M.convert_reload_actions(contents, opts)
+  opts = M.convert_exec_silent_actions(opts)
   local _co
   local wrapped = coroutine.wrap(function()
     _co = coroutine.running()
@@ -315,11 +321,6 @@ M.fzf = function(contents, opts)
       opts.actions[k] = actions.dummy_abort
     end
   end
-  if not opts.__resuming then
-    -- `opts.__resuming` is only set from `fzf_resume`, since we
-    -- not resuming clear the shell protected functions registry
-    shell.clear_protected()
-  end
   -- store last call opts for resume
   config.resume_set(nil, opts.__call_opts, opts)
   -- caller specified not to resume this call (used by "builtin" provider)
@@ -392,10 +393,6 @@ M.fzf = function(contents, opts)
 
   fzf_win:attach_previewer(previewer)
   local fzf_bufnr = fzf_win:create()
-  -- convert "reload" actions to fzf's `reload` binds
-  -- convert "exec_silent" actions to fzf's `execute-silent` binds
-  opts = M.convert_reload_actions(contents, opts)
-  opts = M.convert_exec_silent_actions(opts)
   local selected, exit_code = fzf.raw_fzf(contents, M.build_fzf_cli(opts, fzf_win),
     {
       fzf_bin = opts.fzf_bin,
@@ -997,7 +994,7 @@ local patch_shell_action = function(v, opts)
       items = (zero_matched and zero_selected) and {} or items
     end
     v.fn(items, opts)
-  end, opts, field_index)
+  end, opts, field_index, true)
 end
 
 -- converts actions defined with "reload=true" to use fzf's `reload` bind
@@ -1006,6 +1003,8 @@ end
 ---@param opts table
 ---@return table
 M.convert_reload_actions = function(reload_cmd, opts)
+  if opts.__converted_reload then return opts end
+  opts.__converted_reload = true
   local fallback ---@type boolean?
   -- Does not work with fzf version < 0.36, fzf fails with
   -- "error 2: bind action not specified:" (#735)
@@ -1083,7 +1082,8 @@ M.convert_reload_actions = function(reload_cmd, opts)
     -- 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)
+      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)
@@ -1099,6 +1099,8 @@ end
 ---@param opts table
 ---@return table
 M.convert_exec_silent_actions = function(opts)
+  if opts.__converted_exec_silent then return opts end
+  opts.__converted_exec_silent = true
   -- `execute-silent` actions are bugged with skim (can't use quotes)
   if utils.has(opts, "sk") then
     return opts

lua/fzf-lua/previewer/builtin.lua

@@ -454,7 +454,7 @@ function Previewer.base:cmdline(_)
     -- save last entry even if we don't display
     self.last_entry = entry
     return ""
-  end, self.opts, "{} {q} {n}")
+  end, self.opts, "{} {q} {n}", false)
   return act
 end
 
@@ -481,7 +481,7 @@ function Previewer.base:zero(_)
         self.last_entry = nil
         vim.fn.delete(self._zero_lock, "d")
       end, self.delay)
-    end, self.opts, ""))
+    end, self.opts, "", false))
   return act
 end
 

lua/fzf-lua/previewer/fzf.lua

@@ -87,7 +87,7 @@ function Previewer.cmd:action(o)
   local act = shell.stringify_data(function(items, _, _)
     local entry = path.entry_to_file(items[1], self.opts)
     return entry.bufname or entry.path
-  end, self.opts, self.opts.field_index_expr or "{}")
+  end, self.opts, self.opts.field_index_expr or "{}", false)
   return act
 end
 
@@ -214,7 +214,7 @@ function Previewer.cmd_async:cmdline(o)
     local cmd = errcmd or ("%s %s %s"):format(
       self.cmd, self.args, libuv.shellescape(filepath))
     return cmd
-  end, self.opts, "{} {q}")
+  end, self.opts, "{} {q}", false)
   return act
 end
 
@@ -278,7 +278,7 @@ function Previewer.bat_async:cmdline(o)
       line_range,
       libuv.shellescape(filepath))
     return cmd
-  end, self.opts, "{} {q}")
+  end, self.opts, "{} {q}", false)
   return act
 end
 
@@ -379,7 +379,7 @@ function Previewer.git_diff:cmdline(o)
     -- cmd = string.format("%s %s %s", table.concat(setenv, " "), cmd, pager)
     cmd = string.format("%s %s", cmd, pager)
     return { cmd = cmd, env = env }
-  end, self.opts, "{}")
+  end, self.opts, "{}", false)
   return act
 end
 
@@ -398,7 +398,7 @@ function Previewer.man_pages:cmdline(o)
     local manpage = require("fzf-lua.providers.manpages").manpage_sh_arg(items[1])
     local cmd = self.cmd:format(manpage)
     return cmd
-  end, self.opts, "{}")
+  end, self.opts, "{}", false)
   return act
 end
 
@@ -435,7 +435,7 @@ function Previewer.help_tags:cmdline(o)
       end
     end
     return cmd
-  end, self.opts, "{}")
+  end, self.opts, "{}", false)
   return act
 end
 

lua/fzf-lua/profiles/telescope.lua

@@ -8,7 +8,7 @@ end
 return {
   { "default-title" }, -- base profile
   desc       = "match telescope default highlights|keybinds",
-  fzf_opts   = { ["--layout"] = "default", ["--marker"] = "+" , ["--cycle"] = true},
+  fzf_opts   = { ["--layout"] = "default", ["--marker"] = "+", ["--cycle"] = true },
   winopts    = {
     width   = 0.8,
     height  = 0.9,

lua/fzf-lua/rpc.lua

@@ -82,7 +82,7 @@ local rpc_nvim_exec_lua = function(opts)
     vim.fn.chanclose(chan_id)
   end)
 
-  if not success or opts.debug then
+  if not success or opts.debug == "v" or opts.debug == 2 then
     io.stderr:write(("[DEBUG] debug = %s\n"):format(opts.debug))
     io.stderr:write(("[DEBUG] function ID = %d\n"):format(opts.fnc_id))
     io.stderr:write(("[DEBUG] fzf_lua_server = %s\n"):format(opts.fzf_lua_server))
@@ -107,7 +107,18 @@ local args = vim.deepcopy(_G.arg)
 args[0] = nil -- remove filename
 local opts = {
   fnc_id = tonumber(table.remove(args, 1)),
-  debug = table.remove(args, 1) == "true",
+  debug = (function()
+    local ret = table.remove(args, 1)
+    if ret == "nil" then
+      return nil
+    elseif ret == "true" then
+      return true
+    elseif ret == "false" then
+      return false
+    else
+      return tonumber(ret) or tostring(ret)
+    end
+  end)(),
   fzf_selection = args,
   fzf_lua_server = vim.env.FZF_LUA_SERVER or vim.env.SKIM_FZF_LUA_SERVER or vim.env.NVIM,
 }

lua/fzf-lua/shell.lua

@@ -235,7 +235,7 @@ end
 ---Fzf field index expression, e.g. "{+}" (selected), "{q}" (query)
 ---@param fzf_field_index string?
 ---@return string, integer?
-M.stringify = function(contents, opts, fzf_field_index)
+M.stringify = function(contents, opts, fzf_field_index, protect)
   assert(contents, "must supply contents")
 
   -- TODO: should we let this assert?
@@ -411,20 +411,27 @@ M.stringify = function(contents, opts, fzf_field_index)
     end
   end, fzf_field_index or "", opts.debug)
 
-  M.set_protected(id)
+  -- "protect" a function ptr, cleared when opening a new picker in `core.fzf()`
+  -- protected functions include init (content) commands and acrions (reload
+  -- and execute-silent), previewer trigger commands are excluded (zero event
+  -- and preview callback)
+  if protect then
+    M.set_protected(id)
+  end
+
   return cmd, id
 end
 
-M.stringify_cmd = function(fn, opts, fzf_field_index)
+M.stringify_cmd = function(fn, opts, fzf_field_index, protect)
   assert(type(fn) == "function", "fn must be of type function")
   return M.stringify(fn, {
     __stringify_cmd = true,
     PidObject = utils.pid_object("__stringify_cmd_pid", opts),
     debug = opts.debug,
-  }, fzf_field_index)
+  }, fzf_field_index, protect)
 end
 
-M.stringify_data = function(fn, opts, fzf_field_index)
+M.stringify_data = function(fn, opts, fzf_field_index, protect)
   assert(type(fn) == "function", "fn must be of type function")
   return M.stringify(function(cb, _, ...)
     local ret = fn(...)
@@ -436,7 +443,7 @@ M.stringify_data = function(fn, opts, fzf_field_index)
       cb(tostring(ret))
     end
     cb(nil)
-  end, { debug = opts.debug }, fzf_field_index)
+  end, { debug = opts.debug }, fzf_field_index, protect)
 end
 
 return M