refactor: rename _comp{ => _{complete,compgen}}_filedir_xspec

Author: akinomyoga

bash_completion

@@ -2834,12 +2834,17 @@ complete -F _comp_complete_longopt \
 
 declare -Ag _xspecs
 
-# TODO:API: rename per conventions
-_filedir_xspec()
+# @since 2.12
+_comp_complete_filedir_xspec()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
+    _comp_compgen_filedir_xspec "$1"
+}
 
+# @since 2.12
+_comp_compgen_filedir_xspec()
+{
     _comp_compgen_tilde && return
 
     local ret
@@ -2868,10 +2873,10 @@ _filedir_xspec()
         ${#toks[@]} -lt 1 ]] &&
         _comp_compgen -av toks -c "$quoted" -- -f
 
-    if ((${#toks[@]} != 0)); then
-        compopt -o filenames
-        COMPREPLY=("${toks[@]}")
-    fi
+    ((${#toks[@]})) || return 1
+
+    compopt -o filenames
+    _comp_compgen -RU toks -- -W '"${toks[@]}"'
 }
 
 # TODO:API: rename per conventions
@@ -3064,7 +3069,7 @@ __load_completion()
 
     # Look up simple "xspec" completions
     [[ -v _xspecs[$cmdname] ]] &&
-        complete -F _filedir_xspec "$cmdname" "$backslash$cmdname" && return 0
+        complete -F _comp_complete_filedir_xspec "$cmdname" "$backslash$cmdname" && return 0
 
     return 1
 }

bash_completion.d/000_bash_completion_compat.bash

@@ -32,6 +32,7 @@ _comp_deprecate_func 2.12 _service _comp_complete_service
 _comp_deprecate_func 2.12 _user_at_host _comp_complete_user_at_host
 _comp_deprecate_func 2.12 _known_hosts _comp_complete_known_hosts
 _comp_deprecate_func 2.12 _longopt _comp_complete_longopt
+_comp_deprecate_func 2.12 _filedir_xspec _comp_complete_filedir_xspec
 
 # Backwards compatibility for compat completions that use have().
 # @deprecated 1.90 should no longer be used; generally not needed with

completions/7z

@@ -87,7 +87,7 @@ _comp_cmd_7z()
     local args
     _count_args "="
     if ((args == 2)); then
-        _filedir_xspec unzip "${@:2}"
+        _comp_compgen_filedir_xspec unzip
         # TODO: parsing 7z i output?
         # - how to figure out if the format is input or output?
         # - find string Formats:, read until next empty line

completions/file-roller

@@ -18,7 +18,7 @@ _comp_cmd_file_roller()
             return
             ;;
         --add-to | -${noargopts}a)
-            _filedir_xspec unzip "${@:2}"
+            _comp_compgen_filedir_xspec unzip
             _comp_compgen -a filedir "$exts"
             return
             ;;
@@ -36,7 +36,7 @@ _comp_cmd_file_roller()
         return
     fi
 
-    _filedir_xspec unzip "${@:2}"
+    _comp_compgen_filedir_xspec unzip
     _comp_compgen -a filedir "$exts"
 } &&
     complete -F _comp_cmd_file_roller file-roller

completions/jar

@@ -15,7 +15,7 @@ _comp_cmd_jar()
             _comp_compgen_filedir
             ;;
         *f)
-            _filedir_xspec unzip "${@:2}"
+            _comp_compgen_filedir_xspec unzip
             ;;
         *)
             _comp_compgen_filedir