PATCH: Improve quote handling in _ant completion

[German Riano <griano@yahoo.com>]

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

In the current completion, if a task description contains a quote (') the completions do not render properly
In this patch I propose to build the tmp array via
tmp=( ${(f@)"$(command)"} )
and print one line at a time. This way quotes are handled correctly
Also I am proposing to shield 'find_targets' with '(( $#functions[find_targets] )) ||' so that users can easily override the function.



Germán Riaño, Ph. D. http://GermanRiano.com Seattle, WA, USA

diff --git a/Completion/Unix/Command/_ant b/Completion/Unix/Command/_ant
index 36c7c0e89..c7bc7eb5f 100644
--- a/Completion/Unix/Command/_ant
+++ b/Completion/Unix/Command/_ant
@@ -6,6 +6,7 @@ local curcontext="$curcontext" state line expl ret=1
 typeset -A opt_args
 local buildfile classpath cp userjars importedfiles target='*:target:->target' targets tmp
 
+(( $#functions[find_targets] )) ||
 find_targets() {
     importedfiles=( $(sed -n "s/ *<import[^>]* file=[\"']\([^\"']*\)[\"'].*/\1/p" < $1) )
     # Tweaked to omit targets beginning with "-" that can't
@@ -103,8 +104,8 @@ case $state in
         # For the array to be set with correct argument boundaries, the entire
         # set statement needs to be eval'd.  On Cygwin, need to kill \r's output
         # from Java or parsing will fail.
-        eval set -A tmp "${$(_call_program targets "$words[1]" -buildfile $buildfile -projecthelp |
-          while read target desc
+        tmp=(${(f@)"$(_call_program targets "$words[1]" -buildfile $buildfile -projecthelp |
+          while read -r target desc
           do
             # This loop reads ant -projecthelp output from versions 1.3 to 1.6
             ln="${target}${desc:+:$desc}"
@@ -122,17 +123,18 @@ case $state in
                         read default_target junk
                     fi
                     # Output target again indicating its the default one.
-                    print -n "'${default_target}:(Default target) ' "
+                    print -- "${default_target}:(Default target)"
                 ;;
                 (Searching:*|Main:targets:|Subtargets:|BUILD:SUCCESSFUL|Total:time:*)
                 ;;
                 (*)
                     # Return target and description
-                    print -n "'$ln' "
+                    print -- "$ln"
                 ;;
             esac
           done
-        )//$'\015'}"
+        )"//$'\015'})
+
         _describe 'target' tmp && ret=0
       else
         targets=( $(find_targets $buildfile) )



[-- Attachment #2: Type: text/html, Size: 5406 bytes --]