diff options
author | Tanaka Akira <akr@users.sourceforge.net> | 1999-09-15 12:48:58 +0000 |
---|---|---|
committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-09-15 12:48:58 +0000 |
commit | defa4a7fa08ba3b9020a971d189c5ded4e151d5f (patch) | |
tree | 0c6a7d626c5ec5b04cc0240921227d19ab3baafe /Completion/Base/_tilde | |
parent | 2b5c62436ca90898481feda162c2f328681995fe (diff) | |
download | zsh-defa4a7fa08ba3b9020a971d189c5ded4e151d5f.tar.gz zsh-defa4a7fa08ba3b9020a971d189c5ded4e151d5f.tar.xz zsh-defa4a7fa08ba3b9020a971d189c5ded4e151d5f.zip |
zsh-workers/7840
Diffstat (limited to 'Completion/Base/_tilde')
-rw-r--r-- | Completion/Base/_tilde | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/Completion/Base/_tilde b/Completion/Base/_tilde index cab371216..b8d639074 100644 --- a/Completion/Base/_tilde +++ b/Completion/Base/_tilde @@ -7,7 +7,9 @@ # `(( compstate[nmatches] )) || compgen -nu -qS/' # below that. -local d c s dirs list +setopt localoptions extendedglob + +local d s dirs list if [[ "$SUFFIX" = */* ]]; then ISUFFIX="/${SUFFIX#*/}$ISUFFIX" @@ -17,32 +19,31 @@ else s=(-qS/) fi -if compset -P +; then - dirs="$(dirs -v)" - list=("${(f)dirs}") - [[ -o pushdminus ]] && dirs="$(awk '{ $1 = '$#list' - $1 - 1; - printf("%s\t%s\n", $1, $2); }' <<<$dirs)" - list=("${(@)list% *}") - c=(-y '$dirs' -k "($list)") - - _description d 'directory stack' -elif compset -P -; then - dirs="$(dirs -v)" - list=("${(f)dirs}") - [[ ! -o pushdminus ]] && dirs="$(awk '{ $1 = '$#list' - $1 - 1; - printf("%s\t%s\n", $1, $2); }' <<<$dirs)" - list=("${(@)list% *}") - c=(-y '$dirs' -k "($list)") +if [[ -prefix [-+] ]]; then + lines=(${(f)"$(dirs -v)"}) + if [[ ( -prefix - && ! -o pushdminus ) || + ( -prefix + && -o pushdminus ) ]]; then + integer tot i + for (( i = 1, tot = $#lines-1; i <= $#lines; i++, tot-- )); do + lines[$i]="$tot -- ${lines[$i]##[0-9]#[ ]#}" + done + else + for (( i = 1, tot = 0; i <= $#lines; i++, tot++ )); do + lines[$i]="$tot -- ${lines[$i]##[0-9]#[ ]#}" + done + fi + list=(${lines%% *}) + compset -P '[-+]' _description d 'directory stack' + compadd "$d[@]" -d lines -Q - "$list[@]" else - c=(-nu) - if (( $# )); then d=( "$@" ) else _description d 'user or named directory' fi + + compgen "$d[@]" -nu "$s[@]" fi -compgen "$d[@]" "$c[@]" "$s[@]" |