feat(_comp_compgen_filedir): automatically add "-f"

Author: akinomyoga

bash_completion

@@ -791,6 +791,8 @@ _comp_compgen__call_generator()
     local _comp_compgen__append=$_append
     local _comp_compgen__var=$_var
     local _comp_compgen__cur=$_cur cur=$_cur
+    local _comp_compgen__dir=$_dir
+    local _comp_compgen__prefix=$_prefix
     if [[ $_prefix ]]; then
         local -a tmp=()
         local _comp_compgen__var=tmp
@@ -1287,10 +1289,7 @@ _comp_quote_compgen()
 # OPTIONS
 #   -d      Complete only on directories
 #   -f      Perform `compopt -o filenames` modifications manually.  This
-#           suffixes a slash to a directory name.  This can be combined with
-#           the `-C dir` option to `_comp_compgen`, where the generated
-#           filenames do not exist in the current working directory and Bash
-#           fails to properly detect the filenames.
+#           suffixes a slash to a directory name.
 # @return 0 if at least one completion is generated, or 1 otherwise.
 #
 # @since 2.12
@@ -1300,6 +1299,19 @@ _comp_compgen_filedir()
 
     local -a toks
     local _dir="" _filenames=""
+    if [[ ${_comp_compgen__dir-} || ${_comp_compgen__prefix-} ]]; then
+        # When "-C <dir>" or "-P <prefix>" is specified, the working directory
+        # does not contain the generated candidates as filenames.  In the case
+        # of "-C <dir>", the generated filenames are located in the directory
+        # "<dir>" but not in the working directory.  In the case of "-P
+        # <prefix>", candidates have the form "<prefix><filename>".  In those
+        # cases, Bash fails to recognize the generated candidates to be
+        # filenames, and Bash does not adjust these as filenames.  We
+        # automatically detect such cases and modify the generated filenames as
+        # if the option "-f" is passed.
+        _filenames=set
+    fi
+
     local OPTIND=1 OPTARG="" OPTERR=0 _opt
     while getopts ":df" _opt "$@"; do
         case $_opt in

completions-core/curl.bash

@@ -55,10 +55,6 @@ _comp_cmd_curl()
             if [[ $cur == \@* ]]; then
                 _comp_compgen -P @ filedir
                 _comp_compgen -aP @ -- -W '-'
-                if [[ ${#COMPREPLY[@]} -eq 1 && -d ${COMPREPLY[0]#@} ]]; then
-                    COMPREPLY[0]+=/
-                    compopt -o nospace
-                fi
             fi
             return
             ;;

completions-core/removepkg.bash

@@ -15,7 +15,7 @@ _comp_cmd_removepkg()
     fi
 
     local root=${ROOT:-/}
-    _comp_compgen -C "$root/var/log/packages" filedir -f
+    _comp_compgen -C "$root/var/log/packages" filedir
 } &&
     complete -F _comp_cmd_removepkg removepkg
 

completions-core/sbopkg.bash

@@ -64,7 +64,7 @@ _comp_cmd_sbopkg()
     _comp_compgen_split -l -- "$(command sed -ne "s/^SLACKBUILD NAME: //p" \
         "$file")"
     if [[ -d ${QUEUEDIR-} ]]; then
-        _comp_compgen -aC "$QUEUEDIR" filedir -f sqf
+        _comp_compgen -aC "$QUEUEDIR" filedir sqf
     fi
 } &&
     complete -F _comp_cmd_sbopkg sbopkg

completions-core/slapt-get.bash

@@ -74,7 +74,7 @@ _comp_cmd_slapt_get()
             return
             ;;
         ins) # --remove|--filelist
-            _comp_compgen -C /var/log/packages filedir -f
+            _comp_compgen -C /var/log/packages filedir
             return
             ;;
         set) # --install-set

completions-fallback/mount.linux.bash

@@ -32,11 +32,11 @@ _comp_cmd_mount()
             return
             ;;
         -L)
-            _comp_compgen -C "/dev/disk/by-label/" filedir -f
+            _comp_compgen -C "/dev/disk/by-label/" filedir
             return
             ;;
         -U)
-            _comp_compgen -C "/dev/disk/by-uuid/" filedir -f
+            _comp_compgen -C "/dev/disk/by-uuid/" filedir
             return
             ;;
         -O | --test-opts)

completions-fallback/slackpkg.bash

@@ -65,7 +65,7 @@ _comp_cmd_slackpkg()
             ;;
         install-template | remove-template)
             if [[ -e $confdir/templates ]]; then
-                _comp_compgen -C "$confdir/templates" filedir -f template &&
+                _comp_compgen -C "$confdir/templates" filedir template &&
                     COMPREPLY=("${COMPREPLY[@]%.template}")
             fi
             return
@@ -74,7 +74,7 @@ _comp_cmd_slackpkg()
             _comp_compgen_filedir
             _comp_compgen -a -- -W 'a ap d e f k kde kdei l n t tcl x xap xfce
                 y'
-            _comp_compgen -aC /var/log/packages filedir -f
+            _comp_compgen -aC /var/log/packages filedir
             return
             ;;
         install | reinstall | upgrade | blacklist | download)

test/t/unit/test_unit_compgen.py

@@ -127,7 +127,14 @@ def test_6_option_C_1(self, bash, functions):
             want_output=True,
         )
         set1 = set(re.findall(r"<[^<>]*>", output.strip()))
-        assert set1 == {"<a b>", "<a$b>", "<a&b>", "<a'b>", "<ab>", "<aé>"}
+        assert set1 == {
+            "<a b/>",
+            "<a$b/>",
+            "<a&b/>",
+            "<a'b/>",
+            "<ab/>",
+            "<aé/>",
+        }
 
     def test_6_option_C_2(self, bash, functions):
         output = assert_bash_exec(
@@ -146,7 +153,7 @@ def test_6_option_C_3(self, bash, functions, funcname):
     def test_6_option_C_4(self, functions, completion):
         # Note: we are not in the original directory that "b" exists, so Bash
         # will not suffix a slash to the directory name.
-        assert completion == "b"
+        assert completion == "b/"
 
     @pytest.mark.complete(r"fb nonexistent")
     def test_6_option_C_5(self, bash, functions, completion):

test/t/unit/test_unit_compgen_filedir.py

@@ -34,7 +34,7 @@ def functions(self, request, bash):
         )
         assert_bash_exec(
             bash,
-            "_fcd() { local cur=$(_get_cword); unset -v COMPREPLY; _comp_compgen -C _filedir filedir -df; };"
+            "_fcd() { local cur=$(_get_cword); unset -v COMPREPLY; _comp_compgen -C _filedir filedir -d; };"
             "complete -F _fcd fcd",
         )