Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
PATCH: completing patterns (was: Re: PATCH: _rcs (was Re: still confused about completion and matching))
- X-seq: zsh-workers 13128
- From: Sven Wischnowsky <wischnow@xxxxxxxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxxxxxxxxx
- Subject: PATCH: completing patterns (was: Re: PATCH: _rcs (was Re: still confused about completion and matching))
- Date: Wed, 8 Nov 2000 10:18:28 +0100 (MET)
- In-reply-to: "Bart Schaefer"'s message of Mon, 6 Nov 2000 17:15:09 +0000
- Mailing-list: contact zsh-workers-help@xxxxxxxxxxxxxx; run by ezmlm
Bart Schaefer wrote:
> On Nov 6, 10:34am, E. Jay Berkenbilt wrote:
> } Subject: Re: still confused about completion and matching
> }
> } It seems that the changes have still not been committed to the
> } repository. Is this because we're still waiting for reactions from
> } people who are not using the new patches or because we forgot or for
> } some other reason?
>
> I rather suspect it's just because Sven is busy.
Actually, I first wanted the dust to settle down. And then I was too busy.
Ok, here is the patch how I'll commit it in a few moments. The two
lines Jay complained about (and which I weren't that sure about, too)
have been commented out (see 13074).
This patch does not include any changes to the handling of
insert-unambiguous as discussed in 13076/13077. Maybe if we change
the test in question so that menu completion is only started
(regardless of insert-unambiguous) if the unambiguous string is empty?
Or allow some more values for insert-unambiguous to express the
different ways to handle insertion of unambiguous strings?
I would be thankful if Jay could confirm that I committed the right
patch (there were so many of them ;-).
Bye
Sven
Index: Completion/Builtins/_zstyle
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Builtins/_zstyle,v
retrieving revision 1.22
diff -u -r1.22 _zstyle
--- Completion/Builtins/_zstyle 2000/10/12 07:08:43 1.22
+++ Completion/Builtins/_zstyle 2000/11/08 09:15:16
@@ -44,7 +44,7 @@
ignored-patterns c:
insert-ids c:insert-ids
insert-tab c:bool
- insert-unambiguous c:bool
+ insert-unambiguous c:insunambig
keep-prefix c:keep-prefix
last-prompt c:bool
list c:listwhen
@@ -52,6 +52,7 @@
list-packed c:bool
list-prompt c:
list-rows-first c:bool
+ list-suffixes c:bool
local c:
match-original c:match-orig
matcher c:
@@ -290,6 +291,10 @@
oldmatches)
_wanted values expl 'use list of old matches' compadd true false only
+ ;;
+
+ insunambig)
+ _wanted values expl 'insert unambiguous string compadd true false pattern
;;
urgh)
Index: Completion/Core/_match
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Core/_match,v
retrieving revision 1.3
diff -u -r1.3 _match
--- Completion/Core/_match 2000/04/11 09:40:13 1.3
+++ Completion/Core/_match 2000/11/08 09:15:16
@@ -11,41 +11,60 @@
### Shouldn't be needed any more: [[ _matcher_num -gt 1 ]] && return 1
-local tmp opm="$compstate[pattern_match]" ret=0 orig ins
+local tmp opm="$compstate[pattern_match]" ret=1 orig ins
+local oms="$_old_match_string"
+local ocsi="$compstate[insert]" ocspi="$compstate[pattern_insert]"
# Do nothing if we don't have a pattern.
tmp="${${:-$PREFIX$SUFFIX}#[~=]}"
[[ "$tmp:q" = "$tmp" ]] && return 1
+_old_match_string="$PREFIX$SUFFIX$HISTNO"
+
zstyle -s ":completion:${curcontext}:" match-original orig
-zstyle -b ":completion:${curcontext}:" insert-unambiguous ins
+zstyle -s ":completion:${curcontext}:" insert-unambiguous ins
# Try completion without inserting a `*'?
if [[ -n "$orig" ]]; then
compstate[pattern_match]='-'
- _complete && ret=1
+ _complete && ret=0
compstate[pattern_match]="$opm"
- if (( ret )); then
- [[ "$ins" = yes &&
- $#compstate[unambiguous] -ge ${#:-${PREFIX}${SUFFIX}} ]] &&
- compstate[pattern_insert]=unambiguous
- return 0
- fi
+ # No completion with inserting `*'?
+
+ [[ ret -eq 1 && "$orig" = only ]] && return 1
fi
-# No completion with inserting `*'?
+if (( ret )); then
+ compstate[pattern_match]='*'
+ _complete && ret=0
+ compstate[pattern_match]="$opm"
+fi
-[[ "$orig" = only ]] && return 1
+if (( ! ret )); then
-compstate[pattern_match]='*'
-_complete && ret=1
-compstate[pattern_match]="$opm"
+ if [[ "$ins" = pattern && $compstate[nmatches] -gt 1 ]]; then
-[[ ret -eq 1 && "$ins" = yes &&
- $#compstate[unambiguous] -ge ${#:-${PREFIX}${SUFFIX}} ]] &&
- compstate[pattern_insert]=unambiguous
+ [[ "$oms" = "$PREFIX$SUFFIX$HISTNO" &&
+ "$compstate[insert]" = automenu-unambiguous ]] &&
+ compstate[insert]=automenu
+ [[ "$compstate[insert]" != *menu ]] &&
+ compstate[pattern_insert]= compstate[insert]=
+
+# We tried to be clever here, making completion insert unambiguous
+# expansions as early as possible, but this is really hard to test
+# and the code below probably does more harm than good.
+#
+# [[ $compstate[unambiguous_cursor] -gt $#compstate[unambiguous] ]] &&
+# ins=yes compstate[insert]="$ocsi" compstate[pattern_insert]="$ocspi"
+ fi
+
+ [[ "$ins" = (true|yes|on|1) &&
+ $#compstate[unambiguous] -ge ${#:-${PREFIX}${SUFFIX}} ]] &&
+ compstate[pattern_insert]=unambiguous
+
+fi
-return 1-ret
+return ret
Index: Completion/Core/_path_files
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Core/_path_files,v
retrieving revision 1.34
diff -u -r1.34 _path_files
--- Completion/Core/_path_files 2000/10/23 08:07:32 1.34
+++ Completion/Core/_path_files 2000/11/08 09:15:17
@@ -5,7 +5,7 @@
local linepath realpath donepath prepath testpath exppath skips skipped
local tmp1 tmp2 tmp3 tmp4 i orig eorig pre suf tpre tsuf opre osuf cpre
-local pats haspats ignore pfxsfx sopt gopt opt sdirs ignpar cfopt
+local pats haspats ignore pfxsfx sopt gopt opt sdirs ignpar cfopt listsfx
local nm=$compstate[nmatches] menu matcher mopts sort match mid accex fake
typeset -U prepaths exppaths
@@ -137,6 +137,8 @@
fi
zstyle -s ":completion:${curcontext}:paths" special-dirs sdirs
+zstyle -t ":completion:${curcontext}:paths" list-suffixes &&
+ listsfx=yes
[[ "$pats" = ((|*[[:blank:]])\*(|[[:blank:]]*)|*\([^[:blank:]]#/[^[:blank:]]#\)*) ]] &&
sopt=$sopt/
@@ -460,9 +462,11 @@
SUFFIX="${tsuf}"
fi
- if (( tmp4 )) ||
- [[ -n "$compstate[pattern_match]" &&
- "$tmp2" = (|*[^\\])[][*?#~^\|\<\>]* ]]; then
+ # This once tested `|| [[ -n "$compstate[pattern_match]" &&
+ # "$tmp2" = (|*[^\\])[][*?#~^\|\<\>]* ]]' but it should now be smart
+ # enough to handle multiple components with patterns.
+
+ if (( tmp4 )); then
# It is. For menucompletion we now add the possible completions
# for this component with the unambigous prefix we have built
# and the rest of the string from the line as the suffix.
@@ -480,15 +484,33 @@
compquote tmp1 tmp2
fi
+ if [[ -z "$_comp_correct" &&
+ "$compstate[pattern_match]" = \* && -n "$listsfx" &&
+ "$tmp2" = (|*[^\\])[][*?#~^\|\<\>]* ]]; then
+ PREFIX="$opre"
+ SUFFIX="$osuf"
+ fi
+
if [[ -n $menu || -z "$compstate[insert]" ]] ||
- ! zstyle -t ":completion:${curcontext}:paths" expand suffix; then
+ ! zstyle -t ":completion:${curcontext}:paths" expand suffix ||
+ [[ -z "$listsfx" &&
+ ( -n "$_comp_correct" ||
+ -z "$compstate[pattern_match]" || "$SUFFIX" != */* ||
+ "${SUFFIX#*/}" = (|*[^\\])[][*?#~^\|\<\>]* ) ]]; then
(( tmp4 )) && zstyle -t ":completion:${curcontext}:paths" ambiguous &&
compstate[to_end]=
if [[ "$tmp3" = */* ]]; then
- compadd -Qf "$mopts[@]" -p "$linepath$tmp2" -s "/${tmp3#*/}" \
- -W "$prepath$realpath$testpath" \
- "$pfxsfx[@]" -M "r:|/=* r:|=*" \
- - "${(@)tmp1%%/*}"
+ if [[ -z "$listsfx" || "$tmp3" != */?* ]]; then
+ compadd -Qf "$mopts[@]" -p "$linepath$tmp2" -s "/${tmp3#*/}" \
+ -W "$prepath$realpath$testpath" \
+ "$pfxsfx[@]" -M "r:|/=* r:|=*" \
+ - "${(@)tmp1%%/*}"
+ else
+ compadd -Qf "$mopts[@]" -p "$linepath$tmp2" \
+ -W "$prepath$realpath$testpath" \
+ "$pfxsfx[@]" -M "r:|/=* r:|=*" \
+ - "${(@)^tmp1%%/*}/${tmp3#*/}"
+ fi
else
compadd -Qf "$mopts[@]" -p "$linepath$tmp2" \
-W "$prepath$realpath$testpath" \
@@ -497,12 +519,20 @@
fi
else
if [[ "$tmp3" = */* ]]; then
- tmp3=( -Qf "$mopts[@]" -p "$linepath$tmp2"
+ tmp4=( -Qf "$mopts[@]" -p "$linepath$tmp2"
-W "$prepath$realpath$testpath"
"$pfxsfx[@]" -M "r:|/=* r:|=*" )
- for i in "$tmp1[@]"; do
- compadd "$tmp3[@]" -s "/${i#*/}" - "${i%%/*}"
- done
+ if [[ -z "$listsfx" ]]; then
+ for i in "$tmp1[@]"; do
+ compadd "$tmp4[@]" -s "/${i#*/}" - "${i%%/*}"
+ done
+ else
+ [[ -n "$compstate[pattern_match]" ]] && SUFFIX="${SUFFIX:s./.*/}*"
+
+ for i in "$tmp1[@]"; do
+ compadd "$tmp4[@]" - "$i"
+ done
+ fi
else
compadd -Qf "$mopts[@]" -p "$linepath$tmp2" \
-W "$prepath$realpath$testpath" \
@@ -526,22 +556,33 @@
# take it from the filenames.
testpath="${testpath}${tmp1[1]%%/*}/"
- tmp1=( "${(@)tmp1#*/}" )
tmp3="${tmp3#*/}"
if [[ "$tpre" = */* ]]; then
- cpre="${cpre}${tpre%%/*}/"
+ if [[ -z "$_comp_correct" && -n "$compstate[pattern_match]" &&
+ "$tmp2" = (|*[^\\])[][*?#~^\|\<\>]* ]]; then
+ cpre="${cpre}${tmp1[1]%%/*}/"
+ else
+ cpre="${cpre}${tpre%%/*}/"
+ fi
tpre="${tpre#*/}"
elif [[ "$tsuf" = */* ]]; then
[[ "$tsuf" != /* ]] && mid="$testpath"
- cpre="${cpre}${tpre}/"
+ if [[ -z "$_comp_correct" && -n "$compstate[pattern_match]" &&
+ "$tmp2" = (|*[^\\])[][*?#~^\|\<\>]* ]]; then
+ cpre="${cpre}${tmp1[1]%%/*}/"
+ else
+ cpre="${cpre}${tpre}/"
+ fi
tpre="${tsuf#*/}"
tsuf=
else
tpre=
tsuf=
fi
+
+ tmp1=( "${(@)tmp1#*/}" )
done
if [[ -z "$tmp4" ]]; then
@@ -579,9 +620,15 @@
compquote tmp4
else
compquote tmp4 tmp1
+ fi
+ if [[ -z "$_comp_correct" && -n "$compstate[pattern_match]" &&
+ "$PREFIX$SUFFIX" = (|*[^\\])[][*?#~^\|\<\>]* ]]; then
+ compadd -Qf -W "$prepath$realpath" "$pfxsfx[@]" "$mopts[@]" \
+ -M "r:|/=* r:|=*" - "$linepath$tmp4${(@)^tmp1}"
+ else
+ compadd -Qf -p "$linepath$tmp4" -W "$prepath$realpath$testpath" \
+ "$pfxsfx[@]" "$mopts[@]" -M "r:|/=* r:|=*" -a tmp1
fi
- compadd -Qf "$mopts[@]" -p "$linepath$tmp4" -W "$prepath$realpath$testpath" \
- "$pfxsfx[@]" -M "r:|/=* r:|=*" -a tmp1
fi
fi
done
Index: Doc/Zsh/compsys.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/compsys.yo,v
retrieving revision 1.103
diff -u -r1.103 compsys.yo
--- Doc/Zsh/compsys.yo 2000/10/23 08:07:32 1.103
+++ Doc/Zsh/compsys.yo 2000/11/08 09:15:18
@@ -1368,6 +1368,10 @@
in the context name to one of tt(correct-)var(num) or
tt(approximate-)var(num), where var(num) is the number of errors that
were accepted.
+
+When used for the tt(_match) completer, the style may also be set to
+the string `tt(pattern)'. This makes the pattern on the line be left
+unchanged if it didn't match unambiguously.
)
kindex(keep-prefix, completion style)
item(tt(keep-prefix))(
@@ -1467,6 +1471,14 @@
determines if matches are to be listed in a rows-first fashion, as for the
tt(LIST_ROWS_FIRST) option.
)
+kindex(list-suffixes, completion style)
+item(tt(list-suffixes))(
+This style is used by the function used to complete filenames. If
+completion is attempted on a string containing multiple partially
+typed pathname components and this style is set to `true', all
+components starting with the first one for which more than one match
+could be generated will be shown.
+)
kindex(local, completion style)
item(tt(local))(
This style is used by completion functions which generate URLs as
@@ -2417,6 +2429,9 @@
tt(insert-unambiguous) style is set to `true'. In
this case menu completion will only be started if no unambiguous string
could be generated that is at least as long as the original string.
+The style may also be set to the string `tt(pattern)'. This will keep
+the pattern on the line intact as long as there isn't an unambiguous
+completion with which it could be replaced.
Note that the matcher specifications defined globally or used by the
completion functions will not be used.
@@ -3475,7 +3490,7 @@
`tt(-r)', and `tt(-R)' options from the tt(compadd) builtin.
Finally, the tt(_path_files) function uses the styles tt(expand),
-tt(ambiguous) and tt(special-dirs) and tt(file-sort).
+tt(ambiguous), tt(special-dirs), tt(list-suffixes) and tt(file-sort).
)
findex(_regex_arguments)
item(tt(_regex_arguments) var(name) var(specs) ...)(
--
Sven Wischnowsky wischnow@xxxxxxxxxxxxxxxxxxxxxxx
Messages sorted by:
Reverse Date,
Date,
Thread,
Author