Re: PATCH: Improve quote handling in _ant completion

[Bart Schaefer <schaefer@brasslantern.com>]

[-- Attachment #1: Type: text/plain, Size: 722 bytes --]

On Sun, Dec 3, 2023 at 1:08 PM Oliver Kiddle <opk@zsh.org> wrote:
>
> It definitely would be best renamed with _ant_ as a prefix. I would just
> call it _ant_targets and include the compadd line in the function.

That last is a little tricky because it calls itself recursively.

> Perhaps whoever wrote it wanted to use it outside of completion.

Heh.

> It could also be rewritten to use fewer subshells.

I'm not certain enough of what's going on in there to try to do that.
One subshell is just to protect the parent against a "cd", the others
probably tail-exec themselves except for the one that has an "echo
$file | sed".

Rewritten to avoid "sed" you mean?  The s/// are mostly pretty gnarly.

[-- Attachment #2: more-_ant.txt --]
[-- Type: text/plain, Size: 1550 bytes --]

diff --git a/Completion/Unix/Command/_ant b/Completion/Unix/Command/_ant
index 91428b854..e5bfe7cf9 100644
--- a/Completion/Unix/Command/_ant
+++ b/Completion/Unix/Command/_ant
@@ -6,7 +6,8 @@ local curcontext="$curcontext" state line expl ret=1
 typeset -A opt_args
 local buildfile classpath cp userjars importedfiles target='*:target:->target' targets tmp
 
-find_targets() {
+(( $+functions[_ant_targets] )) ||
+_ant_targets() {
     importedfiles=( $(sed -n "s/ *<import[^>]* file=[\"']\([^\"']*\)[\"'].*/\1/p" < $1) )
     # Tweaked to omit targets beginning with "-" that can't
     # be invoked from the command line; see zsh-workers/24129.
@@ -14,12 +15,12 @@ find_targets() {
     if (( $#importedfiles )) ; then
         ( cd $1:h
             for file in $importedfiles ; do
-                expanded=( $(echo $file | sed -n "s|\${ant.home}|$ANT_HOME|p") )
-                if [[ ! "bla$expanded" = "bla" ]]; then
+                expanded=${file//\${ant.home}/$ANT_HOME}
+                if [[ $expanded" != "$file" ]]; then
                     file=$expanded
                 fi
                 if [[ -f $file ]]; then
-                    find_targets $file
+                    _ant_targets $file
                 fi
         done )
     fi
@@ -135,7 +136,7 @@ case $state in
         )//$'\015'}"
         _describe 'target' tmp && ret=0
       else
-        targets=( $(find_targets $buildfile) )
+        targets=( $(_ant_targets $buildfile) )
         _wanted targets expl target compadd -a targets && ret=0
       fi
     else