fix: don't use unused {+} to avoid {+} is not expand when there's no match

Author: phanen

lua/fzf-lua/providers/buffers.lua

@@ -199,9 +199,8 @@ M.buffers = function(opts)
   end
 
   -- build the "reload" cmd and remove '-- {+}' from the initial cmd
-  local reload, id = shell.reload_action_cmd(opts, "{+}")
-  local contents = reload:gsub("%-%-%s+{%+}$", "")
-  opts.__reload_cmd = reload
+  local contents, id = shell.reload_action_cmd(opts, "")
+  opts.__reload_cmd = contents
 
   -- get current tab/buffer/previous buffer
   -- save as a func ref for resume to reuse
@@ -440,9 +439,8 @@ M.tabs = function(opts)
   end
 
   -- build the "reload" cmd and remove '-- {+}' from the initial cmd
-  local reload, id = shell.reload_action_cmd(opts, "{+}")
-  local contents = reload:gsub("%-%-%s+{%+}$", "")
-  opts.__reload_cmd = reload
+  local contents, id = shell.reload_action_cmd(opts, "")
+  opts.__reload_cmd = contents
 
   -- get current tab/buffer/previous buffer
   -- save as a func ref for resume to reuse

lua/fzf-lua/providers/colorschemes.lua

@@ -490,9 +490,8 @@ M.awesome_colorschemes = function(opts)
   end
 
   -- build the "reload" cmd and remove '-- {+}' from the initial cmd
-  local reload, id = shell.reload_action_cmd(opts, "{+}")
-  local contents = reload:gsub("%-%-%s+{%+}$", "")
-  opts.__reload_cmd = reload
+  local contents, id = shell.reload_action_cmd(opts, "")
+  opts.__reload_cmd = contents
 
   opts._fn_pre_fzf = function()
     shell.set_protected(id)

lua/fzf-lua/providers/dap.lua

@@ -117,9 +117,8 @@ M.breakpoints = function(opts)
   end
 
   -- build the "reload" cmd and remove '-- {+}' from the initial cmd
-  local reload, id = shell.reload_action_cmd(opts, "{+}")
-  local contents = reload:gsub("%-%-%s+{%+}$", "")
-  opts.__reload_cmd = reload
+  local contents, id = shell.reload_action_cmd(opts, "")
+  opts.__reload_cmd = contents
 
   opts._fn_pre_fzf = function()
     shell.set_protected(id)

lua/fzf-lua/providers/files.lua

@@ -138,9 +138,8 @@ M.args = function(opts)
   end
 
   -- build the "reload" cmd and remove '-- {+}' from the initial cmd
-  local reload, id = shell.reload_action_cmd(opts, "{+}")
-  local contents = reload:gsub("%-%-%s+{%+}$", "")
-  opts.__reload_cmd = reload
+  local contents, id = shell.reload_action_cmd(opts, "")
+  opts.__reload_cmd = contents
 
   opts._fn_pre_fzf = function()
     shell.set_protected(id)
@@ -162,7 +161,7 @@ M.zoxide = function(opts)
   -- we always require processing
   opts.requires_processing = true
 
-  local contents
+  local contents, id
   if opts.multiprocess then
     opts.__mt_transform = [[return require("fzf-lua.make_entry").zoxide]]
     contents = core.mt_cmd_wrapper(opts)
@@ -177,9 +176,8 @@ M.zoxide = function(opts)
     end
 
     -- build the "reload" cmd and remove '-- {+}' from the initial cmd
-    local reload, id = shell.reload_action_cmd(opts, "{+}")
-    contents = reload:gsub("%-%-%s+{%+}$", "")
-    opts.__reload_cmd = reload
+    contents, id = shell.reload_action_cmd(opts, "")
+    opts.__reload_cmd = contents
 
     opts._fn_pre_fzf = function()
       shell.set_protected(id)

lua/fzf-lua/providers/git.lua

@@ -47,7 +47,7 @@ M.status = function(opts)
   -- we always require processing (can't send the raw command to fzf)
   opts.requires_processing = true
 
-  local contents
+  local contents, id
   if opts.multiprocess then
     -- git status does not require preprocessing if not loading devicons
     -- opts.__mt_preprocess = opts.file_icons
@@ -72,9 +72,8 @@ M.status = function(opts)
     end
 
     -- build the "reload" cmd and remove '-- {+}' from the initial cmd
-    local reload, id = shell.reload_action_cmd(opts, "{+}")
-    contents = reload:gsub("%-%-%s+{%+}$", "")
-    opts.__reload_cmd = reload
+    contents, id = shell.reload_action_cmd(opts, "")
+    opts.__reload_cmd = contents
 
     -- when the action resumes the preview re-attaches which registers
     -- a new shell function id, done enough times it will overwrite the
@@ -270,9 +269,8 @@ M.stash = function(opts)
   end
 
   -- build the "reload" cmd and remove '-- {+}' from the initial cmd
-  local reload, id = shell.reload_action_cmd(opts, "{+}")
-  local contents = reload:gsub("%-%-%s+{%+}$", "")
-  opts.__reload_cmd = reload
+  local contents, id = shell.reload_action_cmd(opts, "")
+  opts.__reload_cmd = contents
 
   opts._fn_pre_fzf = function()
     shell.set_protected(id)

lua/fzf-lua/providers/nvim.lua

@@ -255,9 +255,8 @@ M.marks = function(opts)
   end
 
   -- build the "reload" cmd and remove '-- {+}' from the initial cmd
-  local reload, id = shell.reload_action_cmd(opts, "{+}")
-  local contents = reload:gsub("%-%-%s+{%+}$", "")
-  opts.__reload_cmd = reload
+  local contents, id = shell.reload_action_cmd(opts, "")
+  opts.__reload_cmd = contents
 
   opts._fn_pre_fzf = function()
     shell.set_protected(id)
@@ -504,9 +503,8 @@ M.nvim_options = function(opts)
   end
 
   -- build the "reload" cmd and remove '-- {+}' from the initial cmd
-  local reload, id = shell.reload_action_cmd(opts, "{+}")
-  local contents = reload:gsub("%-%-%s+{%+}$", "")
-  opts.__reload_cmd = reload
+  local contents, id = shell.reload_action_cmd(opts, "")
+  opts.__reload_cmd = contents
 
   opts._fn_pre_fzf = function()
     shell.set_protected(id)