refactor: use _comp_split [to be merged into failglob-1 after processing scop#870]

Author: akinomyoga

bash_completion

@@ -721,20 +721,13 @@ _comp_quote_compgen()
 #
 _filedir()
 {
-    local IFS=$'\n'
-
     _tilde "${cur-}" || return
 
     local -a toks
-    local reset arg=${1-}
+    local arg=${1-}
 
     if [[ $arg == -d ]]; then
-        reset=$(shopt -po noglob)
-        set -o noglob
-        toks=($(compgen -d -- "${cur-}"))
-        IFS=' '
-        $reset
-        IFS=$'\n'
+        _comp_compgen toks -d -- "${cur-}"
     else
         local ret
         _comp_quote_compgen "${cur-}"
@@ -755,23 +748,12 @@ _filedir()
             ! ${plusdirs-} ]] ||
             opts+=("${plusdirs[@]}")
 
-        reset=$(shopt -po noglob)
-        set -o noglob
-        toks+=($(compgen "${opts[@]}" -- "$quoted"))
-        IFS=' '
-        $reset
-        IFS=$'\n'
+        _comp_compgen toks "${opts[@]}" -- "$quoted"
 
         # Try without filter if it failed to produce anything and configured to
         [[ ${BASH_COMPLETION_FILEDIR_FALLBACK-${COMP_FILEDIR_FALLBACK-}} &&
-            $arg && ${#toks[@]} -lt 1 ]] && {
-            reset=$(shopt -po noglob)
-            set -o noglob
-            toks+=($(compgen -f ${plusdirs+"${plusdirs[@]}"} -- "$quoted"))
-            IFS=' '
-            $reset
-            IFS=$'\n'
-        }
+            $arg && ${#toks[@]} -lt 1 ]] &&
+            _comp_compgen -a toks -f ${plusdirs+"${plusdirs[@]}"} -- "$quoted"
     fi
 
     if ((${#toks[@]} != 0)); then
@@ -826,12 +808,8 @@ _variables()
         return 0
     elif [[ $cur =~ ^(\$\{[#!]?)([A-Za-z0-9_]*)\[([^]]*)$ ]]; then
         # Complete ${array[i with ${array[idx]}
-        local reset=$(shopt -po noglob) IFS=$'\n'
-        set -o noglob
-        COMPREPLY+=($(compgen -W '$(printf %s\\n "${!'"${BASH_REMATCH[2]}"'[@]}")' \
-            -P "${BASH_REMATCH[1]}${BASH_REMATCH[2]}[" -S ']}' -- "${BASH_REMATCH[3]}"))
-        IFS=$' \t\n'
-        $reset
+        _comp_compgen -a COMPREPLY -W '"${!'"${BASH_REMATCH[2]}"'[@]}"' \
+            -P "${BASH_REMATCH[1]}${BASH_REMATCH[2]}[" -S ']}' -- "${BASH_REMATCH[3]}"
         # Complete ${arr[@ and ${arr[*
         if [[ ${BASH_REMATCH[3]} == [@*] ]]; then
             COMPREPLY+=("${BASH_REMATCH[1]}${BASH_REMATCH[2]}[${BASH_REMATCH[3]}]}")
@@ -1057,28 +1035,27 @@ _comp_initialize()
 # @return True (0) if an option was found, False (> 0) otherwise
 __parse_options()
 {
-    local option option2 i IFS=$' \t\n,/|'
+    local option option2 i
 
     # Take first found long option, or first one (short) if not found.
     option=
-    local reset=$(shopt -po noglob)
-    set -o noglob
-    local -a array=($1)
-    $reset
-    for i in "${array[@]}"; do
-        case "$i" in
-            ---*) break ;;
-            --?*)
-                option=$i
-                break
-                ;;
-            -?*) [[ $option ]] || option=$i ;;
-            *) break ;;
-        esac
-    done
+    local -a array
+    if _comp_split -F $' \t\n,/|' array "$1"; then
+        for i in "${array[@]}"; do
+            case "$i" in
+                ---*) break ;;
+                --?*)
+                    option=$i
+                    break
+                    ;;
+                -?*) [[ $option ]] || option=$i ;;
+                *) break ;;
+            esac
+        done
+    fi
     [[ $option ]] || return 1
 
-    IFS=$' \t\n' # affects parsing of the regexps below...
+    local IFS=$' \t\n' # affects parsing of the regexps below...
 
     # Expand --[no]foo to --foo and --nofoo etc
     if [[ $option =~ (\[((no|dont)-?)\]). ]]; then
@@ -1335,12 +1312,13 @@ _tilde()
     local result=0
     if [[ ${1-} == \~* && $1 != */* ]]; then
         # Try generate ~username completions
-        COMPREPLY=($(compgen -P '~' -u -- "${1#\~}"))
-        result=${#COMPREPLY[@]}
-        # 2>/dev/null for direct invocation, e.g. in the _tilde unit test
-        ((result > 0)) && compopt -o filenames 2>/dev/null
+        if _comp_compgen COMPREPLY -P '~' -u -- "${1#\~}"; then
+            # 2>/dev/null for direct invocation, e.g. in the _tilde unit test
+            compopt -o filenames 2>/dev/null
+            return 1
+        fi
     fi
-    return "$((result > 0 ? 1 : 0))"
+    return 0
 }
 
 # Expand variable starting with tilde (~)
@@ -1879,12 +1857,10 @@ _included_ssh_config_files()
     local configfile i files f
     configfile=$1
 
-    local IFS=$' \t\n' reset=$(shopt -po noglob)
-    set -o noglob
-    local included=($(command sed -ne 's/^[[:blank:]]*[Ii][Nn][Cc][Ll][Uu][Dd][Ee][[:blank:]]\(.*\)$/\1/p' "${configfile}"))
-    $reset
+    local -a included
+    _comp_split included "$(command sed -ne 's/^[[:blank:]]*[Ii][Nn][Cc][Ll][Uu][Dd][Ee][[:blank:]]\(.*\)$/\1/p' "${configfile}")"
+    ((${#included[@]})) || return
 
-    [[ ${included-} ]] || return
     for i in "${included[@]}"; do
         # Check the origin of $configfile to complete relative included paths on included
         # files according to ssh_config(5):
@@ -2419,16 +2395,9 @@ _filedir_xspec()
     _comp_quote_compgen "$cur"
     local quoted=$ret
 
-    local IFS=$'\n' xspec=${_xspecs[${1##*/}]} tmp
+    local xspec=${_xspecs[${1##*/}]} tmp
     local -a toks
-
-    toks=($(
-        compgen -d -- "$quoted" | {
-            while read -r tmp; do
-                printf '%s\n' "$tmp"
-            done
-        }
-    ))
+    _comp_compgen toks -d -- "$quoted"
 
     # Munge xspec to contain uppercase version too
     # https://lists.gnu.org/archive/html/bug-bash/2010-09/msg00036.html
@@ -2441,24 +2410,12 @@ _filedir_xspec()
     fi
     xspec="$matchop($xspec|${xspec^^})"
 
-    toks+=($(
-        eval compgen -f -X "'!$xspec'" -- '$quoted' | {
-            while read -r tmp; do
-                [[ $tmp ]] && printf '%s\n' "$tmp"
-            done
-        }
-    ))
+    _comp_compgen -a toks -f -X "@(|!($xspec))" -- "$quoted"
 
     # Try without filter if it failed to produce anything and configured to
     [[ ${BASH_COMPLETION_FILEDIR_FALLBACK-${COMP_FILEDIR_FALLBACK-}} &&
-        ${#toks[@]} -lt 1 ]] && {
-        local reset=$(shopt -po noglob)
-        set -o noglob
-        toks+=($(compgen -f -- "$quoted"))
-        IFS=' '
-        $reset
-        IFS=$'\n'
-    }
+        ${#toks[@]} -lt 1 ]] &&
+        _comp_compgen -a toks -f -- "$quoted"
 
     if ((${#toks[@]} != 0)); then
         compopt -o filenames