Re: Oddity when completing option arguments after command arguments

[dana <dana@xxxxxxx>]

On 18 Dec 2017, at 06:01, Marko Myllynen <myllynen@xxxxxxxxxx> wrote:
>This is with 5.4.1. What could explain this behavior, any suggestions
>how to fix this (so that in the last case would get only filenames)?

I think this would do it?

I didn't test *super* extensively, but it seems to behave as expected in all of
the cases listed, and it passes the existing checks.

dana


diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
index 71d61563b..0b1ba58dc 100644
--- a/Src/Zle/computil.c
+++ b/Src/Zle/computil.c
@@ -2493,7 +2493,9 @@ ca_set_data(LinkList descr, LinkList act, LinkList subc,
 	 * the case above right.
 	 */
 	if (arg->type == CAA_NORMAL &&
-	    opt && optdef && optdef->type == CAO_NEXT)
+	    opt && optdef &&
+	    (optdef->type == CAO_NEXT || optdef->type == CAO_ODIRECT ||
+	     optdef->type == CAO_OEQUAL))
 	    return;
 
 	if (single)
diff --git a/Test/Y03arguments.ztst b/Test/Y03arguments.ztst
index 7cbadfe8c..761b4b1d2 100644
--- a/Test/Y03arguments.ztst
+++ b/Test/Y03arguments.ztst
@@ -237,6 +237,27 @@
 >NO:{-a}
 >NO:{-b}
 
+ tst_arguments '*'{-x+,--xxx=}':optarg:(1)' '*:operand:(a)'
+ comptest $'tst \t'
+ comptest $'tst -x \t'
+ comptest $'tst -x\t'
+ comptest $'tst --xxx=\t'
+ comptest $'tst --xxx \t'
+ comptest $'tst a -x\t'
+ comptest $'tst a -x \t'
+ comptest $'tst a --xxx=\t'
+ comptest $'tst a --xxx \t'
+0:optarg completion following rest operand on line (workers/42141)
+>line: {tst a }{}
+>line: {tst -x 1 }{}
+>line: {tst -x1 }{}
+>line: {tst --xxx=1 }{}
+>line: {tst --xxx 1 }{}
+>line: {tst a -x1 }{}
+>line: {tst a -x 1 }{}
+>line: {tst a --xxx=1 }{}
+>line: {tst a --xxx 1 }{}
+
  tst_arguments '-a' '*::rest:{compadd - -b}'
  comptest $'tst arg -\t'
 0:rest arguments