internal: renamed 'cb_pid' -> 'pid_cb'

main
bhagwan 3 years ago
parent 69b70ec2ec
commit 30f50017bf

@ -638,7 +638,7 @@ function M.normalize_opts(opts, defaults)
opts._is_skim = opts.fzf_bin:find('sk') ~= nil
-- cmd_line_transformer pid callback
opts._cb_pid = function(pid, o) o._pid_cmd = pid end
opts._pid_cb = function(pid) opts._pid = pid end
-- mark as normalized
opts._normalized = true

@ -46,7 +46,7 @@ M.fzf = function(opts, contents)
fzf_win:create()
local selected, exit_code = fzf.raw_fzf(contents, M.build_fzf_cli(opts),
{ fzf_binary = opts.fzf_bin, fzf_cwd = opts.cwd })
utils.process_kill(opts._pid_cmd)
utils.process_kill(opts._pid)
fzf_win:check_exit_status(exit_code)
if fzf_win:autoclose() == nil or fzf_win:autoclose() then
fzf_win:close()
@ -410,6 +410,7 @@ M.set_fzf_interactive_cmd = function(opts)
-- save current process pid
local pid = _pid
opts._pid = _pid
local function write_cb(data)
if not pipe then return end
@ -562,7 +563,7 @@ M.set_fzf_interactive = function(opts, act_cmd, placeholder)
if opts.exec_empty_query or (query and #query>0) then
opts.fzf_fn = require("fzf.helpers").cmd_line_transformer(
{ cmd = act_cmd:gsub(placeholder, vim.fn.shellescape(query)),
cwd = opts.cwd, cb_pid = opts._cb_pid, cb_data = opts },
cwd = opts.cwd, pid_cb = opts._pid_cb },
function(x) return x end)
end
opts.fzf_opts['--phony'] = ''

@ -33,7 +33,7 @@ M.files = function(opts)
local command = get_files_cmd(opts)
opts.fzf_fn = fzf_helpers.cmd_line_transformer(
{ cmd = command, cwd = opts.cwd, cb_pid = opts._cb_pid, cb_data = opts },
{ cmd = command, cwd = opts.cwd, pid_cb = opts._pid_cb },
function(x)
return core.make_entry_file(opts, x)
end)

@ -23,7 +23,7 @@ M.files = function(opts)
if not opts.cwd then return end
local make_entry_file = core.make_entry_file
opts.fzf_fn = fzf_helpers.cmd_line_transformer(
{ cmd = opts.cmd, cwd = opts.cwd, cb_pid = opts._cb_pid, cb_data = opts },
{ cmd = opts.cmd, cwd = opts.cwd, pid_cb = opts._pid_cb },
function(x)
return make_entry_file(opts, x)
end)
@ -39,7 +39,7 @@ M.status = function(opts)
opts.preview = vim.fn.shellescape(path.git_cwd(opts.preview, opts.cwd))
end
opts.fzf_fn = fzf_helpers.cmd_line_transformer(
{ cmd = opts.cmd, cwd = opts.cwd, cb_pid = opts._cb_pid, cb_data = opts },
{ cmd = opts.cmd, cwd = opts.cwd, pid_cb = opts._pid_cb },
function(x)
-- greedy match anything after last space
x = x:match("[^ ]*$")
@ -53,7 +53,7 @@ local function git_cmd(opts)
if not opts.cwd then return end
coroutine.wrap(function ()
opts.fzf_fn = fzf_helpers.cmd_line_transformer(
{ cmd = opts.cmd, cwd = opts.cwd, cb_pid = opts._cb_pid, cb_data = opts },
{ cmd = opts.cmd, cwd = opts.cwd, pid_cb = opts._pid_cb },
function(x) return x end)
local selected = core.fzf(opts, opts.fzf_fn)
if not selected then return end

@ -111,7 +111,7 @@ M.grep = function(opts)
local command = get_grep_cmd(opts, opts.search, no_esc)
opts.fzf_fn = fzf_helpers.cmd_line_transformer(
{ cmd = command, cwd = opts.cwd, cb_pid = opts._cb_pid, cb_data = opts },
{ cmd = command, cwd = opts.cwd, pid_cb = opts._pid_cb },
function(x)
return core.make_entry_file(opts, x)
end)
@ -228,7 +228,7 @@ M.live_grep_native = function(opts)
if opts.exec_empty_query or (opts.search and #opts.search > 0) then
opts.fzf_fn = fzf_helpers.cmd_line_transformer(
{cmd = initial_command:gsub(placeholder, vim.fn.shellescape(query)),
cwd = opts.cwd, cb_pid = opts._cb_pid, cb_data = opts },
cwd = opts.cwd, pid_cb = opts._pid_cb },
function(x)
return core.make_entry_file(opts, x)
end)

@ -36,7 +36,7 @@ M.manpages = function(opts)
-- local prev_act = action(function (args) end)
local fzf_fn = fzf_helpers.cmd_line_transformer(
{ cmd = opts.cmd, cwd = opts.cwd, cb_pid = opts._cb_pid, cb_data = opts },
{ cmd = opts.cmd, cwd = opts.cwd, pid_cb = opts._pid_cb },
function(x)
-- split by first occurence of ' - ' (spaced hyphen)
local man, desc = x:match("^(.-) %- (.*)$")

Loading…
Cancel
Save