refactor: move mt_cmd_wrapper into stringify

Author: phanen

lua/fzf-lua/complete.lua

@@ -93,8 +93,7 @@ M.path = function(opts)
     end
   end)()
   opts = set_cmp_opts_path(opts)
-  local contents = core.mt_cmd_wrapper(opts)
-  return core.fzf_exec(contents, opts)
+  return core.fzf_exec(opts.cmd, opts)
 end
 
 M.file = function(opts)
@@ -115,8 +114,7 @@ M.file = function(opts)
     end
   end)()
   opts = set_cmp_opts_path(opts)
-  local contents = core.mt_cmd_wrapper(opts)
-  return core.fzf_exec(contents, opts)
+  return core.fzf_exec(opts.cmd, opts)
 end
 
 M.line = function(opts)

lua/fzf-lua/core.lua

@@ -163,13 +163,9 @@ M.fzf_exec = function(contents, opts)
   end
   -- Contents sent to fzf can only be nil or a shell command (string)
   -- the API accepts both tables and functions which we "stringify"
-  if contents ~= nil and type(contents) ~= "string" and not opts.__stringified then
+  if not opts.fn_reload then
     opts.__contents = contents
-    local cmd, id = shell.stringify(opts)
-    -- Protect function ptr from being overwritten in the circular buffer
-    -- NOTE: will be cleared when a new picker is opened (not a resume)
-    shell.set_protected(id)
-    contents = cmd
+    contents = shell.stringify(opts)
   end
   assert(contents == nil or type(contents) == "string", "contents must be of type string")
   -- setup as "live": disables fuzzy matching and reload the content
@@ -180,6 +176,7 @@ M.fzf_exec = function(contents, opts)
       -- TODO: add support for 'fn_transform' using 'mt_cmd_wrapper'
       -- functions can be stored using 'config.bytecode' which uses
       -- 'string.dump' to convert from function code to bytes
+      opts.fn_reload = M.mt_cmd_wrapper(opts) or opts.fn_reload
       opts = M.setup_fzf_interactive_native(opts.fn_reload, opts)
       contents = opts.__fzf_init_cmd
     else
@@ -233,7 +230,7 @@ M.fzf_resume = function(opts)
 end
 
 ---@param opts table
----@param contents content
+---@param contents string?
 ---@param fn_selected function?
 ---@return thread
 M.fzf_wrap = function(opts, contents, fn_selected)
@@ -320,7 +317,7 @@ M.CTX = function(opts)
   return M.__CTX
 end
 
----@param contents content
+---@param contents string?
 ---@param opts {}?
 ---@return string[]?
 M.fzf = function(contents, opts)
@@ -789,7 +786,7 @@ M.build_fzf_cli = function(opts, fzf_win)
 end
 
 ---@param opts table
----@return string|function
+---@return string?
 M.mt_cmd_wrapper = function(opts)
   assert(opts and opts.cmd)
   ---@param o table<string, unknown>
@@ -910,10 +907,7 @@ M.mt_cmd_wrapper = function(opts)
     opts.__fn_preprocess = opts.__fn_preprocess == nil
         and function(o) return make_entry.preprocess(o) end
         or opts.__fn_preprocess
-    opts.__contents = opts.cmd
-    local cmd, id = shell.stringify(opts)
-    shell.set_protected(id)
-    return cmd
+    return nil
   end
 end
 
@@ -1169,18 +1163,17 @@ end
 
 -- converts actions defined with "reload=true" to use fzf's `reload` bind
 -- provides a better UI experience without a visible interface refresh
----@param reload_cmd content
+---@param reload_cmd string?
 ---@param opts table
 ---@return table
 M.convert_reload_actions = function(reload_cmd, opts)
   local fallback ---@type boolean?
-  local has_reload ---@type boolean?
   -- Does not work with fzf version < 0.36, fzf fails with
   -- "error 2: bind action not specified:" (#735)
   -- Not yet supported with skim
   if not utils.has(opts, "fzf", { 0, 36 })
       or utils.has(opts, "sk")
-      or type(reload_cmd) ~= "string" then
+      or not reload_cmd then
     fallback = true
   end
   -- Two types of action as table:
@@ -1191,7 +1184,6 @@ M.convert_reload_actions = function(reload_cmd, opts)
     if type(v) == "function" or type(v) == "table" then
       assert(type(v) == "function" or (v.fn and v[1] == nil) or (v[1] and v.fn == nil))
       if type(v) == "table" and v.reload then
-        has_reload = true
         assert(type(v.fn) == "function")
         -- fallback: we cannot use the `reload` event (old fzf or skim)
         -- convert to "old-style" interface reload using `resume`
@@ -1207,10 +1199,6 @@ M.convert_reload_actions = function(reload_cmd, opts)
       end
     end
   end
-  if opts.silent ~= true and has_reload and reload_cmd and type(reload_cmd) ~= "string" then
-    utils.warn(
-      "actions with `reload` are only supported with string commands, using resume fallback")
-  end
   if fallback then
     -- for fallback, conversion to "old-style" actions is sufficient
     return opts

lua/fzf-lua/fzf.lua

@@ -33,7 +33,7 @@ end
 -- contents can be either a table with tostring()able items, or a function that
 -- can be called repeatedly for values. The latter can use coroutines for async
 -- behavior.
----@param contents string[]|table|function?
+---@param contents string
 ---@param fzf_cli_args string[]
 ---@param opts table
 ---@return table selected

lua/fzf-lua/libuv.lua

@@ -694,7 +694,8 @@ M.wrap_spawn_stdio = function(opts, fn_transform, fn_preprocess, fn_postprocess)
   local nvim_bin = os.getenv("FZF_LUA_NVIM_BIN") or vim.v.progpath
   local cmd_str = ("%s -u NONE -l %s %s"):format(
     M.shellescape(_is_win and vim.fs.normalize(nvim_bin) or nvim_bin),
-    M.shellescape(vim.fn.fnamemodify(_is_win and vim.fs.normalize(__FILE__) or __FILE__, ":h") .. "/spawn.lua"),
+    M.shellescape(vim.fn.fnamemodify(_is_win and vim.fs.normalize(__FILE__) or __FILE__, ":h") ..
+      "/spawn.lua"),
     M.shellescape(("return %s,%s,%s,%s"):format(opts, fn_transform, fn_preprocess, fn_postprocess))
   )
   return cmd_str

lua/fzf-lua/make_entry.lua

@@ -27,7 +27,7 @@ local function load_config_section(s, datatype, optional)
     if datatype == "function" then
       is_bytecode = true
       exec_opts = { s, datatype }
-      exec_str = ("return require'fzf-lua'.config.bytecode(...)"):format(s)
+      exec_str = "return require'fzf-lua'.config.bytecode(...)"
     else
       exec_opts = {}
       exec_str = ("return require'fzf-lua'.config.%s"):format(s)

lua/fzf-lua/providers/files.lua

@@ -88,10 +88,9 @@ M.files = function(opts)
     -- set `opts.cwd` for relative path display
     opts.cwd = uv.cwd()
   end
-  local contents = core.mt_cmd_wrapper(opts)
   opts = core.set_title_flags(opts, { "cmd" })
   opts = core.set_header(opts, opts.headers or { "actions", "cwd" })
-  return core.fzf_exec(contents, opts)
+  return core.fzf_exec(opts.cmd, opts)
 end
 
 M.args = function(opts)
@@ -152,7 +151,6 @@ M.zoxide = function(opts)
 
   opts.__fn_transform = function(x) return make_entry.zoxide(x, opts) end
   opts.__mt_transform = [[return require("fzf-lua.make_entry").zoxide]]
-  local contents = core.mt_cmd_wrapper(opts)
 
   if opts.header == nil then
     opts.header = string.format("%8s\t%s", "score", "folder")
@@ -167,7 +165,7 @@ M.zoxide = function(opts)
         or "ls -la {2}"
   end)()
 
-  return core.fzf_exec(contents, opts)
+  return core.fzf_exec(opts.cmd, opts)
 end
 
 return M

lua/fzf-lua/providers/git.lua

@@ -27,9 +27,8 @@ M.files = function(opts)
   if not opts then return end
   opts = set_git_cwd_args(opts)
   if not opts.cwd then return end
-  local contents = core.mt_cmd_wrapper(opts)
   opts = core.set_header(opts, opts.headers or { "cwd" })
-  return core.fzf_exec(contents, opts)
+  return core.fzf_exec(opts.cmd, opts)
 end
 
 M.status = function(opts)
@@ -56,13 +55,12 @@ M.status = function(opts)
   -- will be set by `core.mt_cmd_wrapper` by commenting out the above
   opts.__fn_transform = function(x) return make_entry.git_status(x, opts) end
   opts.__mt_transform = [[return require("fzf-lua.make_entry").git_status]]
-  local contents = core.mt_cmd_wrapper(opts)
 
   opts.header_prefix = opts.header_prefix or "+ -  "
   opts.header_separator = opts.header_separator or "|"
   opts = core.set_header(opts, opts.headers or { "actions", "cwd" })
 
-  return core.fzf_exec(contents, opts)
+  return core.fzf_exec(opts.cmd, opts)
 end
 
 local function git_cmd(opts)
@@ -108,9 +106,8 @@ M.diff = function(opts)
   opts = set_git_cwd_args(opts)
   if not opts.cwd then return end
   opts.preview = git_preview(opts, "{-1}")
-  local contents = core.mt_cmd_wrapper(opts)
   opts = core.set_header(opts, opts.headers or { "cwd" })
-  return core.fzf_exec(contents, opts)
+  return core.fzf_exec(opts.cmd, opts)
 end
 
 M.commits = function(opts)
@@ -261,13 +258,12 @@ M.hunks = function(opts)
 
   opts.__fn_transform = function(x) return make_entry.git_hunk(x, opts) end
   opts.__mt_transform = [[return require("fzf-lua.make_entry").git_hunk]]
-  local contents = core.mt_cmd_wrapper(opts)
 
   opts.header_prefix = opts.header_prefix or "+ -  "
   opts.header_separator = opts.header_separator or "|"
   opts = core.set_header(opts, opts.headers or { "actions", "cwd" })
 
-  return core.fzf_exec(contents, opts)
+  return core.fzf_exec(opts.cmd, opts)
 end
 
 return M

lua/fzf-lua/providers/grep.lua

@@ -198,23 +198,15 @@ M.grep = function(opts)
   opts.cmd = get_grep_cmd(opts, opts.search, opts.no_esc)
   if not opts.cmd then return end
 
-  local contents = core.mt_cmd_wrapper(vim.tbl_deep_extend("force", opts,
-    -- query was already parsed for globs inside 'get_grep_cmd'
-    -- no need for our external headless instance to parse again
-    { rg_glob = false }))
-
-  -- by redirecting the error stream to stdout
-  -- we make sure a clear error message is displayed
-  -- when the user enters bad regex expressions
-  if type(contents) == "string" then
-    contents = contents .. " 2>&1"
-  end
+  -- query was already parsed for globs inside 'get_grep_cmd'
+  -- no need for our external headless instance to parse again
+  opts.rg_glob = false
 
   -- search query in header line
   opts = core.set_title_flags(opts, { "cmd" })
   opts = core.set_header(opts, opts.headers or { "actions", "cwd", "search" })
   opts = core.set_fzf_field_index(opts)
-  core.fzf_exec(contents, opts)
+  core.fzf_exec(opts.cmd, opts)
 end
 
 local function normalize_live_grep_opts(opts)
@@ -297,13 +289,6 @@ M.live_grep_st = function(opts)
 
   assert(not opts.multiprocess)
 
-  opts.fn_reload = function(query)
-    -- can be nil when called as fzf initial command
-    query = query or ""
-    opts.no_esc = nil
-    return get_grep_cmd(opts, query, true)
-  end
-
   if opts.requires_processing or opts.git_icons or opts.file_icons then
     opts.fn_transform = opts.fn_transform or
         function(x)
@@ -319,7 +304,13 @@ M.live_grep_st = function(opts)
   opts = core.set_title_flags(opts, { "cmd", "live" })
   opts = core.set_header(opts, opts.headers or { "actions", "cwd" })
   opts = core.set_fzf_field_index(opts)
-  core.fzf_exec(nil, opts)
+
+  core.fzf_live(function(query)
+    -- can be nil when called as fzf initial command
+    query = query or ""
+    opts.no_esc = nil
+    return get_grep_cmd(opts, query, true)
+  end, opts)
 end
 
 -- multi threaded (multi-process actually) version
@@ -345,17 +336,11 @@ M.live_grep_mt = function(opts)
   opts.cmd = get_grep_cmd(opts, core.fzf_query_placeholder, 2)
   if not opts.cmd then return end
 
-  local command = core.mt_cmd_wrapper(opts)
-
-  -- signal 'fzf_exec' to set 'change:reload' parameters
-  -- or skim's "interactive" mode (AKA "live query")
-  opts.fn_reload = command
-
   -- search query in header line
   opts = core.set_title_flags(opts, { "cmd", "live" })
   opts = core.set_header(opts, opts.headers or { "actions", "cwd" })
   opts = core.set_fzf_field_index(opts)
-  core.fzf_exec(nil, opts)
+  core.fzf_live(opts.cmd, opts)
 end
 
 M.live_grep_glob_st = function(opts)

lua/fzf-lua/providers/lsp.lua

@@ -816,7 +816,7 @@ M.live_workspace_symbols = function(opts)
   opts.lsp_params = { query = opts.lsp_query or opts.query or "" }
   opts.query = opts.lsp_query or opts.query
 
-  opts.fn_reload = function(query)
+  local contents = function(query)
     opts.query = query
     opts.lsp_params = { query = query or "" }
     opts = gen_lsp_contents(opts)
@@ -829,7 +829,7 @@ M.live_workspace_symbols = function(opts)
     opts.fn_pre_fzf = function() gen_sym2style_map(opts) end
     opts.fn_post_fzf = function() M._sym2style = nil end
   end
-  return core.fzf_exec(nil, opts)
+  return core.fzf_live(contents, opts)
 end
 
 M.code_actions = function(opts)

lua/fzf-lua/shell.lua

@@ -169,17 +169,25 @@ M.raw_preview_action_cmd = function(fn, fzf_field_index, debug)
 end
 
 ---@param opts {}
----@return string, integer
+---@return string, integer?
 M.stringify = function(opts, fzf_field_index)
   -- Fzf field index expression, e.g. "{+}" (selected), "{q}" (query)
   fzf_field_index = fzf_field_index or opts.__fzf_field_index or ""
 
   assert(type(opts.__fn_reload) == "function" or opts.__contents, "must supply contents")
 
   -- Mark opts as already "stringified"
+  assert(not opts.__stringified, "twice stringified")
   opts.__stringified = true
 
-  return M.raw_async_action(function(pipe, args)
+  -- no register function
+  if type(opts.__contents) == "string" then
+    opts.cmd = opts.__contents
+    local cmd = require("fzf-lua.core").mt_cmd_wrapper(opts)
+    if cmd then return cmd, nil end
+  end
+
+  local cmd, id = M.raw_async_action(function(pipe, args)
     -- Contents could be dependent or args, e.g. live_grep which
     -- generates a different command based on the typed query
     local contents = type(opts.__fn_reload) == "function"
@@ -318,6 +326,9 @@ M.stringify = function(opts, fzf_field_index)
       fn_load()
     end
   end, fzf_field_index, opts.debug)
+
+  M.set_protected(id)
+  return cmd, id
 end
 
 return M