feat: prompt users without fzf for the zoxide plugin (#2122)

Co-authored-by: sxyazi <sxyazi@gmail.com>
This commit is contained in:
hankertrix 2024-12-30 22:33:13 +08:00 committed by GitHub
parent 2770e0259c
commit fd21452aa4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -9,7 +9,7 @@ local set_state = ya.sync(function(st, empty) st.empty = empty end)
local function fail(s, ...) ya.notify { title = "Zoxide", content = s:format(...), timeout = 5, level = "error" } end local function fail(s, ...) ya.notify { title = "Zoxide", content = s:format(...), timeout = 5, level = "error" } end
local function opts() local function options()
-- https://github.com/ajeetdsouza/zoxide/blob/main/src/cmd/query.rs#L92 -- https://github.com/ajeetdsouza/zoxide/blob/main/src/cmd/query.rs#L92
local default = { local default = {
-- Search mode -- Search mode
@ -88,27 +88,27 @@ local function entry()
end end
local _permit = ya.hide() local _permit = ya.hide()
local child, err = Command("zoxide") local child, err1 = Command("zoxide")
:args({ "query", "-i", "--exclude" }) :args({ "query", "-i", "--exclude" })
:arg(st.cwd) :arg(st.cwd)
:env("SHELL", "sh") :env("SHELL", "sh")
:env("CLICOLOR", "1") :env("CLICOLOR", "1")
:env("CLICOLOR_FORCE", "1") :env("CLICOLOR_FORCE", "1")
:env("_ZO_FZF_OPTS", opts()) :env("_ZO_FZF_OPTS", options())
:stdin(Command.INHERIT) :stdin(Command.INHERIT)
:stdout(Command.PIPED) :stdout(Command.PIPED)
:stderr(Command.INHERIT) :stderr(Command.PIPED)
:spawn() :spawn()
if not child then if not child then
return fail("Failed to start `zoxide`, error: " .. err) return fail("Failed to start `zoxide`, error: " .. err1)
end end
local output, err = child:wait_with_output() local output, err2 = child:wait_with_output()
if not output then if not output then
return fail("Cannot read `zoxide` output, error: " .. err) return fail("Cannot read `zoxide` output, error: " .. err2)
elseif not output.status.success and output.status.code ~= 130 then elseif not output.status.success and output.status.code ~= 130 then
return fail("`zoxide` exited with error code %s", output.status.code) return fail("`zoxide` exited with code %s: %s", output.status.code, output.stderr:gsub("^zoxide:%s*", ""))
end end
local target = output.stdout:gsub("\n$", "") local target = output.stdout:gsub("\n$", "")