Use single-quotes by default to complete fqcn and fix empty input in completion

GromNaN · GromNaN · commit 56a74edcd7c6 · 2021-10-29T22:22:04.000+02:00
diff --git a/src/Symfony/Component/Console/Resources/completion.bash b/src/Symfony/Component/Console/Resources/completion.bash
@@ -19,32 +19,43 @@ _sf_{{ COMMAND_NAME }}() {
     local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S{{ VERSION }}")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
-        # remove quotes
+        # remove quotes from typed values
         quote="${w:0:1}"
-        if [ "$quote" == "'" ]; then
+        if [ "$quote" == \' ]; then
             w="${w%\'}"
             w="${w#\'}"
-        elif [ "$quote" == '"' ]; then
+        elif [ "$quote" == \" ]; then
             w="${w%\"}"
             w="${w#\"}"
         fi
-        completecmd+=("-i$w")
+        # empty values are ignored
+        if [ ! -z "$w" ]; then
+            completecmd+=("-i$w")
+        fi
     done
 
     local sfcomplete
     if sfcomplete=$(${completecmd[@]} 2>&1); then
         local quote suggestions
         quote=${cur:0:1}
-        if [ "$quote" == "'" ]; then
+
+        # Use single quotes by default if suggestions contains backslash (FQCN)
+        if [ "$quote" == '' ] && [[ "$sfcomplete" =~ \\ ]]; then
+            quote=\'
+        fi
+
+        if [ "$quote" == \' ]; then
             # single quotes: no additional escaping (does not accept ' in values)
             suggestions=$(for s in $sfcomplete; do printf $'%q%q%q\n' "$quote" "$s" "$quote"; done)
-        elif [ "$quote" == '"' ]; then
+        elif [ "$quote" == \" ]; then
             # double quotes: double escaping for \ $ ` "
-            s=${s//\\/\\\\}
-            s=${s//\$/\\\$}
-            s=${s//\`/\\\`}
-            s=${s//\"/\\\"}
-            suggestions=$(for s in $sfcomplete; do printf $'%q%q%q\n' "$quote" "$s" "$quote"; done)
+            suggestions=$(for s in $sfcomplete; do
+                s=${s//\\/\\\\}
+                s=${s//\$/\\\$}
+                s=${s//\`/\\\`}
+                s=${s//\"/\\\"}
+                printf $'%q%q%q\n' "$quote" "$s" "$quote";
+            done)
         else
             # no quotes: double escaping
             suggestions=$(for s in $sfcomplete; do printf $'%q\n' $(printf '%q' "$s"); done)
