fix(#2522): ctrl-c should safely abort confirm()

Author: phanen

lua/fzf-lua/actions.lua

@@ -931,7 +931,7 @@ M.git_branch_del = function(selected, opts)
     utils.warn("Cannot delete active branch '%s'", branch)
     return
   end
-  if vim.fn.confirm("Delete branch " .. branch .. "?", "&Yes\n&No") == 1 then
+  if utils.confirm("Delete branch " .. branch .. "?", "&Yes\n&No") == 1 then
     table.insert(cmd_del_branch, branch)
     local output, rc = utils.io_systemlist(cmd_del_branch)
     if rc ~= 0 then
@@ -998,7 +998,7 @@ M.git_worktree_del = function(selected, opts)
     utils.warn("Cannot delete current worktree '%s'", worktree_path)
     return
   end
-  if vim.fn.confirm("Delete worktree " .. worktree_path .. "?", "&Yes\n&No") == 1 then
+  if utils.confirm("Delete worktree " .. worktree_path .. "?", "&Yes\n&No") == 1 then
     local cmd_del = path.git_cwd({ "git", "worktree", "remove", worktree_path }, opts) ---@type string[]
     local output, rc = utils.io_systemlist(cmd_del)
     if rc ~= 0 then
@@ -1045,7 +1045,7 @@ M.git_checkout = function(selected, opts)
   local commit_hash = match_commit_hash(selected[1], opts)
   local current_commit = utils.io_systemlist(cmd_cur_commit)[1]
   if commit_hash == current_commit then return end
-  if vim.fn.confirm("Checkout commit " .. commit_hash .. "?", "&Yes\n&No") == 1 then
+  if utils.confirm("Checkout commit " .. commit_hash .. "?", "&Yes\n&No") == 1 then
     local cmd_checkout = path.git_cwd({ "git", "checkout" }, opts)
     table.insert(cmd_checkout, commit_hash)
     local output, rc = utils.io_systemlist(cmd_checkout)
@@ -1103,7 +1103,7 @@ M.git_stage_unstage = function(selected, opts)
 end
 
 M.git_reset = function(selected, opts)
-  if vim.fn.confirm("Reset " .. #selected .. " file(s)?", "&Yes\n&No") == 1 then
+  if utils.confirm("Reset " .. #selected .. " file(s)?", "&Yes\n&No") == 1 then
     for _, s in ipairs(selected) do
       s = utils.strip_ansi_coloring(s)
       local is_untracked = s:sub(5, 5) == "?"
@@ -1118,14 +1118,14 @@ M.git_reset = function(selected, opts)
 end
 
 M.git_stash_drop = function(selected, opts)
-  if vim.fn.confirm("Drop " .. #selected .. " stash(es)?", "&Yes\n&No") == 1 then
+  if utils.confirm("Drop " .. #selected .. " stash(es)?", "&Yes\n&No") == 1 then
     local cmd = path.git_cwd({ "git", "stash", "drop" }, opts)
     git_exec(selected, opts, cmd)
   end
 end
 
 M.git_stash_pop = function(selected, opts)
-  if vim.fn.confirm("Pop " .. #selected .. " stash(es)?", "&Yes\n&No") == 1 then
+  if utils.confirm("Pop " .. #selected .. " stash(es)?", "&Yes\n&No") == 1 then
     local cmd = path.git_cwd({ "git", "stash", "pop" }, opts)
     git_exec(selected, opts, cmd)
     -- trigger autoread or warn the users buffer(s) was changed
@@ -1134,7 +1134,7 @@ M.git_stash_pop = function(selected, opts)
 end
 
 M.git_stash_apply = function(selected, opts)
-  if vim.fn.confirm("Apply " .. #selected .. " stash(es)?", "&Yes\n&No") == 1 then
+  if utils.confirm("Apply " .. #selected .. " stash(es)?", "&Yes\n&No") == 1 then
     local cmd = path.git_cwd({ "git", "stash", "apply" }, opts)
     git_exec(selected, opts, cmd)
     -- trigger autoread or warn the users buffer(s) was changed

lua/fzf-lua/utils.lua

@@ -1055,7 +1055,7 @@ function M.save_dialog(bufnr)
     M.warn(string.format("buffer %d has unsaved changes", bufnr))
     return false
   end
-  local res = vim.fn.confirm(string.format([[Save changes to "%s"?]], info.name),
+  local res = M.confirm(string.format([[Save changes to "%s"?]], info.name),
     "&Yes\n&No\n&Cancel")
   if res == 0 or res == 3 then
     -- user cancelled
@@ -1335,6 +1335,19 @@ function M.input(prompt, default)
   return ok and res or nil
 end
 
+-- wrapper around |confirm()| to allow cancellation with `<C-c>`
+---@param msg string
+---@param choice? string
+---@param default? integer
+---@param ty? string
+---@return integer
+function M.confirm(msg, choice, default, ty)
+  local ok, res = pcall(vim.fn.confirm, msg, choice, default, ty)
+  if ok and type(res) == "number" then return res end
+  if type(res) == "string" and res:match("Keyboard interrupt") then return 0 end -- <C-c>
+  error(res)
+end
+
 function M.fzf_bind_to_neovim(key)
   local conv_map = {
     ["alt"] = "A",