scp, sftp, ssh: fix completion on options bundled with -4/-6

scop · May 23, 2020 · b4490f2 · b4490f2
1 parent 50ad3f8
commit b4490f2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/completions/ssh b/completions/ssh
@@ -252,12 +252,6 @@ _ssh()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*b)
             _ip_addresses
             return
@@ -309,6 +303,12 @@ _ssh()
             _available_interfaces
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
     if [[ $cur == -F* ]]; then
@@ -347,12 +347,6 @@ _sftp()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*[BDlPRs])
             return
             ;;
@@ -381,6 +375,12 @@ _sftp()
             COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
     if [[ $cur == -F* ]]; then
@@ -484,12 +484,6 @@ _scp()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*c)
             _ssh_ciphers
             COMPREPLY=("${COMPREPLY[@]/%/ }")
@@ -521,6 +515,12 @@ _scp()
             COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
     _expand || return

diff --git a/test/t/test_ssh.py b/test/t/test_ssh.py
@@ -50,3 +50,8 @@ def test_partial_hostname(self, bash, known_hosts):
         first_char, partial_hosts = partialize(bash, known_hosts)
         completion = assert_complete(bash, "ssh %s" % first_char)
         assert completion == partial_hosts
+
+    @pytest.mark.parametrize("protocol", "4 6 9".split())
+    def test_protocol_option_bundling(self, bash, protocol):
+        completion = assert_complete(bash, "ssh -%sF ssh/" % protocol)
+        assert "config" in completion