From 5851a32681f5fbdbc55987cb117f891e3745f13c Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Thu, 10 Aug 2000 21:22:25 +0000 Subject: add -g option to _parameters to restrict type of parameters completed (12583) --- Completion/Builtins/_vars | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'Completion/Builtins/_vars') diff --git a/Completion/Builtins/_vars b/Completion/Builtins/_vars index a46b99de0..501e37b4f 100644 --- a/Completion/Builtins/_vars +++ b/Completion/Builtins/_vars @@ -1,8 +1,9 @@ #compdef getopts unset vared # This will handle completion of keys of associative arrays, e.g. at -# `vared foo['. However, in this version the [ must be added -# by hand. +# `vared foo['. + +local ret=1 if [[ $PREFIX = *\[* ]]; then local var=${PREFIX%%\[*} @@ -11,7 +12,7 @@ if [[ $PREFIX = *\[* ]]; then compset -p $(( ${#var} + 1 )) if ! compset -S \]; then - addclose=(-S ']') + addclose=(-S "${${QIPREFIX:+]}:-\]}") fi if [[ ${(tP)var} = assoc* ]]; then local expl @@ -20,5 +21,13 @@ if [[ $PREFIX = *\[* ]]; then compadd $addclose -k "$var" fi else - _parameters "$@" + _parameters -g '^a*' "$@" && ret=0 + + if compset -S '\[*'; then + set - -S "" "$@" + else + set - -qS"${${QIPREFIX:+[}:-\[}" "$@" + fi + _parameters -g 'a*' "$@" && ret=0 + return ret fi -- cgit 1.4.1