diff options
Diffstat (limited to 'Completion')
| -rw-r--r-- | Completion/Builtins/_zstyle | 13 | ||||
| -rw-r--r-- | Completion/Commands/_expand_word | 11 | ||||
| -rw-r--r-- | Completion/Core/_all_matches | 43 | ||||
| -rw-r--r-- | Completion/Core/_expand | 8 |
4 files changed, 53 insertions, 22 deletions
diff --git a/Completion/Builtins/_zstyle b/Completion/Builtins/_zstyle index 62e5369e4..21c6fd0de 100644 --- a/Completion/Builtins/_zstyle +++ b/Completion/Builtins/_zstyle @@ -58,7 +58,8 @@ styles=( max-errors c: menu c:boolauto numbers c:bool - old-list c:bool + old-list c:bool + old-matches c:oldmatches old-menu c:bool original c:bool packageset c:packageset @@ -275,15 +276,19 @@ while [[ -n $state ]]; do ;; ignline) - _wanted values expl boolean compadd true false current current-shown other + _wanted values expl 'ignore strings on the line' compadd true false current current-shown other ;; keep-prefix) - _wanted values expl boolean compadd true false changed + _wanted values expl 'keep prefix' compadd true false changed ;; match-orig) - _wanted values expl boolean compadd only both + _wanted values expl "match without inserting \`*'" compadd only both + ;; + + oldmatches) + _wanted values expl 'use list of old matches' compadd true false only ;; urgh) diff --git a/Completion/Commands/_expand_word b/Completion/Commands/_expand_word index 3ec3cc756..895695676 100644 --- a/Completion/Commands/_expand_word +++ b/Completion/Commands/_expand_word @@ -6,7 +6,6 @@ setopt localoptions nullglob rcexpandparam extendedglob unset unsetopt markdirs globsubst shwordsplit shglob ksharrays cshnullglob local curcontext="$curcontext" -local -ah completers if [[ -z "$curcontext" ]]; then curcontext="expand-word:::" @@ -14,12 +13,4 @@ else curcontext="expand-word:${curcontext#*:}" fi -if zstyle -t ":completion:${curcontext}:" completions; then - zstyle -a ":completion:${curcontext}:" completer completers - completers[1,(i)_expand]=_expand - (( $#completers == 1 )) && completers=(_expand _complete) -else - completers=(_expand) -fi - -_main_complete $completers +_main_complete _expand 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 |