refactor: use _comp_compgen_help for _parse_help -

akinomyoga · akinomyoga · commit 128605794ee1 · 2023-05-09T09:10:09.000+09:00
diff --git a/completions/_adb b/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'
diff --git a/completions/aptitude b/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
         COMPREPLY=($(compgen -W 'update upgrade safe-upgrade forget-new
             clean autoclean install reinstall remove hold unhold purge markauto
diff --git a/completions/ip b/completions/ip
@@ -55,16 +55,14 @@ _comp_cmd_ip()
     if [[ ! $has_cmd ]]; then
         case $cur in
             -*)
-                local force=""
-                ((cword == 1)) && force=-force
-                COMPREPLY=($(compgen -W "$force $(
+                _comp_compgen -a help - <<<"$(
+                    ((cword == 1)) && printf '%s\n' -force
                     {
-                        $1 -c=never help || $1 help
+                        "$1" -c=never help || "$1" help
                     } 2>&1 | command sed -e \
                         's/[{|}=]/\n/g' -e \
-                        's/\[\([^]]\{1,\}\)\]/\1/g' |
-                        _parse_help -
-                )" -- "$cur"))
+                        's/\[\([^]]\{1,\}\)\]/\1/g'
+                )"
                 ;;
             *)
                 COMPREPLY=($(compgen -W "help $(
diff --git a/completions/iperf b/completions/iperf
@@ -82,8 +82,7 @@ _comp_cmd_iperf()
     done
     [[ $filter != cat ]] && filter+=' -e /--client/d -e /--server/d'
 
-    COMPREPLY=($(compgen -W \
-        '$("$1" --help 2>&1 | $filter | _parse_help -)' -- "$cur"))
+    _comp_compgen_help - <<<"$("$1" --help 2>&1 | $filter)"
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
     complete -F _comp_cmd_iperf iperf iperf3
diff --git a/completions/iptables b/completions/iptables
@@ -39,8 +39,8 @@ _comp_cmd_iptables()
             ;;
         *)
             if [[ $cur == -* ]]; then
-                COMPREPLY=($(compgen -W '$("$1" --help 2>&1 |
-                command sed -e "s/^\[\!\]//" | _parse_help -)' -- "$cur"))
+                _comp_compgen_help - <<<"$("$1" --help 2>&1 |
+                    command sed -e "s/^\[\!\]//")"
                 [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             fi
             ;;
diff --git a/completions/ipv6calc b/completions/ipv6calc
@@ -30,8 +30,8 @@ _comp_cmd_ipv6calc()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$("$1" -h 2>&1 |
-            command sed -e "s/[][]//g" | _parse_help -)' -- "$cur"))
+        _comp_compgen_help - <<<"$("$1" -h 2>&1 |
+            command sed -e "s/[][]//g")"
     fi
 
 } &&
diff --git a/completions/jq b/completions/jq
@@ -44,8 +44,7 @@ _comp_cmd_jq()
 
         if [[ $help_output == *--help* ]]; then
             # If the output of --help seems complete, use it
-            COMPREPLY=($(compgen -W \
-                '$(printf "%s" "$help_output" | _parse_help -)' -- "$cur"))
+            _comp_compgen_help - <<<"$help_output"
         else
             # Otherwise, use a hard-coded list of known flags, some of which do
             # not appear in the output of --help as of jq 1.6.
diff --git a/completions/makepkg b/completions/makepkg
@@ -14,9 +14,7 @@ _comp_cmd_makepkg__slackware()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W \
-            '$("$1" | command sed -e "s/^options://" | _parse_help -)' \
-            -- "$cur"))
+        _comp_compgen_help - <<<"$("$1" | command sed -e "s/^options://")"
         return
     fi
 
diff --git a/completions/mr b/completions/mr
@@ -10,6 +10,7 @@ _comp_cmd_mr()
     help="$(PERLDOC_PAGER=cat PERLDOC=-otext "${1}" help 2>/dev/null)"
 
     commands="$(
+        # shellcheck disable=SC2030
         printf %s "$help" | while read -r _ options cmd _; do
             [[ $options != "[options]" ]] || printf "%s\n" "$cmd"
         done
@@ -79,12 +80,10 @@ _comp_cmd_mr()
     esac
 
     if [[ $cur == -* ]]; then
-        options="$(printf '%s\n' "$help" | _parse_help -)"
-        # Remove short options (all have compatible long options).
-        options="${options//-[a-z]$'\n'/}"
-        # Remove deprecated options.
-        options="${options//--path/}"
-        _comp_compgen -- -W "${options}"
+        _comp_compgen -Rv options help - <<<"$help"
+        # -X '-[a-z]': Remove short options (all have compatible long options).
+        # -X '--path': Remove deprecated options.
+        _comp_compgen -- -W '"${options[@]}"' -X '@(-[a-z]|--path)'
     else
         _comp_compgen -- -W "${commands}"
     fi
diff --git a/completions/pgrep b/completions/pgrep
@@ -48,11 +48,9 @@ _comp_cmd_pgrep()
     esac
 
     if [[ $cur == -* ]]; then
-        local help=$(_parse_help "$1")
-        [[ $help ]] || help='$("$1" --usage 2>&1 |
-            command sed -e "s/\[-signal\]//" -e "s/\[-SIGNAL\]//" |
-            _parse_usage -)'
-        _comp_compgen -- -W "$help"
+        _comp_compgen_help ||
+            _comp_compgen_usage - <<<"$("$1" --usage 2>&1 |
+                command sed -e "s/\[-signal\]//" -e "s/\[-SIGNAL\]//")"
         [[ $cword -eq 1 && $1 == *pkill ]] && _signals -
         return
     fi
diff --git a/completions/ps b/completions/ps
@@ -59,12 +59,12 @@ _comp_cmd_ps()
 
     if [[ $cur == -* ]]; then
         # sed: strip single char dashless ", x," that trip _parse_help
-        local opts=$({
+        _comp_compgen_help - <<<"$({
             "$1" --help
             "$1" --help all
         } 2>/dev/null |
-            sed -e "s/, [A-Za-z],/,/" | _parse_help -)
-        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+            sed -e "s/, [A-Za-z],/,/")" ||
+            _comp_compgen_usage
     fi
 } &&
     complete -F _comp_cmd_ps ps
diff --git a/completions/pydoc b/completions/pydoc
@@ -16,9 +16,7 @@ _comp_cmd_pydoc()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W \
-            '$("$1" | command sed -e "s/^pydoc3\{0,1\} //" | _parse_help -)' \
-            -- "$cur"))
+        _comp_compgen_help - <<<"$("$1" | command sed -e "s/^pydoc3\{0,1\} //")"
         return
     fi
 
diff --git a/completions/python b/completions/python
@@ -77,9 +77,8 @@ _comp_cmd_python()
     elif [[ $cur != -* ]]; then
         _comp_compgen -a filedir '@(py?([cowz])|zip)'
     else
-        COMPREPLY=($(compgen -W \
-            '$("$1" -h | awk "{ sub(\"\\\(-bb:\",\"\n-bb \"); print }" |
-                         _parse_help -)' -- "$cur"))
+        _comp_compgen_help - <<<"$("$1" -h |
+            awk '{ sub("\\(-bb:","\n-bb "); print }')"
     fi
 } &&
     complete -F _comp_cmd_python \
diff --git a/completions/rsync b/completions/rsync
@@ -60,15 +60,16 @@ _comp_cmd_rsync()
 
     case $cur in
         -*)
-            COMPREPLY=($(
-                # Account for the fact that older rsync versions (before cba00be6, meaning before v3.2.0)
-                # contain the following unusual line in --help:
-                # "(-h) --help                  show this help (-h is --help only if used alone)"
-                compgen -W '$(
-                "$1" --help 2>&1 | sed -e "s/^([^)]*)//" | _parse_help -)
+            local tmp
+            # Account for the fact that older rsync versions (before cba00be6,
+            # meaning before v3.2.0) contain the following unusual line in
+            # --help:
+            # "(-h) --help                  show this help (-h is --help only if used alone)"
+            _comp_compgen -Rv tmp help - <<<"$("$1" --help 2>&1 | sed -e 's/^([^)]*)//')"
+
+            _comp_compgen -- -W '"${tmp[@]}"
                 --daemon --old-d{,irs}
-                --no-{blocking-io,detach,whole-file,inc-recursive,i-r}' -X '--no-OPTION' -- "$cur"
-            ))
+                --no-{blocking-io,detach,whole-file,inc-recursive,i-r}' -X '--no-OPTION'
             [[ ${COMPREPLY-} == *= ]] || compopt +o nospace
             ;;
         *:*)
diff --git a/completions/strings b/completions/strings
@@ -37,13 +37,9 @@ _comp_cmd_strings()
 
     if [[ $cur == -* ]]; then
         # macOS: ... [-t format] [-number] [-n number] ...
-        COMPREPLY=($(
-            compgen -W \
-                '$(_parse_help "$1" ||
-                   "$1" --help 2>&1 | \
-                       command sed -e "s/\[-number\]//" | _parse_usage -)' \
-                -- "$cur"
-        ))
+        _comp_compgen_help ||
+            _comp_compgen_usage - <<<"$("$1" --help 2>&1 |
+                command sed -e "s/\[-number\]//")"
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     elif [[ $cur == @* ]]; then
diff --git a/completions/xdg-settings b/completions/xdg-settings
@@ -12,8 +12,7 @@ _comp_cmd_xdg_settings()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$("$1" --help |
-            tr "{|" "\n" | _parse_help -)' -- "$cur"))
+        _comp_compgen_help - <<<"$("$1" --help | tr '{|' '\n')"
         return
     fi
 
diff --git a/completions/xrandr b/completions/xrandr
@@ -178,21 +178,19 @@ _comp_cmd_xrandr()
 
     local options
     if [[ $has_output ]]; then
-        options=$(
+        _comp_compgen -v options help - <<<"$(
             _comp_cmd_xrandr_help "$1" |
-                command sed -e 's/ or /\n  /g' -e 's/<[^>]*>]//g' |
-                _parse_help -
-        )
+                command sed -e 's/ or /\n  /g' -e 's/<[^>]*>]//g'
+        )"
     else
         # if no output is specified, remove per-output options
-        options=$(
+        _comp_compgen -v options help - <<<"$(
             _comp_cmd_xrandr_help "$1" |
-                command sed -e '/^  -/!d' -e 's/ or /\n  /g' \
-                    -e 's/<[^>]*>]//g' | _parse_help -
-        )
+                command sed -e '/^  -/!d' -e 's/ or /\n  /g' -e 's/<[^>]*>]//g'
+        )"
     fi
 
-    _comp_compgen -- -W "$options"
+    _comp_compgen -- -W '"${options[@]}"'
 } &&
     complete -F _comp_cmd_xrandr xrandr
 
