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

Zsh completions: complete main command options after subcommands

Browse Source
This commit is contained in:
Paul Ouellette
2019-07-26 23:31:09 -04:00
parent c9f8f90a60
commit a7d37b8065
2 changed files with 55 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
spec/completion_spec.lua
View File

@@ -92,63 +92,94 @@ _comptest() {
local context state state_descr line
typeset -A opt_args
local -a options=(
{-h,--help}"[Show this help message and exit]"
"--completion[Output a shell completion script for the specified shell]: :(bash zsh fish)"
"*"{-v,--verbose}"[Set the verbosity level]"
{-f,--files}"[A description with illegal \"' characters]:*: :_files"
)
_arguments -s -S \
{-h,--help}"[Show this help message and exit]" \
"--completion[Output a shell completion script for the specified shell]: :(bash zsh fish)" \
"*"{-v,--verbose}"[Set the verbosity level]" \
{-f,--files}"[A description with illegal \"' characters]:*: :_files" \
$options \
": :_comptest_cmds" \
"*:: :->args" \
&& return 0
case $words[1] in
help)
options=(
$options
{-h,--help}"[Show this help message and exit]"
)
_arguments -s -S \
{-h,--help}"[Show this help message and exit]" \
$options \
": :(help completion install i admin)" \
&& return 0
;;
completion)
options=(
$options
{-h,--help}"[Show this help message and exit]"
)
_arguments -s -S \
{-h,--help}"[Show this help message and exit]" \
$options \
": :(bash zsh fish)" \
&& return 0
;;
install|i)
options=(
$options
{-h,--help}"[Show this help message and exit]"
"--deps-mode: :(all one order none)"
"--no-doc[Install without documentation]"
)
_arguments -s -S \
{-h,--help}"[Show this help message and exit]" \
"--deps-mode: :(all one order none)" \
"--no-doc[Install without documentation]" \
$options \
&& return 0
;;
admin)
options=(
$options
{-h,--help}"[Show this help message and exit]"
)
_arguments -s -S \
{-h,--help}"[Show this help message and exit]" \
$options \
": :_comptest_admin_cmds" \
"*:: :->args" \
&& return 0
case $words[1] in
help)
options=(
$options
{-h,--help}"[Show this help message and exit]"
)
_arguments -s -S \
{-h,--help}"[Show this help message and exit]" \
$options \
": :(help add remove)" \
&& return 0
;;
add)
options=(
$options
{-h,--help}"[Show this help message and exit]"
)
_arguments -s -S \
{-h,--help}"[Show this help message and exit]" \
$options \
": :_files" \
&& return 0
;;
remove)
options=(
$options
{-h,--help}"[Show this help message and exit]"
)
_arguments -s -S \
{-h,--help}"[Show this help message and exit]" \
$options \
": :_files" \
&& return 0
;;

14
src/argparse.lua
View File

@@ -1306,7 +1306,12 @@ complete -F _%s -o bashdefault -o default %s
end
function Parser:_zsh_arguments(buf, cmd_name, indent)
table.insert(buf, (" "):rep(indent) .. "_arguments -s -S \\")
if self._parent then
table.insert(buf, (" "):rep(indent) .. "options=(")
table.insert(buf, (" "):rep(indent + 2) .. "$options")
else
table.insert(buf, (" "):rep(indent) .. "local -a options=(")
end
for _, option in ipairs(self._options) do
local line = {}
@@ -1335,10 +1340,13 @@ function Parser:_zsh_arguments(buf, cmd_name, indent)
table.insert(line, ": :_files")
end
table.insert(line, '"')
table.insert(buf, (" "):rep(indent + 2) .. table.concat(line) .. " \\")
table.insert(buf, (" "):rep(indent + 2) .. table.concat(line))
end
table.insert(buf, (" "):rep(indent) .. ")")
table.insert(buf, (" "):rep(indent) .. "_arguments -s -S \\")
table.insert(buf, (" "):rep(indent + 2) .. "$options \\")
if self._is_help_command then
table.insert(buf, (" "):rep(indent + 2) .. '": :(' .. self._parent:_get_commands() .. ')" \\')
else