diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-04-04 11:29:19 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-04-04 11:29:19 +0000 |
| commit | 163b0101ed6d63c735590d561a8026d74d964401 (patch) | |
| tree | 81dc4c353e7e912db60f33a00c3a4e792604e623 /Completion/Base/Utility | |
| parent | ec01fb14b45369edadab11e88c5ce32933148c94 (diff) | |
| download | zsh-163b0101ed6d63c735590d561a8026d74d964401.tar.gz zsh-163b0101ed6d63c735590d561a8026d74d964401.tar.xz zsh-163b0101ed6d63c735590d561a8026d74d964401.zip | |
add -W option to _arguments, which allows to complete options after options that take an argument in the next word (13902)
Diffstat (limited to 'Completion/Base/Utility')
| -rw-r--r-- | Completion/Base/Utility/_arguments | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/Completion/Base/Utility/_arguments b/Completion/Base/Utility/_arguments index e947dc8ad..33f4c1e33 100644 --- a/Completion/Base/Utility/_arguments +++ b/Completion/Base/Utility/_arguments @@ -4,7 +4,7 @@ # descriptions given as arguments to this function. local long cmd="$words[1]" descr mesg subopts opt usecc autod -local oldcontext="$curcontext" hasopts rawret +local oldcontext="$curcontext" hasopts rawret optarg singopt long=$argv[(I)--] if (( long )); then @@ -173,18 +173,21 @@ if (( long )); then fi subopts=() -while [[ "$1" = -(O*|[CR]) ]]; do +singopt=() +while [[ "$1" = -(O*|[CRWs]) ]]; do case "$1" in -C) usecc=yes; shift ;; -O) subopts=( "${(@P)2}" ); shift 2 ;; -O*) subopts=( "${(@P)1[3,-1]}" ); shift ;; -R) rawret=yes; shift;; + -W) optarg=yes; shift;; + -s) singopt=(-s); shift;; esac done zstyle -s ":completion:${curcontext}:options" auto-description autod -if (( $# )) && comparguments -i "$autod" "$@"; then +if (( $# )) && comparguments -i "$autod" "$singopt[@]" "$@"; then local action noargs aret expl local tried local next direct odirect equal single matcher matched ws tmp1 tmp2 tmp3 local opts subc tc prefix suffix descrs actions subcs anum @@ -335,14 +338,19 @@ if (( $# )) && comparguments -i "$autod" "$@"; then if [[ "$single" = direct ]]; then _all_labels options expl option \ compadd -QS '' - "${PREFIX}${SUFFIX}" - elif [[ "$single" = next ]]; then + elif [[ -z "$optarg" && "$single" = next ]]; then _all_labels options expl option \ compadd -Q - "${PREFIX}${SUFFIX}" elif [[ "$single" = equal ]]; then _all_labels options expl option \ compadd -QqS= - "${PREFIX}${SUFFIX}" else + tmp1=( "$next[@]" "$direct[@]" "$odirect[@]" "$equal[@]" ) + + [[ "$single" = next ]] && + tmp1=( "${(@)tmp1:#[-+]${PREFIX[-1]}((#e)|:*)}" ) + [[ "$PREFIX" != --* ]] && tmp1=( "${(@)tmp1:#--*}" ) tmp3=( "${(M@)tmp1:#[-+]?[^:]*}" ) tmp1=( "${(M@)tmp1:#[-+]?(|:*)}" ) @@ -351,6 +359,11 @@ if (( $# )) && comparguments -i "$autod" "$@"; then _describe -o option \ tmp1 tmp2 -Q -S '' -- \ tmp3 -Q + + [[ -n "$optarg" && "$single" = next && nm -eq $compstate[nmatches] ]] && + _all_labels options expl option \ + compadd -Q - "${PREFIX}${SUFFIX}" + fi single=yes else |