From: m0viefreak <m0viefreak.cm@googlemail.com>
To: zsh-workers@zsh.org
Cc: m0viefreak <m0viefreak.cm@googlemail.com>
Subject: [PATCH] completion: don't treat '--' as an option called '-' with _arguments -s
Date: Thu, 8 May 2014 14:45:41 +0200 [thread overview]
Message-ID: <1399553141-5160-1-git-send-email-m0viefreak.cm@googlemail.com> (raw)
Assume the following:
_foo() { _arguments -s '-a[opt]' '--[end of options]' }
Before this change:
$ foo --<tab>
would complete to
$ foo --a
which makes no sense. As a real-world example compare
$ git diff --ca<tab>
It wrongly offers all the single letter options.
The reason is that the '--' is interpreted as a single letter
option called '-'. Then, with -s given, '-a' and '--' may be
combined to '-a-' or '--a'.
Instead, treat '--' specially and never consider it a single
letter option. This behavior then corresponds to the common
practice of 'end of options' and should be safe, since there
probably isn't any program in existence that actually
uses '--' as a single letter option called '-'.
---
Src/Zle/computil.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
index f5e6ba1..b11c39f 100644
--- a/Src/Zle/computil.c
+++ b/Src/Zle/computil.c
@@ -1500,9 +1500,11 @@ parse_cadef(char *nam, char **args)
nodopts++;
/* If this is for single-letter option we also store a
- * pointer for the definition in the array for fast lookup. */
+ * pointer for the definition in the array for fast lookup.
+ * But don't treat '--' as a single option called '-' */
- if (single && name[1] && !name[2])
+
+ if (single && name[1] && !name[2] && name[1] != '-')
ret->single[STOUC(name[1])] = opt;
if (again == 1) {
@@ -2034,7 +2036,9 @@ ca_parse_line(Cadef d, int multi, int first)
state.optbeg = state.argbeg = state.inopt = cur;
state.argend = argend;
state.singles = (d->single && (!pe || !*pe) &&
- state.curopt->name[1] && !state.curopt->name[2]);
+ state.curopt->name[1] && !state.curopt->name[2] &&
+ /* Don't treat '--' as a single option called '-' */
+ state.curopt->name[1] != '-');
if (!state.oargs[state.curopt->num])
state.oargs[state.curopt->num] = znewlinklist();
--
1.9.1.286.g5172cb3
next reply other threads:[~2014-05-08 12:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-08 12:45 m0viefreak [this message]
2014-05-08 13:26 ` 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=1399553141-5160-1-git-send-email-m0viefreak.cm@googlemail.com \
--to=m0viefreak.cm@googlemail.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).