*: Comma separated opt arg completion improvements

When completing comma separated lists, display the new argument suggestions to be added as is, instead of prefixing them with "oldarguments,". So suggest "bar" instead of "foo,bar" after "foo," (the existing "foo," prefix will be kept once there is only one option to complete).
scop · Feb 2, 2018 · 021058b · 021058b
1 parent c71f5fc
commit 021058b
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 11 deletions.
diff --git a/completions/kcov b/completions/kcov
@@ -33,9 +33,12 @@ _kcov()
             if [[ "$cur" == ?*,* ]]; then
                 prev="${cur%,*}"
                 cur="${cur##*,}"
-                COMPREPLY=( $( compgen -P "$prev," -W "{0..100}" -- "$cur" ) )
+                COMPREPLY=( $( compgen -W "{0..100}" -- "$cur" ) )
+                [[ ${#COMPREPLY[@]} -eq 1 ]] && \
+                    COMPREPLY=( ${COMPREPLY/#/$prev,} )
             else
                 COMPREPLY=( $( compgen -W "{0..100}" -- "$cur" ) )
+                [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/%/,} )
                 compopt -o nospace
             fi
             return

diff --git a/completions/pylint b/completions/pylint
@@ -37,7 +37,7 @@ _pylint()
             local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
             cur="${cur##*,}"
             _xfunc python _python_modules $python
-            COMPREPLY=( ${COMPREPLY[@]/#/$prefix} )
+            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
             return
             ;;
         -f|--format)

diff --git a/completions/ss b/completions/ss
@@ -16,9 +16,10 @@ _ss()
             ;;
         -A|--query)
             local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
-            COMPREPLY=( $( compgen -P "$prefix" -W '$( "$1" --help | \
+            COMPREPLY=( $( compgen -W '$( "$1" --help | \
                 command sed -e "s/|/ /g" -ne "s/.*QUERY := {\([^}]*\)}.*/\1/p"  )' \
                 -- "${cur##*,}" ) )
+            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
             return
             ;;
         -D|--diag|-F|--filter)

diff --git a/completions/tshark b/completions/tshark
@@ -51,9 +51,9 @@ _tshark()
             ;;
         -O)
             local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
-            COMPREPLY=( $( compgen -P "$prefix" -W \
-                "$( "$1" -G protocols 2>&1 | cut -f 3 )" \
+            COMPREPLY=( $( compgen -W "$( "$1" -G protocols 2>&1 | cut -f 3 )" \
                 -- "${cur##*,}" ) )
+            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
             return
             ;;
         -T)

diff --git a/completions/useradd b/completions/useradd
@@ -25,7 +25,8 @@ _useradd()
             ;;
         -G|--groups)
             local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
-            COMPREPLY=( $( compgen -P "$prefix" -g -- "${cur##*,}" ) )
+            COMPREPLY=( $( compgen -g -- "${cur##*,}" ) )
+            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
             return
             ;;
         -s|--shell)

diff --git a/completions/usermod b/completions/usermod
@@ -21,7 +21,8 @@ _usermod()
             ;;
         -G|--groups)
             local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
-            COMPREPLY=( $( compgen -P "$prefix" -g -- "${cur##*,}" ) )
+            COMPREPLY=( $( compgen -g -- "${cur##*,}" ) )
+            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
             return
             ;;
         -R|--root)

diff --git a/test/lib/completions/kcov.exp b/test/lib/completions/kcov.exp
@@ -12,15 +12,13 @@ setup
 
 
 assert_complete_any "kcov "
-
-
 sync_after_int
 
-
 set test "--exclude-patter<TAB> should complete \"--exclude-pattern=\""
 assert_complete "--exclude-pattern=" "kcov --exclude-patter" $test -nospace
+sync_after_int
 
-
+assert_complete_any "kcov -l 42,"
 sync_after_int
 
 

diff --git a/test/lib/completions/ss.exp b/test/lib/completions/ss.exp
@@ -17,5 +17,8 @@ sync_after_int
 assert_complete_any "ss -A "
 sync_after_int
 
+assert_complete_any "ss -A foo,"
+sync_after_int
+
 
 teardown
diff --git a/test/lib/completions/tshark.exp b/test/lib/completions/tshark.exp
@@ -17,5 +17,8 @@ sync_after_int
 assert_complete_any "tshark -G "
 sync_after_int
 
+assert_complete_any "tshark -O foo,htt"
+sync_after_int
+
 
 teardown