diff options
author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-10-11 12:19:23 +0000 |
---|---|---|
committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-10-11 12:19:23 +0000 |
commit | adf79659510ed08c78bb4ccb881a5c03ef2e6759 (patch) | |
tree | 8d2388a2435c7648b253a01d130be5ce1146419c /Completion/Core | |
parent | 5d8adbee0753795e7903b40847e17c879766dbf7 (diff) | |
download | zsh-adf79659510ed08c78bb4ccb881a5c03ef2e6759.tar.gz zsh-adf79659510ed08c78bb4ccb881a5c03ef2e6759.tar.xz zsh-adf79659510ed08c78bb4ccb881a5c03ef2e6759.zip |
add _all_matcher completer and supporting C-code for adding a special match representing all other matches; remove completions style from _expand(|_word) (12960)
Diffstat (limited to 'Completion/Core')
-rw-r--r-- | Completion/Core/_all_matches | 43 | ||||
-rw-r--r-- | Completion/Core/_expand | 8 |
2 files changed, 43 insertions, 8 deletions
diff --git a/Completion/Core/_all_matches b/Completion/Core/_all_matches new file mode 100644 index 000000000..f33d78040 --- /dev/null +++ b/Completion/Core/_all_matches @@ -0,0 +1,43 @@ +#autoload + +_all_matches() { + local old + + zstyle -s ":completion:${curcontext}:" old-matches old + + if [[ "$old" = (only|true|yes|1|on) ]]; then + + if [[ -n "$compstate[old_list]" ]]; then + compstate[insert]=all + compstate[old_list]=keep + return 0 + fi + + [[ "$old" = *only* ]] && return 1 + fi + + (( $comppostfuncs[(I)_all_matches_end] )) || + comppostfuncs=( "$comppostfuncs[@]" _all_matches_end ) + + _all_matches_context=":completion:${curcontext}:" + + return 1 +} + +_all_matches_end() { + local not + + zstyle -s "$_all_matches_context" avoid-completer not || + not=( _expand _old_list _correct _approximate ) + + if [[ "$compstate[nmatches]" -gt 1 && $not[(I)(|_)$_completer] -eq 0 ]]; then + local expl + + _description all-matches expl 'all matches' + compadd "$expl[@]" -C + fi + + unset _all_matches_context +} + +_all_matches "$@" diff --git a/Completion/Core/_expand b/Completion/Core/_expand index f0e12cb99..344dbaf88 100644 --- a/Completion/Core/_expand +++ b/Completion/Core/_expand @@ -18,14 +18,6 @@ local exp word sort expr expl subd suf=" " force opt asp tmp opre pre epre force="$force$opt" done -# First, see if we should insert all *completions*. - -if [[ "$force" = *c* ]] || - zstyle -t ":completion:${curcontext}:" completions; then - compstate[insert]=all - return 1 -fi - if [[ "$funcstack[2]" = _prefix ]]; then word="$IPREFIX$PREFIX$SUFFIX" else |