From 97f02ffe63909c84cb9771d20a73ebec55f49589 Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Wed, 3 Nov 1999 13:47:39 +0000 Subject: zsh-workers/8520 --- Completion/Core/_files | 54 +++++++++++++--------------- Completion/Core/_main_complete | 17 ++++++++- Completion/Core/_tags | 81 ++++++++++++++++++++++++++++++++++++++++++ Completion/Core/compinit | 76 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 198 insertions(+), 30 deletions(-) create mode 100644 Completion/Core/_tags (limited to 'Completion/Core') diff --git a/Completion/Core/_files b/Completion/Core/_files index 38eafd196..e667289c5 100644 --- a/Completion/Core/_files +++ b/Completion/Core/_files @@ -1,31 +1,27 @@ #autoload -# Utility function for completing files of a given type or any file. -# In many cases you will want to call this one instead of `_path_files'. - -local nm=$compstate[nmatches] ret=1 - -_path_files "$@" && ret=0 - -if [[ $# -ne 0 && compstate[nmatches] -eq nm ]]; then - local opt opts - - # We didn't get any matches for those types of files described by - # the `-g' or `-/' option. Now we try it again accepting all files. - # First we get those options that we have to use even then. If we - # find out that the `-f' option was given, we already accepted all - # files and give up immediatly. - - opts=() - while getopts "P:S:qr:R:W:F:J:V:X:f/g:M:" opt; do - case "$opt" in - f) return;; - [PSrRWFJVXM]) opts=("$opts[@]" "-$opt" "$OPTARG");; - q) opts=("$opts[@]" -q);; - esac - done - - _path_files "$opts[@]" && ret=0 -fi - -return ret +local opts opt type=file prios tags + +opts=() +while getopts "P:S:qr:R:W:F:J:V:X:f/g:M:" opt; do + case "$opt" in + /) [[ "$type" = file ]] && type=dir ;; + g) [[ "$type" = (file|dir) ]] && type="$OPTARG" ;; + q) opts=("$opts[@]" -q ) ;; + [^f]) opts=("$opts[@]" "-$opt" "$OPTARG") ;; + esac +done + +case "$type" in +file) _tags -f "$funcstack[2]" file ;; +dir) _tags -f "$funcstack[2]" path file ;; +*) _tags -f "$funcstack[2]" glob path file ;; +esac + +while _tags; do + [[ "$tags" = *:file:* ]] && { _path_files "$opts[@]" -f ; return } + [[ "$tags" = *:path:* ]] && _path_files "$opts[@]" -/ && return 0 + [[ "$tags" = *:glob:* ]] && _path_files "$opts[@]" -g "$type" && return 0 +done + +return 1 diff --git a/Completion/Core/_main_complete b/Completion/Core/_main_complete index 72233a59b..877a975b3 100644 --- a/Completion/Core/_main_complete +++ b/Completion/Core/_main_complete @@ -17,7 +17,12 @@ # state than the global one for which you are completing. -local comp post ret=1 _compskip +local comp post ret=1 _compskip prios tags +typeset -U _offered_tags _tried_tags _failed_tags _used_tags _unused_tags + +_offered_tags=() +_tried_tags=() +_failed_tags=() typeset -U _lastdescr @@ -46,6 +51,11 @@ for comp; do fi done +# See which tags were or were not used. + +_used_tags=( "${(@)_tried_tags:#${(j:|:)~${(@)_failed_tags//\[/\\[}//\]/\\]}}" ) +_unused_tags=( "${(@)_offered_tags:#${(j:|:)~${(@)_used_tags//\[/\\[}//\]/\\]}}" ) + # Now call the post-functions. for post in "$comppostfuncs[@]"; do @@ -82,5 +92,10 @@ _lastcomp[iprefix]="$IPREFIX" _lastcomp[isuffix]="$ISUFFIX" _lastcomp[qiprefix]="$QIPREFIX" _lastcomp[qisuffix]="$QISUFFIX" +_lastcomp[offered_tags]="${(j.:.)_offered_tags}" +_lastcomp[tried_tags]="${(j.:.)_tried_tags}" +_lastcomp[failed_tags]="${(j.:.)_failed_tags}" +_lastcomp[unused_tags]="${(j.:.)_unused_tags}" +_lastcomp[used_tags]="${(j.:.)_used_tags}" return ret diff --git a/Completion/Core/_tags b/Completion/Core/_tags new file mode 100644 index 000000000..af8dc21dd --- /dev/null +++ b/Completion/Core/_tags @@ -0,0 +1,81 @@ +#autoload + +if (( $# )); then + local cmd="$words[1]" func="$funcstack[2]" defs i tags tag pat style prio + + while getopts 'c:f:' i; do + if [[ "$i" = c ]]; then + cmd="$OPTARG" + else + func="$OPTARG" + fi + done + + shift OPTIND-1 + + defs=( "${(@M)argv:#${(kj:|:)~override_tags[(R)(|+*)]}}" ) + (( $#defs )) && set -- "$defs[@]" + + _offered_tags=( "$_offered_tags[@]" "$@" ) + _last_tags=() + + defs=() + for i; do + if [[ -n ${override_tags[$i]} && ${override_tags[$i]} != (\[|+\[)* ]]; then + if [[ ${override_tags[$i]} = *\[* ]]; then + prio=( "${i}:*=${override_tags[$i]#+}" ) + else + prio=( "${i}:${(@v)^comptags[(I)(|*:)${i}(|:*)]}" ) + (( $#prio )) || prio=( "${i}:${comptags[any]}" ) + prio="${${${prio[(r)(|*:)\*=[^:]#\[*\](|:*)]}##(|*:)\*}%%:*}" + prio=( "${i}:*=${override_tags[$i]#+}${(M)prio%%\[*\]}" ) + fi + else + prio=( "${i}:${(@v)^comptags[(I)(|*:)${i}(|:*)]}" ) + (( $#prio )) || prio=( "${i}:${comptags[any]}" ) + fi + defs=( "$defs[@]" "$prio[@]" ) + done + + tags=() + for i in "$defs[@]"; do + tag="${i%%:*}" + for pat in "${(s.:.)i#*:}"; do + if [[ ( "$pat" = _* && "$func" = ${~pat%%\=*} ) || + "$cmd" = ${~pat%%\=*} ]]; then + prio="${pat#*\=}" + [[ "$prio" = -* ]] && continue 2 + + if [[ "$prio" = *\[*\] ]]; then + style="${(M)prio%%\[*}" + prio="${prio%%\[*}" + else + style='' + fi + [[ ${override_tags[$tag]} = (|+)\[* ]] && + style="${override_tags[$tag]#+}" + + (( prio++ )) + + tags[$prio]="${tags[$prio]}:${tag}${style}" + break + fi + done + done + + prios=( "${(@)tags:#}" ) + + return 0 +fi + +_failed_tags=( "$_failed_tags[@]" "$_last_tags[@]" ) + +(( $#prios )) || return 1 + +tags="${prios[1]}:" +shift 1 prios + +_last_tags=( "${(@s.:.)${${tags#:}%:}}" ) +_tried_tags=( "$_tried_tags[@]" "$_last_tags[@]" ) + +return 0 diff --git a/Completion/Core/compinit b/Completion/Core/compinit index 3569014c6..3d316fac8 100644 --- a/Completion/Core/compinit +++ b/Completion/Core/compinit @@ -108,6 +108,14 @@ fi compconfig[correct_prompt]='correct to:' (( ${+compconfig[completer]} )) || compconfig[completer]=_complete +# This holds the tag/priority definitions. + +typeset -gA comptags + +(( ${+comptags[any]} )) || comptags[any]='*=100' + +typeset -gA override_tags + # This can hold names of functions that are to be called after all # matches have been generated. @@ -370,6 +378,74 @@ compconf() { fi } +# Function to set tags and priorities. + +comptag() { + local i opt list tag val + + while getopts "lL" opt; do + if [[ "$opt" = l ]]; then + [[ -z "$list" ]] && list=yes + else + list=long + fi + done + shift OPTIND-1 + + if (( $# )); then + if [[ -n $list ]]; then + for i; do + if [[ $list = long ]]; then + (( ${+comptags[$i]} )) && print "comptag $i='$comptags[$i]'" + else + print $comptags[$i] + fi + done + else + for i; do + tag="${i%%([-+]|)\=*}" + val="${${i#*(|[-+])\=}#+}" + case "$i" in + *+\=*) + if [[ -n "$comptags[$tag]" ]]; then + comptags[$tag]="${val}:${comptags[$tag]}" + else + comptags[$tag]="$val" + fi + ;; + *\=+*) + if [[ -n "$comptags[$tag]" ]]; then + comptags[$tag]="${comptags[$tag]}:${val}" + else + comptags[$tag]="$val" + fi + ;; + *-\=*) + if [[ -n "$comptags[$tag]" ]]; then + comptags[$tag]="${${${comptags[$tag]//:${val}\=[^:]##}#${val}\=*:}%:${val}\=[^:]##}" + [[ "$comptags[$tag]" = ${val}\=* ]] && unset "comptags[$tag]" + fi + ;; + *\=*) + comptags[${i%%\=*}]="${i#*\=}" + ;; + *) + unset "compconfig[$i]" + ;; + esac + done + fi + else + for i in ${(ok)comptags}; do + if [[ $list = long ]]; then + print "comptag $i='$comptags[$i]'" + else + print ${(r:25:)i} "$comptags[$i]" + fi + done + fi +} + # Utility function to call a function if it exists. # # Usage: funcall [ ... ] -- cgit 1.4.1