Merge pull request #964 from akinomyoga/filedir

style(_comp_compgen): call `_comp_compgen_filedir` directly

Author: scop

bash_completion

@@ -437,6 +437,11 @@ _comp_split()
 #   [-alR|-v arr|-c cur] to the child calls of `_comp_compgen` in
 #   `_comp_compgen_NAME`.
 #
+# @remarks When no options are supplied to _comp_compgen, `_comp_compgen NAME
+# args` is equivalent to the direct call `_comp_compgen_NAME args`.  As the
+# direct call is slightly more efficient, the direct call is preferred over
+# calling it through `_comp_compgen`.
+#
 # @remarks Design `_comp_compgen_NAME`: a function that produce completions can
 # be defined with the name _comp_compgen_NAME.  The function is supposed to
 # generate completions by calling `_comp_compgen`.  To reflect the options
@@ -853,47 +858,52 @@ _comp_compgen_filedir()
     _comp_compgen_tilde && return
 
     local -a toks
-    local arg=${1-}
+    local _arg=${1-}
 
-    if [[ $arg == -d ]]; then
+    if [[ $_arg == -d ]]; then
         _comp_compgen -v toks -- -d
     else
         local ret
         _comp_quote_compgen "${cur-}"
-        local quoted=$ret
+        local _quoted=$ret
+        _comp_unlocal ret
 
         # Munge xspec to contain uppercase version too
         # https://lists.gnu.org/archive/html/bug-bash/2010-09/msg00036.html
         # news://news.gmane.io/4C940E1C.1010304@case.edu
-        local xspec=${arg:+"!*.@($arg|${arg^^})"} plusdirs=()
+        local _xspec=${_arg:+"!*.@($_arg|${_arg^^})"} _plusdirs=()
 
         # Use plusdirs to get dir completions if we have a xspec; if we don't,
         # there's no need, dirs come along with other completions. Don't use
         # plusdirs quite yet if fallback is in use though, in order to not ruin
         # the fallback condition with the "plus" dirs.
-        local opts=(-f -X "$xspec")
-        [[ $xspec ]] && plusdirs=(-o plusdirs)
+        local _opts=(-f -X "$_xspec")
+        [[ $_xspec ]] && _plusdirs=(-o plusdirs)
         [[ ${BASH_COMPLETION_FILEDIR_FALLBACK-${COMP_FILEDIR_FALLBACK-}} ||
-            ! ${plusdirs-} ]] ||
-            opts+=("${plusdirs[@]}")
+            ! ${_plusdirs-} ]] ||
+            _opts+=("${_plusdirs[@]}")
 
-        _comp_compgen -v toks -c "$quoted" -- "${opts[@]}"
+        _comp_compgen -v toks -c "$_quoted" -- "${_opts[@]}"
 
         # Try without filter if it failed to produce anything and configured to
         [[ ${BASH_COMPLETION_FILEDIR_FALLBACK-${COMP_FILEDIR_FALLBACK-}} &&
-            $arg && ${#toks[@]} -lt 1 ]] &&
-            _comp_compgen -av toks -c "$quoted" -- -f ${plusdirs+"${plusdirs[@]}"}
+            $_arg && ${#toks[@]} -lt 1 ]] &&
+            _comp_compgen -av toks -c "$_quoted" -- \
+                -f ${_plusdirs+"${_plusdirs[@]}"}
     fi
 
     if ((${#toks[@]} != 0)); then
-        # 2>/dev/null for direct invocation, e.g. in the _comp_compgen_filedir unit test
+        # 2>/dev/null for direct invocation, e.g. in the _comp_compgen_filedir
+        # unit test
         compopt -o filenames 2>/dev/null
     fi
 
     # Note: bash < 4.4 has a bug that all the elements are connected with
     # ${v-"${a[@]}"} when IFS does not contain whitespace.
     local IFS=$' \t\n'
-    _comp_compgen_set ${toks[@]+"${toks[@]}"}
+    local -a _tmp=(${toks[@]+"${toks[@]}"})
+    _comp_unlocal toks
+    _comp_compgen_set ${_tmp[@]+"${_tmp[@]}"}
 } # _comp_compgen_filedir()
 
 # This function splits $cur=--foo=bar into $prev=--foo, $cur=bar, making it
@@ -1154,7 +1164,7 @@ _comp_initialize()
                 ;;
         esac
         cur=${cur##"$redir"}
-        _comp_compgen filedir "$xspec"
+        _comp_compgen_filedir "$xspec"
         return 1
     fi
 

completions/2to3

@@ -19,7 +19,7 @@ _comp_cmd_2to3()
             return
             ;;
         -o | --output-dir)
-            _comp_compgen filedir -d
+            _comp_compgen_filedir -d
             return
             ;;
     esac
@@ -32,7 +32,7 @@ _comp_cmd_2to3()
         return
     fi
 
-    _comp_compgen filedir py
+    _comp_compgen_filedir py
 } &&
     complete -F _comp_cmd_2to3 2to3
 

completions/7z

@@ -119,7 +119,7 @@ _comp_cmd_7z()
                 2>/dev/null | tail -n+2)")" -- "$cur"))
             compopt -o filenames
         else
-            _comp_compgen filedir
+            _comp_compgen_filedir
         fi
     fi
 } &&

completions/_adb

@@ -20,7 +20,7 @@ _comp_cmd_adb()
             return
             ;;
         -f)
-            _comp_compgen filedir
+            _comp_compgen_filedir
             return
             ;;
     esac

completions/_chsh

@@ -22,7 +22,7 @@ _comp_cmd_chsh()
             return
             ;;
         -R | --root)
-            _comp_compgen filedir -d
+            _comp_compgen_filedir -d
             return
             ;;
         -s | --shell)

completions/_hexdump

@@ -13,7 +13,7 @@ _comp_cmd_hexdump()
             return
             ;;
         -f)
-            _comp_compgen filedir
+            _comp_compgen_filedir
             return
             ;;
     esac
@@ -25,7 +25,7 @@ _comp_cmd_hexdump()
         return
     fi
 
-    _comp_compgen filedir
+    _comp_compgen_filedir
 } &&
     complete -F _comp_cmd_hexdump hexdump hd
 

completions/_hwclock

@@ -13,7 +13,7 @@ _comp_cmd_hwclock()
             return
             ;;
         -f | --rtc | --adjfile)
-            _comp_compgen filedir
+            _comp_compgen_filedir
             return
             ;;
     esac

completions/_mock

@@ -32,11 +32,11 @@ _comp_cmd_mock()
             return
             ;;
         --configdir | --resultdir)
-            _comp_compgen filedir -d
+            _comp_compgen_filedir -d
             return
             ;;
         --spec)
-            _comp_compgen filedir spec
+            _comp_compgen_filedir spec
             return
             ;;
         --target)
@@ -61,7 +61,7 @@ _comp_cmd_mock()
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
-        _comp_compgen filedir '@(?(no)src.r|s)pm'
+        _comp_compgen_filedir '@(?(no)src.r|s)pm'
     fi
 } &&
     complete -F _comp_cmd_mock mock

completions/_mount.linux

@@ -28,7 +28,7 @@ _comp_cmd_mount()
             return
             ;;
         --bind | -B | --rbind | -R)
-            _comp_compgen filedir -d
+            _comp_compgen_filedir -d
             return
             ;;
         -p | --pass-fd)

completions/_repomanage

@@ -16,7 +16,7 @@ _comp_cmd_repomanage()
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
-        _comp_compgen filedir -d
+        _comp_compgen_filedir -d
     fi
 } &&
     complete -F _comp_cmd_repomanage repomanage