From: dana <dana@dana.is>
To: Marko Myllynen <myllynen@redhat.com>
Cc: zsh-workers@zsh.org
Subject: Re: Oddity when completing option arguments after command arguments
Date: Tue, 19 Dec 2017 22:52:29 -0600 [thread overview]
Message-ID: <04DE83CD-E8E7-4D69-9045-DDC2D2CC3263@dana.is> (raw)
In-Reply-To: <aa06fe49-e2e9-df25-14f0-3f6afe3cb56b@redhat.com>
On 18 Dec 2017, at 06:01, Marko Myllynen <myllynen@redhat.com> 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
next prev parent reply other threads:[~2017-12-20 4:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-18 12:01 Marko Myllynen
2017-12-20 4:52 ` dana [this message]
2017-12-20 9:08 ` Peter Stephenson
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=04DE83CD-E8E7-4D69-9045-DDC2D2CC3263@dana.is \
--to=dana@dana.is \
--cc=myllynen@redhat.com \
--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).