[PATCH] env completion: add missing explanation of --unset option, fixes alignment of completed arguments

[PATCH] env completion: add missing explanation of --unset option, fixes alignment of completed arguments

[Ingmar Vanhassel]

---
 Completion/Unix/Command/_env |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

I was getting a few patch series ready to send, but I guess I can fire this one
off already, it probably fixes your issue.

What I've not figured out, is how to make 'env FOO=bar quux <TAB>' complete
options to 'quux'. I guess that'll take someone with more experience than me.

diff --git a/Completion/Unix/Command/_env b/Completion/Unix/Command/_env
index 2638186..383891f 100644
--- a/Completion/Unix/Command/_env
+++ b/Completion/Unix/Command/_env
@@ -3,7 +3,7 @@
 if _pick_variant gnu=Free\ Soft unix --version; then
   _arguments \
     '(--ignore-environment -i)'{-i,--ignore-environment}'[start with empty environment]' \
-    {-u,--unset=}':env var to remove:compadd ${(k)parameters[(R)*export*]}' \
+    '(--unset= -u)'{-u,--unset=}'[remove variable from the environment]:env var to remove:compadd ${(k)parameters[(R)*export*]}' \
     '--help[help]' \
     '--version[version]' \
     '*::arguments: _normal'
-- 
1.6.5.2.351.g0943

Re: [PATCH] env completion: add missing explanation of --unset option, fixes alignment of completed arguments

[Benjamin R. Haskell]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 792 bytes --]

On Thu, 12 Nov 2009, Ingmar Vanhassel wrote:

> ---
>  Completion/Unix/Command/_env |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> I was getting a few patch series ready to send, but I guess I can fire this one
> off already, it probably fixes your issue.
> 
> What I've not figured out, is how to make 'env FOO=bar quux <TAB>' complete
> options to 'quux'. I guess that'll take someone with more experience than me.

Took a hint from _xargs...  Attached patch incorporates:

1. my fix to allow multiple '-u/--unset=' args
2. Ingmar's documentation fix
3. the fix to complete arguments to the command passed to 'env'

Does not include the '(--unset= -u)' Ingmar had prepended to the '-u' 
line.  (I think that would explicitly prevent multiple -u/--unset args.)

Best,
Ben

[-- Attachment #2: Type: TEXT/PLAIN, Size: 866 bytes --]

Index: Completion/Unix/Command/_env
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_env,v
retrieving revision 1.1
diff -u -r1.1 _env
--- Completion/Unix/Command/_env	13 Apr 2006 02:46:50 -0000	1.1
+++ Completion/Unix/Command/_env	12 Nov 2009 20:47:25 -0000
@@ -3,9 +3,10 @@
 if _pick_variant gnu=Free\ Soft unix --version; then
   _arguments \
     '(--ignore-environment -i)'{-i,--ignore-environment}'[start with empty environment]' \
-    {-u,--unset=}':env var to remove:compadd ${(k)parameters[(R)*export*]}' \
+    '*'{-u,--unset=}'[remove variable from the environment]:env var to remove:compadd ${(k)parameters[(R)*export*]}' \
     '--help[help]' \
     '--version[version]' \
+    '(-):command: _command_names -e' \
     '*::arguments: _normal'
 else
   _precommand

Re: [PATCH] env completion: add missing explanation of --unset option, fixes alignment of completed arguments

[Ingmar Vanhassel]

Excerpts from Benjamin R. Haskell's message of Thu Nov 12 21:52:50 +0100 2009:
> On Thu, 12 Nov 2009, Ingmar Vanhassel wrote:
> 
> > ---
> >  Completion/Unix/Command/_env |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > I was getting a few patch series ready to send, but I guess I can fire this one
> > off already, it probably fixes your issue.
> > 
> > What I've not figured out, is how to make 'env FOO=bar quux <TAB>' complete
> > options to 'quux'. I guess that'll take someone with more experience than me.
> 
> Took a hint from _xargs...  Attached patch incorporates:

Thanks :)

> 1. my fix to allow multiple '-u/--unset=' args
> 2. Ingmar's documentation fix
> 3. the fix to complete arguments to the command passed to 'env'

This doesn't fix 'env FOO=bar quux <TAB>' here.

> Does not include the '(--unset= -u)' Ingmar had prepended to the '-u' 
> line.  (I think that would explicitly prevent multiple -u/--unset args.)
> 
> Best,
> Ben
> Index: Completion/Unix/Command/_env
> ===================================================================
> RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_env,v
> retrieving revision 1.1
> diff -u -r1.1 _env
> --- Completion/Unix/Command/_env        13 Apr 2006 02:46:50 -0000        1.1
> +++ Completion/Unix/Command/_env        12 Nov 2009 20:47:25 -0000
> @@ -3,9 +3,10 @@
>  if _pick_variant gnu=Free\ Soft unix --version; then
>    _arguments \
>      '(--ignore-environment -i)'{-i,--ignore-environment}'[start with empty
> environment]' \
> -    {-u,--unset=}':env var to remove:compadd ${(k)parameters[(R)*export*]}' \
> +    '*'{-u,--unset=}'[remove variable from the environment]:env var to
> remove:compadd ${(k)parameters[(R)*export*]}' \
>      '--help[help]' \
>      '--version[version]' \
> +    '(-):command: _command_names -e' \
>      '*::arguments: _normal'
>  else
>    _precommand
-- 
Exherbo KDE, X.org maintainer

Re: [PATCH] env completion: add missing explanation of --unset option, fixes alignment of completed arguments

[Benjamin R. Haskell]

On Thu, 12 Nov 2009, Ingmar Vanhassel wrote:

> Excerpts from Benjamin R. Haskell's message of Thu Nov 12 21:52:50 +0100 2009:
> > On Thu, 12 Nov 2009, Ingmar Vanhassel wrote:
> >
> > [...]
> > 3. the fix to complete arguments to the command passed to 'env'
> 
> This doesn't fix 'env FOO=bar quux <TAB>' here.

I agree. :-) Spoke too soon.  (I'd only tested with 'env -u BLAH quux <TAB>')

I thought the '(-):command: _command_names -e' line was more magical than 
it is.  Turns out the '*::arguments: _normal' is the 'quux <TAB>'-enabling 
portion, modulo the intervening FOO=bar args.

This way lie dragons.  Going back to ye cave of Zsh-completion 
begginneres.

-- Ben

Re: [PATCH] env completion: add missing explanation of --unset option, fixes alignment of completed arguments

[Stephane Chazelas]

2009-11-12 21:13:39 +0100, Ingmar Vanhassel:
> ---
>  Completion/Unix/Command/_env |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> I was getting a few patch series ready to send, but I guess I can fire this one
> off already, it probably fixes your issue.
> 
> What I've not figured out, is how to make 'env FOO=bar quux <TAB>' complete
> options to 'quux'. I guess that'll take someone with more experience than me.
> 
> diff --git a/Completion/Unix/Command/_env b/Completion/Unix/Command/_env
> index 2638186..383891f 100644
> --- a/Completion/Unix/Command/_env
> +++ b/Completion/Unix/Command/_env
> @@ -3,7 +3,7 @@
>  if _pick_variant gnu=Free\ Soft unix --version; then
>    _arguments \
>      '(--ignore-environment -i)'{-i,--ignore-environment}'[start with empty environment]' \
> -    {-u,--unset=}':env var to remove:compadd ${(k)parameters[(R)*export*]}' \
> +    '(--unset= -u)'{-u,--unset=}'[remove variable from the environment]:env var to remove:compadd ${(k)parameters[(R)*export*]}' \

That doesn't solve the OP's initial problem (that the -u option
wasn't offered anymore after it has been provided once). You'd
need:

'*'{-u,--unset=}...

instead (as someone already pointed out).

>      '--help[help]' \
>      '--version[version]' \
>      '*::arguments: _normal'

-- 
Stephane