mirrors/argparse
1
0
Fork 0
mirror of https://github.com/TangentFoxy/argparse.git synced 2025-07-28 11:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the base name for completions

Browse Source
This commit is contained in:
Paul Ouellette
2019-07-23 15:03:35 -04:00
parent d61b5e4f3d
commit 56e81ad786
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/comptest
View File

@@ -2,7 +2,7 @@
local argparse = require "argparse" local argparse = require "argparse"
local parser = argparse "comptest" local parser = argparse()
:add_help_command() :add_help_command()
:add_complete_command() :add_complete_command()

28
src/argparse.lua
View File

@@ -1085,10 +1085,11 @@ function Parser:add_help_command(value)
end end
function Parser:_is_shell_safe() function Parser:_is_shell_safe()
if self._name:find("[^%w_%-%+%.]") then if self._basename then
if self._basename:find("[^%w_%-%+%.]") then
return false return false
end end
if self._aliases then else
for _, alias in ipairs(self._aliases) do for _, alias in ipairs(self._aliases) do
if alias:find("[^%w_%-%+%.]") then if alias:find("[^%w_%-%+%.]") then
return false return false
@@ -1170,6 +1171,10 @@ function Parser:add_complete_command(value)
return self return self
end end
local function base_name(pathname)
return pathname:gsub("[/\\]*$", ""):match(".*[/\\]([^/\\]*)") or pathname
end
local function get_short_description(element) local function get_short_description(element)
local short = element:_get_description():match("^(.-)%.%s") local short = element:_get_description():match("^(.-)%.%s")
return short or element:_get_description():match("^(.-)%.?$") return short or element:_get_description():match("^(.-)%.?$")
@@ -1251,7 +1256,7 @@ function Parser:_bash_cmd_completions(buf)
end end
table.insert(buf, (" "):rep(4) .. 'case "$cmd" in') table.insert(buf, (" "):rep(4) .. 'case "$cmd" in')
table.insert(buf, (" "):rep(8) .. self._name .. ")") table.insert(buf, (" "):rep(8) .. self._basename .. ")")
table.insert(buf, (" "):rep(12) .. 'COMPREPLY=($(compgen -W "' .. self:_get_commands() .. '" -- "$cur"))') table.insert(buf, (" "):rep(12) .. 'COMPREPLY=($(compgen -W "' .. self:_get_commands() .. '" -- "$cur"))')
table.insert(buf, (" "):rep(12) .. ";;") table.insert(buf, (" "):rep(12) .. ";;")
if #subcmds > 0 then if #subcmds > 0 then
@@ -1261,6 +1266,7 @@ function Parser:_bash_cmd_completions(buf)
end end
function Parser:get_bash_complete() function Parser:get_bash_complete()
self._basename = base_name(self._name)
assert(self:_is_shell_safe()) assert(self:_is_shell_safe())
local buf = {([[ local buf = {([[
_%s() { _%s() {
@@ -1270,7 +1276,7 @@ _%s() {
prev="${COMP_WORDS[COMP_CWORD-1]}" prev="${COMP_WORDS[COMP_CWORD-1]}"
cmd="%s" cmd="%s"
opts="%s" opts="%s"
]]):format(self._name, self._name, self:_get_options())} ]]):format(self._basename, self._basename, self:_get_options())}
self:_bash_option_args(buf, 4) self:_bash_option_args(buf, 4)
self:_bash_get_cmd(buf) self:_bash_get_cmd(buf)
@@ -1285,7 +1291,7 @@ _%s() {
} }
complete -F _%s -o bashdefault -o default %s complete -F _%s -o bashdefault -o default %s
]=]):format(self._name, self._name)) ]=]):format(self._basename, self._basename))
return table.concat(buf, "\n") return table.concat(buf, "\n")
end end
@@ -1391,16 +1397,17 @@ function Parser:_zsh_complete_help(buf, cmds_buf, cmd_name, indent)
end end
function Parser:get_zsh_complete() function Parser:get_zsh_complete()
self._basename = base_name(self._name)
assert(self:_is_shell_safe()) assert(self:_is_shell_safe())
local buf = {("compdef _%s %s\n"):format(self._name, self._name)} local buf = {("compdef _%s %s\n"):format(self._basename, self._basename)}
local cmds_buf = {} local cmds_buf = {}
table.insert(buf, "_" .. self._name .. "() {") table.insert(buf, "_" .. self._basename .. "() {")
if #self._commands > 0 then if #self._commands > 0 then
table.insert(buf, " local context state state_descr line") table.insert(buf, " local context state state_descr line")
table.insert(buf, " typeset -A opt_args\n") table.insert(buf, " typeset -A opt_args\n")
end end
self:_zsh_arguments(buf, self._name, 2) self:_zsh_arguments(buf, self._basename, 2)
self:_zsh_complete_help(buf, cmds_buf, self._name, 2) self:_zsh_complete_help(buf, cmds_buf, self._basename, 2)
table.insert(buf, "\n return 1") table.insert(buf, "\n return 1")
table.insert(buf, "}") table.insert(buf, "}")
@@ -1469,9 +1476,10 @@ function Parser:_fish_complete_help(buf, prefix)
end end
function Parser:get_fish_complete() function Parser:get_fish_complete()
self._basename = base_name(self._name)
assert(self:_is_shell_safe()) assert(self:_is_shell_safe())
local buf = {} local buf = {}
local prefix = "complete -c " .. self._name local prefix = "complete -c " .. self._basename
self:_fish_complete_help(buf, prefix) self:_fish_complete_help(buf, prefix)
return table.concat(buf, "\n") .. "\n" return table.concat(buf, "\n") .. "\n"
end end