From: Peter Stephenson <pws@csr.com>
To: zsh-workers <zsh-workers@sunsite.dk>
Subject: Re: _subscript quotes too much
Date: Wed, 9 Apr 2008 12:20:53 +0100 [thread overview]
Message-ID: <20080409122053.3ddfdc42@news01> (raw)
In-Reply-To: <20080409120025.5c4fd6f4@news01>
On Wed, 9 Apr 2008 12:00:25 +0100
Peter Stephenson <pws@csr.com> wrote:
> As far as _subscript is concerned, it would have to be taught the rules for
> which characters can be backslashed, this applied with ${...//.../...}, and
> then the -Q flag passed to compadd. This shouldn't be too hard.
It wasn't. If you can find cases that still don't complete successfully
it can be tweaked further.
Index: Completion/Zsh/Context/_subscript
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Zsh/Context/_subscript,v
retrieving revision 1.12
diff -u -r1.12 _subscript
--- Completion/Zsh/Context/_subscript 13 Dec 2007 21:38:42 -0000 1.12
+++ Completion/Zsh/Context/_subscript 9 Apr 2008 11:18:39 -0000
@@ -67,12 +67,14 @@
_values -s '' 'subscript flags' $flags
elif [[ ${(Pt)${compstate[parameter]}} = assoc* ]]; then
- local suf
+ local suf MATCH MBEGIN MEND
+ local -a keys
+ keys=(${${(kP)compstate[parameter]}//(#m)[\$\\\[\]\(\)\[\{\}]/\\$MATCH})
[[ "$RBUFFER" != (|\\)\]* ]] && suf="$osuf"
_wanted association-keys expl 'association key' \
- compadd -S "$suf" -k "$compstate[parameter]"
+ compadd -Q -S "$suf" -a keys
elif [[ ${(Pt)${compstate[parameter]}} = array* ]]; then
local list i j ret=1 disp
--
Peter Stephenson <pws@csr.com> Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK Tel: +44 (0)1223 692070
next prev parent reply other threads:[~2008-04-09 11:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-09 0:08 Mikael Magnusson
2008-04-09 0:11 ` Mikael Magnusson
2008-04-09 8:49 ` Peter Stephenson
2008-04-09 11:00 ` Peter Stephenson
2008-04-09 11:20 ` Peter Stephenson [this message]
2008-04-09 11:53 ` Mikael Magnusson
2008-04-09 12:11 ` 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=20080409122053.3ddfdc42@news01 \
--to=pws@csr.com \
--cc=zsh-workers@sunsite.dk \
/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).