feat(_comp_compgen_commands): auto set -o filenames when appropriate

scop · Jun 1, 2023 · 4d4839e · 4d4839e
1 parent faab292
commit 4d4839e
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 20 deletions.
diff --git a/bash_completion b/bash_completion
@@ -2709,6 +2709,8 @@ _comp_compgen_commands()
 {
     [[ ! ${cur-} ]] && shopt -q no_empty_cmd_completion && return
     _comp_compgen -- -c
+    # for e.g. spaces in paths to and in command names
+    ((${#COMPREPLY[@]} == 0)) || compopt -o filenames
 }
 
 # @since 2.12

diff --git a/completions/_svn b/completions/_svn
@@ -38,7 +38,6 @@ _comp_cmd_svn()
                 return
                 ;;
             --editor-cmd | --diff-cmd | --diff3-cmd)
-                compopt -o filenames
                 _comp_compgen_commands
                 return
                 ;;

diff --git a/completions/cpio b/completions/cpio
@@ -22,7 +22,6 @@ _comp_cmd_cpio()
             return
             ;;
         --rsh-command)
-            compopt -o filenames
             _comp_compgen_commands
             return
             ;;

diff --git a/completions/fio b/completions/fio
@@ -74,7 +74,6 @@ _comp_cmd_fio()
             return
             ;;
         --trigger | --trigger-remote)
-            compopt -o filenames
             _comp_compgen_commands
             return
             ;;

diff --git a/completions/man b/completions/man
@@ -29,7 +29,6 @@ _comp_cmd_man()
             return
             ;;
         --pager | -${noargopts}P)
-            compopt -o filenames
             _comp_compgen_commands
             return
             ;;

diff --git a/completions/perlcritic b/completions/perlcritic
@@ -31,7 +31,6 @@ _comp_cmd_perlcritic()
             return
             ;;
         --pager)
-            compopt -o filenames
             _comp_compgen_commands
             return
             ;;

diff --git a/completions/protoc b/completions/protoc
@@ -18,10 +18,7 @@ _comp_cmd_protoc()
             return
             ;;
         --plugin)
-            if [[ $cur != *=* ]]; then
-                compopt -o filenames
-                _comp_compgen_commands
-            fi
+            [[ $cur == *=* ]] || _comp_compgen_commands
             return
             ;;
         --proto_path | --*_out)

diff --git a/completions/querybts b/completions/querybts
@@ -17,7 +17,6 @@ _comp_cmd_querybts()
             return
             ;;
         --mbox-reader-cmd)
-            compopt -o filenames
             _comp_compgen_commands
             return
             ;;

diff --git a/completions/reportbug b/completions/reportbug
@@ -37,7 +37,6 @@ _comp_cmd_reportbug()
             return
             ;;
         --editor | --mua | --mbox-reader-cmd | -${noargopts}e)
-            compopt -o filenames
             _comp_compgen_commands
             return
             ;;

diff --git a/completions/rpm b/completions/rpm
@@ -89,7 +89,6 @@ _comp_cmd_rpm()
             return
             ;;
         --pipe)
-            compopt -o filenames
             _comp_compgen_commands
             return
             ;;

diff --git a/completions/sqlite3 b/completions/sqlite3
@@ -17,7 +17,6 @@ _comp_cmd_sqlite3()
             return
             ;;
         -cmd)
-            compopt -o filenames
             _comp_compgen_commands
             return
             ;;

diff --git a/completions/ssh b/completions/ssh
@@ -424,7 +424,6 @@ _comp_cmd_sftp()
             return
             ;;
         -*S)
-            compopt -o filenames
             _comp_compgen_commands
             return
             ;;
@@ -574,7 +573,7 @@ _comp_cmd_scp()
             return
             ;;
         -*S)
-            compopt +o nospace -o filenames
+            compopt +o nospace
             _comp_compgen_commands
             return
             ;;

diff --git a/completions/tar b/completions/tar
@@ -560,7 +560,6 @@ _comp_cmd_tar__gnu()
             --to-command | --info-script | --new-volume-script | \
                 --rmt-command | --rsh-command | --use-compress-program | \
                 -${noargopts}[FI])
-                compopt -o filenames
                 _comp_compgen_commands
                 break
                 ;;

diff --git a/completions/tcpdump b/completions/tcpdump
@@ -26,7 +26,6 @@ _comp_cmd_tcpdump()
             return
             ;;
         -${noargopts}z)
-            compopt -o filenames
             _comp_compgen_commands
             return
             ;;

diff --git a/completions/valgrind b/completions/valgrind
@@ -81,7 +81,6 @@ _comp_cmd_valgrind()
                     return
                     ;;
                 \<command\>)
-                    compopt -o filenames
                     _comp_compgen_commands
                     return
                     ;;

diff --git a/completions/vpnc b/completions/vpnc
@@ -53,7 +53,6 @@ _vpnc()
             return
             ;;
         --password-helper)
-            compopt -o filenames
             _comp_compgen_commands
             return
             ;;

diff --git a/test/t/unit/test_unit_compgen_commands.py b/test/t/unit/test_unit_compgen_commands.py
@@ -1,6 +1,6 @@
 import pytest
 
-from conftest import assert_bash_exec, bash_env_saved
+from conftest import assert_bash_exec, assert_complete, bash_env_saved
 
 
 @pytest.mark.bashcomp(cmd=None, ignore_env=r"^\+COMPREPLY=")
@@ -15,6 +15,15 @@ def functions(self, request, bash):
             r'    printf "%s\n" "${COMPREPLY[@]}";'
             r"}",
         )
+        assert_bash_exec(
+            bash,
+            "_comp_cmd_ccc() {"
+            "    local cur;"
+            "    _comp_get_words cur;"
+            "     unset -v COMPREPLY;"
+            "    _comp_compgen_commands;"
+            "}; complete -F _comp_cmd_ccc ccc",
+        )
 
     def test_basic(self, bash, functions):
         output = assert_bash_exec(
@@ -32,3 +41,7 @@ def test_empty(self, bash, functions, shopt_no_empty, result_empty):
                 bash, "_comp_compgen_commands__test", want_output=True
             )
         assert (output.strip() == "") == result_empty
+
+    def test_spaces(self, bash, functions):
+        completion = assert_complete(bash, "ccc shared/default/bar")
+        assert completion == r"\ bar.d/"