summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Base/Utility/_sequence4
-rw-r--r--Test/Y01completion.ztst10
3 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f530ab1eb..9d248dbc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-06-26 Oliver Kiddle <okiddle@yahoo.co.uk>
+
+ * 45895: oxiedi: Completion/Base/Utility/_sequence,
+ Test/Y01completion.ztst: ignore dedup patterns in _sequence
+
2020-06-25 Daniel Shahaf <d.s@daniel.shahaf.name>
* 46068 (tweaked) (was: github #57): Doc/Zsh/zle.yo, README,
diff --git a/Completion/Base/Utility/_sequence b/Completion/Base/Utility/_sequence
index c1ff32184..1a87c1753 100644
--- a/Completion/Base/Utility/_sequence
+++ b/Completion/Base/Utility/_sequence
@@ -8,10 +8,10 @@
# -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 -a opts sep num pref suf cont end uniq dedup garbage
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:=garbage d=uniq M+: J+: V+: 1 2 o+: X+: x+:
(( $#cont )) && curcontext="${curcontext%:*}:$cont[2]"
(( $#sep )) || sep[2]=,
diff --git a/Test/Y01completion.ztst b/Test/Y01completion.ztst
index 51f604bcf..a00103946 100644
--- a/Test/Y01completion.ztst
+++ b/Test/Y01completion.ztst
@@ -216,6 +216,16 @@ F:regression test workers/31611
>NO:{3pm}
>NO:{10pm}
+ comptesteval "_tst() { _arguments ':desc:_sequence compadd - 1 2 3' }"
+ comptesteval "zstyle ':completion:*:tst:*' ignored-patterns 2"
+ comptest $'tst 1,\t'
+ comptesteval "zstyle -d ':completion:*:tst:*' ignored-patterns"
+0:-F doesn't break _sequence
+>line: {tst 1,}{}
+>DESCRIPTION:{desc}
+>NO:{2}
+>NO:{3}
+
comptest $'a=() b=(\t'
0:multiple envarrays
>line: {a=() b=(}{}