From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: zsh-workers <zsh-workers@zsh.org>
Subject: Re: Regression: broken completion on modification time
Date: Tue, 21 Jun 2016 16:31:06 +0200 [thread overview]
Message-ID: <20080.1466519466@thecus.kiddle.eu> (raw)
In-Reply-To: <20160621014132.GC17100@tarsus.local2>
Daniel Shahaf wrote:
> Change it how? I don't see how max-verbose and extra-verbose can be
> combined, since the former is an int and the latter a bool.
Ah, ok. I didn't check out the details of max-verbose.
> Another display option would be to use a dummy "string without a match"
> as Bart said (compadd -E1) for something like
>
> → sense
> (for the "exactly" sense, skip/omit this field)
I've gone with "sense [default exactly]" as the explanation heading.
We've used square brackets to indicate defaults elsewhere.
The patch now also covers find.
Oliver
diff --git a/Completion/Unix/Command/_find b/Completion/Unix/Command/_find
index e736f32..3854d6c 100644
--- a/Completion/Unix/Command/_find
+++ b/Completion/Unix/Command/_find
@@ -1,7 +1,7 @@
#compdef find gfind
-local curcontext="$curcontext" state_descr variant
-local -a state line args alts
+local curcontext="$curcontext" state_descr variant default
+local -a state line args alts disp smatch
_pick_variant -r variant gnu=GNU $OSTYPE -version
@@ -101,7 +101,7 @@ case $variant in
'-D[print diagnostics]:debug option:(help tree search stat rates opt exec)'
'-O+[enable query optimisation]:level:(1 2 3)'
'*-daystart'
- '-regextype:regexp syntax:(emacs posix-awk posix-basic posix-egrep posix-extended)'
+ '-regextype:regexp syntax:(help findutils-default awk egrep ed emacs gnu-awk grep posix-awk posix-basic posix-egrep posix-extended posix-minimal-basic sed)'
'*-warn'
'*-nowarn'
'*-xautofs'
@@ -147,13 +147,21 @@ _arguments -C $args \
'*-user:user:_users' \
'*-xdev' \
'*-a' '*-o' \
- '*:directory:_files -/'
+ '(-D -E -H -L -O -P -f -s -x --help --version)*:directory:_files -/'
if [[ $state = times ]]; then
if ! compset -P '[+-]' || [[ -prefix '[0-9]' ]]; then
- disp=( 'before' 'exactly' 'since' )
compstate[list]+=' packed'
- alts=( "senses:sense:compadd -V times -S '' -d disp - + '' -" )
+ if zstyle -t ":completion:${curcontext}:senses" verbose; then
+ zstyle -s ":completion:${curcontext}:senses" list-separator sep || sep=--
+ default=" [default exactly]"
+ disp=( "- $sep before" "+ $sep since" )
+ smatch=( - + )
+ else
+ disp=( before exactly since )
+ smatch=( - '' + )
+ fi
+ alts=( "senses:sense${default}:compadd -V times -S '' -d disp -a smatch" )
fi
alts+=( "times:${state_descr}:_dates -f d" )
_alternative $alts
diff --git a/Completion/Zsh/Type/_globquals b/Completion/Zsh/Type/_globquals
index ed9c008..6eef168 100644
--- a/Completion/Zsh/Type/_globquals
+++ b/Completion/Zsh/Type/_globquals
@@ -1,7 +1,7 @@
#autoload
-local state=qual expl char delim timespec
-local -a alts tdisp sdisp
+local state=qual expl char delim timespec default
+local -a alts tdisp sdisp tmatch smatch
local -A specmap
while [[ -n $PREFIX ]]; do
@@ -118,11 +118,27 @@ while [[ -n $PREFIX ]]; do
timespec=$PREFIX[1]
if ! compset -P '[Mwhmsd]' && [[ -z $PREFIX ]]; then
tdisp=( seconds minutes hours days weeks Months )
- alts+=( "time-specifiers:time specifier:compadd -E 0 -d tdisp -S '' - s m h d w M" )
+ tmatch=( s m h d w M )
+ if zstyle -t ":completion:${curcontext}:time-specifiers" verbose; then
+ zstyle -s ":completion:${curcontext}:time-specifiers" list-separator sep || sep=--
+ print -v tdisp -f "%s ${sep//(#m)[%\\]/$MATCH$MATCH} %s\0" ${tmatch:^^tdisp}
+ tdisp=( ${(0)tdisp} )
+ fi
+ alts+=( "time-specifiers:time specifier:compadd -E 0 -d tdisp -S '' -a tmatch" )
fi
if ! compset -P '[-+]' && [[ -z $PREFIX ]]; then
sdisp=( before exactly since )
- alts+=("senses:sense:compadd -E 0 -d sdisp -S '' - + '' -")
+ smatch=( - '' + )
+ if zstyle -t ":completion:${curcontext}:senses" verbose; then
+ zstyle -s ":completion:${curcontext}:senses" list-separator sep || sep=--
+ default=" [default exactly]"
+ sdisp=( "- $sep before" "+ $sep since" )
+ smatch=( - + )
+ else
+ sdisp=( before exactly since )
+ smatch=( - '' + )
+ fi
+ alts+=( "senses:sense${default}:compadd -E 0 -d sdisp -S '' -a smatch" )
fi
specmap=( M months w weeks h hours m minutes s seconds '(|+|-|d)' days)
alts+=('digits:digit ('${${specmap[(K)${timespec:-d}]}:-invalid time specifier}'):_dates -f ${${timespec/[-+]/d}:-d} -S ""' )
prev parent reply other threads:[~2016-06-21 15:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-12 20:32 Dima Kogan
2016-06-13 0:47 ` Bart Schaefer
2016-06-13 1:37 ` Dima Kogan
2016-06-13 22:00 ` Oliver Kiddle
2016-06-14 16:14 ` Bart Schaefer
2016-06-15 16:32 ` Oliver Kiddle
2016-06-15 23:24 ` Daniel Shahaf
2016-06-17 16:19 ` Oliver Kiddle
2016-06-17 18:11 ` Bart Schaefer
2016-06-17 19:10 ` Nikolay Aleksandrovich Pavlov (ZyX)
2016-06-17 22:02 ` Oliver Kiddle
2016-06-17 22:20 ` Nikolay Aleksandrovich Pavlov (ZyX)
2016-06-17 22:33 ` Bart Schaefer
2016-06-17 22:49 ` Nikolay Aleksandrovich Pavlov (ZyX)
2016-06-17 23:00 ` Bart Schaefer
2016-06-17 23:50 ` Oliver Kiddle
2016-06-19 16:04 ` Bart Schaefer
2016-06-21 1:41 ` Daniel Shahaf
2016-06-21 14:31 ` Oliver Kiddle [this message]
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=20080.1466519466@thecus.kiddle.eu \
--to=okiddle@yahoo.co.uk \
--cc=zsh-workers@zsh.org \
/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).