diff options
author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-08-01 07:19:15 +0000 |
---|---|---|
committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-08-01 07:19:15 +0000 |
commit | cd2984fb66e630cd107bfa6cde0b868070aa877b (patch) | |
tree | 62231a5e478381e391d66b82c2f5d51eb5e7f935 /Completion/Core | |
parent | 3896f72f4d4364af53a2ec3be727cf288e917949 (diff) | |
download | zsh-cd2984fb66e630cd107bfa6cde0b868070aa877b.tar.gz zsh-cd2984fb66e630cd107bfa6cde0b868070aa877b.tar.xz zsh-cd2984fb66e630cd107bfa6cde0b868070aa877b.zip |
make $compcontext more powerful and easier to use for simple cases
Diffstat (limited to 'Completion/Core')
-rw-r--r-- | Completion/Core/_complete | 66 |
1 files changed, 63 insertions, 3 deletions
diff --git a/Completion/Core/_complete b/Completion/Core/_complete index 06d212a46..2441771bc 100644 --- a/Completion/Core/_complete +++ b/Completion/Core/_complete @@ -12,10 +12,70 @@ oldcontext="$curcontext" # If we have a user-supplied context name, use only that. if [[ -n "$compcontext" ]]; then - ccarray[3]="$compcontext" - comp="$_comps[$compcontext]" - [[ -z "$comp" ]] || "$comp" + if [[ "${(t)compcontext}" = *(array|assoc)* ]]; then + local expl + + _wanted values expl value compadd -a - compcontext + + elif [[ "$compcontext" = *:*:* ]]; then + local tag="${${compcontext%%:*}:-values}" + local descr="${${${compcontext#${tag}:}%%:*}:-value}" + local action="${compcontext#${tag}:${descr}:}" expl ws ret=1 + + case "$action" in + \ #) + _message "$descr";; + + \(\(*\)\)) + eval ws\=\( "${action[3,-3]}" \) + + _describe -t "$tag" "$descr" ws;; + + \(*\)) + eval ws\=\( "${action[2,-2]}" \) + + _wanted "$tag" expl "$descr" compadd -a - ws;; + + \{*\}) + _tags "$tag" + while _tags; do + while _next_label "$tag" expl "$descr"; do + eval "$action[2,-2]" && ret=0 + done + (( ret )) || break + done;; + + \ *) + eval ws\=\( "$action" \) + + _tags "$tag" + while _tags; do + while _next_label "$tag" expl "$descr"; do + "$ws[@]" + done + (( ret )) || break + done;; + + *) + eval ws\=\( "$action" \) + + _tags "$tag" + while _tags; do + while _next_label "$tag" expl "$descr"; do + "$ws[1]" "$expl[@]" "${(@)ws[2,-1]}" + done + (( ret )) || break + done;; + + esac + + else + ccarray[3]="$compcontext" + + comp="$_comps[$compcontext]" + [[ -z "$comp" ]] || "$comp" + fi return fi |