Re: _subscript quotes too much

[Peter Stephenson <pws@xxxxxxx>]

On Wed, 9 Apr 2008 12:00:25 +0100
Peter Stephenson <pws@xxxxxxx> 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@xxxxxxx>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070