diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Completion/Unix/Type/.distfiles | 1 | ||||
| -rw-r--r-- | Completion/Unix/Type/_have_glob_qual | 24 | ||||
| -rw-r--r-- | Completion/Unix/Type/_path_files | 65 |
4 files changed, 59 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog index f5e6d279e..aff3a7fe6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-03-13 Peter Stephenson <pws@csr.com> + * 26723: Completion/Unix/Type/.distfiles, + Completion/Unix/Type/_have_glob_qual, + Completion/Unix/Type_path_files: centralise test for whether + file has glob qualifiers and how to match them. + * users/13903: Src/Zle/zle_hist.c: repeated vi searching was broken and "_" prompt was missing. @@ -11379,5 +11384,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4610 $ +* $Revision: 1.4611 $ ***************************************************** diff --git a/Completion/Unix/Type/.distfiles b/Completion/Unix/Type/.distfiles index ecf086777..05942770a 100644 --- a/Completion/Unix/Type/.distfiles +++ b/Completion/Unix/Type/.distfiles @@ -15,6 +15,7 @@ _file_systems _files _global_tags _groups +_have_glob_qual _hosts _java_class _ld_debug diff --git a/Completion/Unix/Type/_have_glob_qual b/Completion/Unix/Type/_have_glob_qual new file mode 100644 index 000000000..d174406df --- /dev/null +++ b/Completion/Unix/Type/_have_glob_qual @@ -0,0 +1,24 @@ +#autoload + +# Test if $1 has glob qualifiers. This is partly magic, partly guesswork, +# wholly flakey. +# +# If $2 is "complete" test if the qualifiers are complete (up to the ")" +# at the end of the word), else that they are incomplete. +# Sets match, mbegin, mend to reflect their location. +# $match[1] is everything up to the start of the qualifiers themselves; +# this may therefore end in "(" or "(#q". +# $match[2] is everything at the start not counting the "(" or "(#q". +# $match[5] is the set of qualifiers themselves, not including a trailing +# parenthesis. +local complete + +[[ $2 = complete ]] && complete=")" + +[[ -z $compstate[quote] && + ( -o bareglobqual && + $1 = (#b)(((*[^\\\$]|)(\\\\)#)\()([^\)\|\~]#)$complete && + ${#match[1]} -gt 1 || + -o extendedglob && + $1 = (#b)(((*[^\\\$]|)(\\\\)#)"(#q")([^\)]#)$complete + ) ]] diff --git a/Completion/Unix/Type/_path_files b/Completion/Unix/Type/_path_files index fceebec4c..63713eff7 100644 --- a/Completion/Unix/Type/_path_files +++ b/Completion/Unix/Type/_path_files @@ -14,12 +14,7 @@ local -a match mbegin mend # there was at least one character before the parenthesis for # a bare glob qualifier. # The later test looks for an outstanding quote. -if [[ ( -o bareglobqual && \ - $PREFIX = (#b)((*[^\\]|)(\\\\)#\()([^\)]#) && \ - ${#match[1]} -gt 1 || \ - -o extendedglob && \ - $PREFIX = (#b)((*[^\\]|)(\\\\)#"(#q")([^\)]#) \ - ) && -z $compstate[quote] ]]; then +if _have_glob_qual $PREFIX; then compset -p ${#match[1]} if [[ -o extendedglob ]] && compset -P '\#'; then _globflags @@ -88,7 +83,7 @@ if (( $#ignore )); then else ignore=( ${(P)ignore[2]} ) fi -fi +fi # If we were given no file selection option, we behave as if we were given # a `-f'. @@ -162,14 +157,12 @@ if zstyle -s ":completion:${curcontext}:" file-sort tmp1; then tmp2=() for tmp1 in "$pats[@]"; do - if [[ "$tmp1" = (#b)(*[^\$])"(#q"(*)")" ]]; then - tmp2=( "$tmp2[@]" "${match[1]}(#q${sort}${match[2]})" ) - elif [[ "$tmp1" = (#b)(*[^\$])(\(\([^\|~]##\)\)) ]]; then - tmp2=( "$tmp2[@]" "${match[1]}((${sort}${match[2][3,-1]}" ) - elif [[ "$tmp1" = (#b)(*[^\$])(\([^\|~]##\)) ]]; then - tmp2=( "$tmp2[@]" "${match[1]}(${sort}${match[2][2,-1]}" ) + if _have_glob_qual "$tmp1" complete; then + # unbalanced parenthesis is correct: match[1] contains the start, + # match[5] doesn't contain the end. + tmp2+=( "${match[1]}${sort}${match[5]})" ) else - tmp2=( "$tmp2[@]" "${tmp1}(${sort})" ) + tmp2+=( "${tmp1}(${sort})" ) fi done pats=( "$tmp2[@]" ) @@ -198,31 +191,29 @@ zstyle -a ":completion:${curcontext}:" fake-files fake zstyle -s ":completion:${curcontext}:" ignore-parents ignpar -if [[ -n "$compstate[pattern_match]" && - ( ( -z "$SUFFIX" && "$PREFIX" = (|*[^\$])\([^\|\~]##\) ) || - "$SUFFIX" = (|*[^\$])\([^\|\~]##\) ) ]]; then - # Copy all glob qualifiers from the line to - # the patterns used when generating matches - if [[ "$SUFFIX" = *\([^\|\~]##\) ]]; then - tmp3="${${(M)SUFFIX%\([^\|\~]##\)}[2,-2]}" - SUFFIX="${SUFFIX%\($tmp3\)}" - else - tmp3="${${(M)PREFIX%\([^\|\~]##\)}[2,-2]}" - PREFIX="${PREFIX%\($tmp3\)}" - fi - tmp2=() - for tmp1 in "$pats[@]"; do - if [[ "$tmp1" = (#b)(*[^\$])"(#q"(*)")" ]]; then - tmp2=( "$tmp2[@]" "${match[1]}(#q${tmp3}${match[2]})" ) - elif [[ "$tmp1" = (#b)(*[^\$])(\(\([^\|~]##\)\)) ]]; then - tmp2=( "$tmp2[@]" "${match[1]}((${tmp3}${match[2][3,-1]}" ) - elif [[ "$tmp1" = (#b)(*[^\$])(\([^\|~]##\)) ]]; then - tmp2=( "$tmp2[@]" "${match[1]}(${tmp3}${match[2][2,-1]}" ) +if [[ -n "$compstate[pattern_match]" ]]; then + if { [[ -z "$SUFFIX" ]] && _have_glob_qual "$PREFIX" complete } || + _have_glob_qual "$SUFFIX" complete; then + # Copy all glob qualifiers from the line to + # the patterns used when generating matches + tmp3=${match[5]} + if [[ -n "$SUFFIX" ]]; then + SUFFIX=${match[2]} else - tmp2=( "$tmp2[@]" "${tmp1}(${tmp3})" ) + PREFIX=${match[2]} fi - done - pats=( "$tmp2[@]" ) + tmp2=() + for tmp1 in "$pats[@]"; do + if _have_glob_qual "$tmp1" complete; then + # unbalanced parenthesis is correct: match[1] contains the start, + # match[5] doesn't contain the end. + tmp2+=( "${match[1]}${tmp3}${match[5]})") + else + tmp2+=( "${tmp1}(${tmp3})" ) + fi + done + pats=( "$tmp2[@]" ) + fi fi # We get the prefix and the suffix from the line and save the whole |