aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2021-07-30 01:10:24 +0900
committerJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2021-07-30 01:10:24 +0900
commitb4dff9a8e85802afcd52e7798176ebeb5e662da9 (patch)
treece46f4fbb6b8725c1648f2bc985a4739d31e325a
parentf8ec33c453159ad848d9b1a28782c5df7f0cc944 (diff)
downloadzsh-b4dff9a8e85802afcd52e7798176ebeb5e662da9.tar.gz
zsh-b4dff9a8e85802afcd52e7798176ebeb5e662da9.tar.xz
zsh-b4dff9a8e85802afcd52e7798176ebeb5e662da9.zip
49211: _typeset: correctly set return value
do not include '-' in onopts so that 'functions -- <TAB>' works.
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Zsh/Command/_typeset29
2 files changed, 19 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index d36a6970e..156a3c9fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-07-30 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
+
+ * 49211: Completion/Zsh/Command/_typeset: correctly set return value
+
2021-07-23 Peter Stephenson <p.w.stephenson@ntlworld.com>
* Erik Paulson: 49029: Src/signals.c: Remove additional copies
diff --git a/Completion/Zsh/Command/_typeset b/Completion/Zsh/Command/_typeset
index aecacb112..3f7de9706 100644
--- a/Completion/Zsh/Command/_typeset
+++ b/Completion/Zsh/Command/_typeset
@@ -1,6 +1,6 @@
#compdef autoload declare export functions integer float local readonly typeset
-local expl state line func i use curcontext="$curcontext"
+local expl state state_descr line func i use curcontext="$curcontext" ret=1
local fopts="-f -k -z +k +z"
local popts="-A -E -F -L -R -T -Z -a -g -h -H -i -l -r -x"
local -A allargs opt_args
@@ -79,38 +79,38 @@ esac
# This function uses whacky features of _arguments which means we
# need to look for options to the command beforehand.
local onopts offopts
-onopts=${(j..)${${words[1,CURRENT-1]:#^-*}##-}}
+onopts=${(j..)${${words[1,CURRENT-1]:#^-[^-]*}##-}}
offopts=${(j..)${${words[1,CURRENT-1]:#^+*}##+}}
for ((i=1;i<=$#use;++i)); do
args+=( ${allargs[${use[$i]}${${(s::)use[$i]}[(r)[dUurRtT]]:+$func}]} )
done
-_arguments -C -s -A "-*" -S "${args[@]}" '*::vars:= ->vars_eq'
+_arguments -C -s -A "-*" -S "${args[@]}" '*::vars:= ->vars_eq' && ret=0
if [[ "$state" = vars_eq ]]; then
if [[ $func = f ]]; then
if (( $+opt_args[+M] || ( $+opt_args[-M] && $+opt_args[-m] ) )); then
_wanted functions expl 'math function' compadd -F line - \
- ${${${(f)"$(functions -M)"}##*-M }%% *}
+ ${${${(f)"$(functions -M)"}##*-M }%% *} && ret=0
elif (( $+opt_args[-M] )); then
_arguments ':new math function:_functions' \
":minimum arguments${(k)opt_args[-s]:+:(1)}" \
":maximum arguments${(k)opt_args[-s]:+:(1)}" \
- ':shell function:_functions'
+ ':shell function:_functions' && ret=0
elif (( $+opt_args[-w] )); then
- _wanted files expl 'zwc file' _files -g '*.zwc(-.)'
+ _wanted files expl 'zwc file' _files -g '*.zwc(-.)' && ret=0
elif [[ $service = autoload || -n $opt_args[(i)-[uU]] ]]; then
if [[ $PREFIX[1] = [/~] ]]; then
# Autoload by absolute path
- _files
+ _files && ret=0
else
args=(${^fpath}/*(-.:t))
# Filter out functions already loaded or marked for autoload.
local -a funckeys
funckeys=(${(k)functions})
args=(${args:|funckeys})
- _wanted functions expl 'shell function' compadd -a args
+ _wanted functions expl 'shell function' compadd -a args && ret=0
fi
elif [[ -n $onopts$offopts ]]; then
if [[ -n $offopts ]]; then
@@ -127,22 +127,23 @@ if [[ "$state" = vars_eq ]]; then
[[ $PREFIX != [_.]* ]]; then
args=(${args:#_*})
fi
- _wanted functions expl 'shell function' compadd -a args
+ _wanted functions expl 'shell function' compadd -a args && ret=0
else
- _functions
+ _functions && ret=0
fi
elif [[ "$PREFIX" = *\=* ]]; then
compstate[parameter]="${PREFIX%%\=*}"
compset -P 1 '*='
- _value
+ _value && ret=0
elif (( $+opt_args[-a] || $+opt_args[-A] )); then
- _parameters -q
+ _parameters -q && ret=0
elif (( $+opt_args[-T] )); then
_arguments \
':scalar parameter:_parameters -g "*scalar*" -q -S "="' \
':array parameter:_parameters -g "*array*"' \
- ':separator character'
+ ':separator character' && ret=0
else
- _parameters -q -S '='
+ _parameters -q -S '=' && ret=0
fi
fi
+return ret