From: oxiedi@yandex.ru
To: zsh-workers@zsh.org
Subject: [PATCH] Merge ignore and deduplication patterns in _sequence
Date: Mon, 09 Mar 2020 16:32:30 +0500 [thread overview]
Message-ID: <3932941583753550@myt2-a7d7570d35ff.qloud-c.yandex.net> (raw)
First, it fixes the following bug:
% zsh -f
% autoload -Uz compinit
% compinit -D
% compdef '_arguments ": :_sequence compadd - 1 2 3"' seq
% zstyle ':completion:*:*:seq:*:*' ignored-patterns 2
% seq <Tab>
_sequence:40: command not found: -F
Second, it allows a user to ignore matches using the ignored-patterns style.
diff --git a/Completion/Base/Utility/_sequence b/Completion/Base/Utility/_sequence
index c1ff32184..cb79960f2 100644
--- a/Completion/Base/Utility/_sequence
+++ b/Completion/Base/Utility/_sequence
@@ -8,10 +8,11 @@
# -d : duplicate values allowed
local curcontext="$curcontext" nm="$compstate[nmatches]" pre qsep nosep minus
-local -a opts sep num pref suf cont end uniq dedup
+local ign_pats
+local -a opts sep num pref suf cont end ign uniq dedup
zparseopts -D -a opts s:=sep n:=num p:=pref i:=pref P:=pref I:=suf S:=suf \
- q=suf r:=suf R:=suf C:=cont d=uniq M+: J+: V+: 1 2 o+: X+: x+:
+ q=suf r:=suf R:=suf C:=cont F:=ign d=uniq M+: J+: V+: 1 2 o+: X+: x+:
(( $#cont )) && curcontext="${curcontext%:*}:$cont[2]"
(( $#sep )) || sep[2]=,
@@ -20,12 +21,22 @@ if (( $+suf[(r)-S] )); then
(( $#end )) && compset -S ${end}\* && suf=() && nosep=1
fi
+ign_pats=$ign[2]
+if [[ $ign_pats == \(*\) ]]; then
+ ign=( ${=ign_pats[2,-2]} )
+elif [[ -n $ign_pats ]]; then
+ ign=( ${(P)ign_pats} )
+else
+ ign=()
+fi
+
qsep="${sep[2]}"
compquote -p qsep
if (( ! $#uniq )); then
(( $+pref[(r)-P] )) && pre="${(q)pref[pref[(i)-P]+1]}"
dedup=( "${(@)${(@ps.$qsep.)PREFIX#$pre}[1,-2]}" "${(@)${(@ps.$qsep.)SUFFIX}[2,-1]}" )
[[ -n $compstate[quoting] ]] || dedup=( ${(Q)dedup} )
+ ign+=( "$dedup[@]" )
fi
if (( $#num )) && compset -P $(( num[2] - 1 )) \*${(q)qsep}; then
@@ -37,4 +48,4 @@ else
fi
(( minus = argv[(ib:2:)-] ))
-"${(@)argv[1,minus-1]}" "$opts[@]" -F dedup "$pref[@]" "$suf[@]" "${(@)argv[minus+1,-1]}"
+"${(@)argv[1,minus-1]}" "$opts[@]" -F ign "$pref[@]" "$suf[@]" "${(@)argv[minus+1,-1]}"
diff --git a/Test/Y01completion.ztst b/Test/Y01completion.ztst
index 51f604bcf..c616e606e 100644
--- a/Test/Y01completion.ztst
+++ b/Test/Y01completion.ztst
@@ -216,6 +216,57 @@ F:regression test workers/31611
>NO:{3pm}
>NO:{10pm}
+ comptesteval "_tst() { _arguments ':desc:_sequence -d compadd - 1 2 3' }"
+ comptesteval "zstyle ':completion:*:tst:*' ignored-patterns 2"
+ comptest $'tst 1,\t'
+0:ignore matches in _sequence via the ignored-patterns style (without deduplication)
+>line: {tst 1,}{}
+>DESCRIPTION:{desc}
+>NO:{1}
+>NO:{3}
+
+ comptesteval "_tst() { _arguments ':desc:_sequence compadd - 1 2 3 4' }"
+ comptest $'tst 1,\t'
+ comptesteval "zstyle -d ':completion:*:tst:*' ignored-patterns"
+0:ignore matches in _sequence via the ignored-patterns style (with deduplication)
+>line: {tst 1,}{}
+>DESCRIPTION:{desc}
+>NO:{3}
+>NO:{4}
+
comptest $'a=() b=(\t'
0:multiple envarrays
>line: {a=() b=(}{}
next reply other threads:[~2020-03-09 11:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-09 11:32 oxiedi [this message]
2020-05-21 12:43 ` Oliver Kiddle
2020-05-22 19:02 ` oxiedi
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=3932941583753550@myt2-a7d7570d35ff.qloud-c.yandex.net \
--to=oxiedi@yandex.ru \
--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).