Merge pull request #969 from akinomyoga/_parse_help-2

refactor: use `_comp_compgen_{help,usage}` with non-trivial rewriting

Author: scop

completions/_adb

@@ -5,9 +5,8 @@
 
 _comp_cmd_adb__command_usage()
 {
-    COMPREPLY=($(compgen -W '$("$1" help 2>&1 | \
-            command sed -e "/^ *\(adb \)\{0,1\} *$2 /!d;s/[]|[]/\n/g" | \
-            _parse_help -)' -- "$cur"))
+    _comp_compgen_help - <<<"$("$1" help 2>&1 |
+        command sed -e "/^ *\(adb \)\{0,1\} *$2 /!d;s/[]|[]/\n/g")"
 }
 
 _comp_cmd_adb()
@@ -57,9 +56,8 @@ _comp_cmd_adb()
             _comp_compgen -a filedir
             ;;
         forward)
-            COMPREPLY=($(compgen -W \
-                '$("$1" help 2>&1 | command sed -ne "s/^ *adb  *forward  *-/-/p" | \
-                    _parse_help -)' -- "$cur"))
+            _comp_compgen_help - <<<"$("$1" help 2>&1 |
+                command sed -ne "s/^ *adb  *forward  *-/-/p")"
             ;;
         reboot)
             _comp_compgen -- -W 'bootloader recovery'

completions/aptitude

@@ -60,19 +60,19 @@ _comp_cmd_aptitude()
     esac
 
     if [[ $cur == -* ]]; then
-        local opts=" $("$1" --help 2>&1 | command sed -e \
-            's/--with(out)-recommends/--without-recommends\n--with-recommends/' |
-            _parse_help - | tr '\n' ' ') "
+        _comp_compgen -R help - <<<"$("$1" --help 2>&1 | command sed -e \
+            's/--with(out)-recommends/--without-recommends\n--with-recommends/')"
+        ((${#COMPREPLY[@]})) || return 0
 
         # Exclude some mutually exclusive options
+        local exclude_flags=""
         for i in "${words[@]}"; do
-            [[ $i == -u ]] && opts=${opts/ -i / }
-            [[ $i == -i ]] && opts=${opts/ -u / }
+            [[ $i == -u ]] && exclude_flags+=i
+            [[ $i == -i ]] && exclude_flags+=u
         done
 
         # Do known short -> long replacements; at least up to 0.8.12, --help
         # outputs mostly only short ones.
-        COMPREPLY=($opts)
         for i in "${!COMPREPLY[@]}"; do
             case ${COMPREPLY[i]} in
                 -h) COMPREPLY[i]=--help ;;
@@ -92,8 +92,8 @@ _comp_cmd_aptitude()
             esac
         done
 
-        ((${#COMPREPLY[@]})) &&
-            _comp_compgen -- -W '"${COMPREPLY[@]}"'
+        _comp_compgen -- -W '"${COMPREPLY[@]}"' \
+            ${exclude_flags:+-X "-[$exclude_flags]"}
     else
         _comp_compgen -- -W 'update upgrade safe-upgrade forget-new clean
             autoclean install reinstall remove hold unhold purge markauto

completions/bzip2

@@ -18,9 +18,9 @@ _comp_cmd_bzip2()
     esac
 
     if [[ $cur == -* ]]; then
-        local helpopts=$(_parse_help "$1")
-        COMPREPLY=($(compgen -W "${helpopts//#/} -2 -3 -4 -5 -6 -7 -8 -9" \
-            -- "$cur"))
+        local helpopts
+        _comp_compgen -Rv helpopts help
+        _comp_compgen -- -W '${helpopts[*]//#/} -{2..9}'
         return
     fi
 

completions/chronyc

@@ -29,7 +29,8 @@ _comp_cmd_chronyc()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1") -6' -- "$cur"))
+        _comp_compgen_usage
+        _comp_compgen -a -- -W '-6'
         return
     fi
 

completions/complete

@@ -37,7 +37,8 @@ _comp_cmd_complete()
     esac
 
     if [[ $cur == -* ]]; then
-        local -a opts=($(compgen -W '$(_parse_usage help "-s $1")' -- "$cur"))
+        local -a opts
+        _comp_compgen -v opts usage -c help -s "$1"
         # -F, -C do not work the expected way with compgen
         [[ $1 != *compgen ]] || opts=("${opts[@]//-[FC]/}")
         _comp_compgen -- -W '"${opts[@]}"' -X ''

completions/cvs

@@ -408,9 +408,9 @@ _comp_cmd_cvs()
                     ;;
             esac
 
-            COMPREPLY=($(compgen -W '$(_cvs_commands)
-                $(_parse_help "$1" --help-options) --help --help-commands
-                --help-options --version' -- "$cur"))
+            _comp_compgen_help -- --help-options
+            _comp_compgen -a -- -W '$(_cvs_commands) --help
+                --help-commands --help-options --version'
             ;;
     esac
 

completions/dd

@@ -29,9 +29,9 @@ _comp_cmd_dd()
             ;;
     esac
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur")
-    $(compgen -W 'bs cbs conv count ibs if iflag obs of oflag
-                              seek skip status' -S '=' -- "$cur"))
+    _comp_compgen_help
+    _comp_compgen -a -- -W 'bs cbs conv count ibs if iflag obs of oflag
+        seek skip status' -S '='
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
     complete -F _comp_cmd_dd dd

completions/declare

@@ -7,7 +7,7 @@ _comp_cmd_declare()
 
     if [[ $cur == [-+]* ]]; then
         local opts
-        opts=($(_parse_usage help "-s $1"))
+        _comp_compgen -Rv opts usage -c help -s "$1"
         # Most options also have a '+' form.
         # We'll exclude the ones that don't with compgen.
         opts+=(${opts[*]/-/+})

completions/dsniff

@@ -17,7 +17,8 @@ _comp_cmd_dsniff()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1") -r -w -p' -- "$cur"))
+        _comp_compgen_usage
+        _comp_compgen -a -- -W '-r -w -p'
     fi
 
 } &&

completions/ether-wake

@@ -16,7 +16,8 @@ _comp_cmd_ether_wake()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -u) -V' -- "$cur"))
+        _comp_compgen_help -- -u
+        _comp_compgen -a -- -W '-V'
         return
     fi