refactor: rename { => _comp_compgen}_filedir

Author: akinomyoga

bash_completion

@@ -828,8 +828,7 @@ _comp_quote_compgen()
 #            completions with `.$1' and the uppercase version of it as file
 #            extension.
 #
-# TODO: rename per API conventions
-_filedir()
+_comp_compgen_filedir()
 {
     _tilde "${cur-}" || return
 
@@ -867,11 +866,11 @@ _filedir()
     fi
 
     if ((${#toks[@]} != 0)); then
-        # 2>/dev/null for direct invocation, e.g. in the _filedir unit test
+        # 2>/dev/null for direct invocation, e.g. in the _comp_compgen_filedir unit test
         compopt -o filenames 2>/dev/null
-        COMPREPLY+=("${toks[@]}")
+        _comp_compgen -R -- -W '"${toks[@]}"'
     fi
-} # _filedir()
+} # _comp_compgen_filedir()
 
 # This function splits $cur=--foo=bar into $prev=--foo, $cur=bar, making it
 # easier to support both "--foo bar" and "--foo=bar" style completions.

bash_completion.d/000_bash_completion_compat.bash

@@ -258,4 +258,10 @@ _command_offset()
     _comp_command_offset "$@"
 }
 
+# @deprecated Use `_comp_compgen -a filedir`
+_filedir()
+{
+    _comp_compgen -a filedir "$@"
+}
+
 # ex: filetype=sh

test/t/unit/test_unit_filedir.py

@@ -15,18 +15,18 @@ class TestUnitFiledir:
     def functions(self, request, bash):
         assert_bash_exec(
             bash,
-            "_f() { local cur;_comp_get_words cur; unset -v COMPREPLY; _filedir; }; "
+            "_f() { local cur;_comp_get_words cur; unset -v COMPREPLY; _comp_compgen_filedir; }; "
             "complete -F _f f; "
             "complete -F _f -o filenames f2",
         )
         assert_bash_exec(
             bash,
-            "_g() { local cur;_comp_get_words cur; unset -v COMPREPLY; _filedir e1; }; "
+            "_g() { local cur;_comp_get_words cur; unset -v COMPREPLY; _comp_compgen_filedir e1; }; "
             "complete -F _g g",
         )
         assert_bash_exec(
             bash,
-            "_fd() { local cur;_comp_get_words cur; unset -v COMPREPLY; _filedir -d; };"
+            "_fd() { local cur;_comp_get_words cur; unset -v COMPREPLY; _comp_compgen_filedir -d; };"
             "complete -F _fd fd",
         )
 
@@ -59,7 +59,7 @@ def utf8_ctype(self, bash):
         return lc_ctype
 
     def test_1(self, bash):
-        assert_bash_exec(bash, "_filedir >/dev/null")
+        assert_bash_exec(bash, "_comp_compgen_filedir >/dev/null")
 
     @pytest.mark.parametrize("funcname", "f f2".split())
     def test_2(self, bash, functions, funcname):

test/t/unit/test_unit_quote_compgen.py

@@ -116,9 +116,9 @@ def test_github_issue_492_2(self, bash, functions):
     def test_github_issue_492_3(self, bash, functions):
         """Test code execution through unintended pathname expansions
 
-        When there is a file named "quote=$(COMMAND)" (for _filedir) or
-        "ret=$(COMMAND)" (for _comp_quote_compgen), the completion of the word
-        '$* results in the execution of COMMAND.
+        When there is a file named "quote=$(COMMAND)" (for
+        _comp_compgen_filedir) or "ret=$(COMMAND)" (for _comp_quote_compgen),
+        the completion of the word '$* results in the execution of COMMAND.
 
           $ echo '$*[TAB]