From: Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
To: zsh-workers@sunsite.auc.dk
Subject: Re: match again
Date: Fri, 28 Jan 2000 11:05:44 +0100 (MET) [thread overview]
Message-ID: <200001281005.LAA20292@beta.informatik.hu-berlin.de> (raw)
In-Reply-To: "Andrej Borsenkow"'s message of Thu, 27 Jan 2000 19:31:40 +0300
Andrej Borsenkow wrote:
> This does not work:
>
> bor@itsrm2% patch -p0 --dry-run < /u/p/u/z/p/*/9441<TAB>
>
> with settings
>
> bor@itsrm2% compstyle -L
> compstyle ':correct:' prompt 'correct to:'
> ...
[ Time to use zstyle instead of compstyle (but maybe you just used it
for output?). ]
>
> But this one does
>
> bor@itsrm2% patch -p0 --dry-run <
> /u2/pub/unix/zsh/patches/3.1.6-dev-16/<9440-><TAB>
> bor@itsrm2% patch -p0 --dry-run < /u2/pub/unix/zsh/patches/3.1.6-dev-16/9441
> 9441 9442
I've already explained this at least twice. The problem is that the
completion code gets a PREFIX of the form f/*/b with
`compadd -p foo/baz/ - bar'. It tries to match `foo/baz/' with `f/*'
which doesn't work, because we can only either match the whole thing
with pattern matching (messing up braces and things) or do what we do
now, i.e. try to match the prefix (and suffix) normally and use
pattern matching for the strings (like `bar' in the example).
But we can try to make _path_files a bit cleverer... the patch below
makes it stop its ambiguous-part searching loop if it arrives at a
part with a pattern. It then changes the way the cursor style is
tested to hopefully give more sensible behaviour.
Andrej, is this, finally, acceptable for you?
Bye
Sven
diff -ru ../z.old/Completion/Core/_path_files Completion/Core/_path_files
--- ../z.old/Completion/Core/_path_files Fri Jan 28 10:23:55 2000
+++ Completion/Core/_path_files Fri Jan 28 10:58:33 2000
@@ -172,7 +172,7 @@
eorig="$orig"
[[ $compstate[insert] = (*menu|[0-9]*) || -n "$_comp_correct" ||
- ( $#compstate[pattern_match] -ne 0 &&
+ ( -n "$compstate[pattern_match]" &&
"${orig#\~}" != "${${orig#\~}:q}" ) ]] && menu=yes
# If given no `-F' option, we may want to use $fignore, turned into patterns.
@@ -442,7 +442,17 @@
tmp4=( "${(@)tmp1:#${tmp1[1]}}" )
fi
- if (( $#tmp4 )); then
+ if [[ "$tpre" = */* ]]; then
+ PREFIX="${donepath}${linepath}${cpre}${tpre%%/*}"
+ SUFFIX="/${tsuf#*/}"
+ else
+ PREFIX="${donepath}${linepath}${cpre}${tpre}"
+ SUFFIX="${tsuf}"
+ fi
+
+ if (( $#tmp4 )) ||
+ [[ -n "$compstate[pattern_match]" &&
+ "$PREFIX$SUFFIX" != "${(q)PREFIX}${(q)SUFFIX}" ]]; then
# It is. For menucompletion we now add the possible completions
# for this component with the unambigous prefix we have built
@@ -451,29 +461,21 @@
# collected as the suffixes to make the completion code expand
# it as far as possible.
- if [[ "$tpre" = */* ]]; then
- PREFIX="${donepath}${linepath}${cpre}${tpre%%/*}"
- SUFFIX="/${tsuf#*/}"
- else
- PREFIX="${donepath}${linepath}${cpre}${tpre}"
- SUFFIX="${tsuf}"
- fi
-
- tmp4="$testpath"
- compquote tmp1 tmp4
+ tmp2="$testpath"
+ compquote tmp1 tmp2
if [[ -n $menu ]] ||
! zstyle -t ":completion${curcontext}:paths" expand suffix; then
- zstyle -t ":completion${curcontext}:paths" cursor &&
+ (( $#tmp4 )) && zstyle -t ":completion${curcontext}:paths" cursor &&
compstate[to_end]=''
if [[ "$tmp3" = */* ]]; then
- compadd -Qf "$mopts[@]" -p "$linepath$tmp4" -s "/${tmp3#*/}" \
+ compadd -Qf "$mopts[@]" -p "$linepath$tmp2" -s "/${tmp3#*/}" \
-W "$prepath$realpath$testpath" \
"$addpfx[@]" "$addsfx[@]" "$remsfx[@]" \
-M "r:|/=* r:|=* $mspec" "$group[@]" "$expl[@]" \
- "${(@)tmp1%%/*}"
else
- compadd -Qf "$mopts[@]" -p "$linepath$tmp4" \
+ compadd -Qf "$mopts[@]" -p "$linepath$tmp2" \
-W "$prepath$realpath$testpath" \
"$addpfx[@]" "$addsfx[@]" "$remsfx[@]" \
-M "r:|/=* r:|=* $mspec" "$group[@]" "$expl[@]" \
@@ -481,7 +483,7 @@
fi
else
if [[ "$tmp3" = */* ]]; then
- atmp=( -Qf "$mopts[@]" -p "$linepath$tmp4"
+ atmp=( -Qf "$mopts[@]" -p "$linepath$tmp2"
-W "$prepath$realpath$testpath"
"$addpfx[@]" "$addsfx[@]" "$remsfx[@]"
-M "r:|/=* r:|=* $mspec" "$group[@]" "$expl[@]" )
@@ -489,7 +491,7 @@
compadd "$atmp[@]" -s "/${i#*/}" - "${i%%/*}"
done
else
- compadd -Qf "$mopts[@]" -p "$linepath$tmp4" \
+ compadd -Qf "$mopts[@]" -p "$linepath$tmp2" \
-W "$prepath$realpath$testpath" \
"$addpfx[@]" "$addsfx[@]" "$remsfx[@]" \
-M "r:|/=* r:|=* $mspec" "$group[@]" "$expl[@]" \
--
Sven Wischnowsky wischnow@informatik.hu-berlin.de
next reply other threads:[~2000-01-28 10:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2000-01-28 10:05 Sven Wischnowsky [this message]
2000-01-28 16:47 ` Alexandre Duret-Lutz
2000-01-30 1:27 ` Bart Schaefer
2000-02-01 10:48 ` Alexandre Duret-Lutz
-- strict thread matches above, loose matches on Subject: below --
2000-02-02 9:21 Sven Wischnowsky
2000-01-31 13:01 Sven Wischnowsky
2000-02-01 18:45 ` Peter Stephenson
2000-01-31 9:13 Sven Wischnowsky
2000-01-31 9:06 Sven Wischnowsky
2000-01-31 11:01 ` Bart Schaefer
2000-01-27 16:31 Andrej Borsenkow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200001281005.LAA20292@beta.informatik.hu-berlin.de \
--to=wischnow@informatik.hu-berlin.de \
--cc=zsh-workers@sunsite.auc.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).