Re: [PATCH] Ant completion improvement

[Doug Kearns <dougkearns@gmail.com>]

Hello Jean-Baptiste,

On Mon, Dec 06, 2004 at 11:41:19AM +0100, Jean-Baptiste Quenot wrote:
> Hello!
> 
> Thanks for zsh: it's great.
> 
> The example below does not return completion for the "build" target
> without the patch (replace ^Is with tabs):
> 
> ^I^I<target name="build" depends="init">
> 
> The example below does not return completion for the "build" target
> without the patch:
> 
> <target depends="init" name="build">
> 
> Please find attached a patch against 4.2.1 to allow ant completion to:

Thanks. I was just about to commit this, but I'm not sure it's necessary.
 
> 1) match leading tabs before the <target/> elements

See below.

> 2) match the target's "name" attribute not just on the first position

It looks as though a variant of this has already been committed as a
result of your patch posted to the list on 24/08/04.
 
> Thanks in advance,

> --- _ant.orig	Mon Dec  6 11:22:13 2004
> +++ _ant	Mon Dec  6 11:40:46 2004
> @@ -86,7 +86,7 @@
>  	buildfile=${(v)opt_args[(I)(-f|-file|-buildfile)]:-build.xml}
>        fi
>        if [[ -f $buildfile ]]; then
> -        targets=( $(sed -n "s/ *<target name=[\"']\([^\"']*\)[\"'].*/\1/p" < $buildfile) )
> +        targets=( $(sed -n "s/[ 	]*<target *[^>]* name=[\"']\([^\"']*\)[\"'].*/\1/p" < $buildfile) )

Why not just:

           targets=( $(sed -n "s/<target name=[\"']\([^\"']*\)[\"'].*/\1/p" < $buildfile) )

Either way I don't see why this would fail with leading tabs. What am I
missing?

>  	_wanted targets expl target compadd -a targets && ret=0
>        else
>  	_message -e targets target

Regards,
Doug