Skip to content

Commit 01611dd

Browse files
committed
refactor(perl): _comp_cmd_perl__helper main command convention
1 parent 898926c commit 01611dd

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

completions/perl

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
_comp_cmd_perl__helper()
44
{
55
COMPREPLY=($(compgen -P "$prefix" -W \
6-
"$("${2:-perl}" "${BASH_SOURCE[0]%/*}/../helpers/perl" "$1" "$cur")" \
6+
"$("${1:-perl}" "${BASH_SOURCE[0]%/*}/../helpers/perl" "$2" "$cur")" \
77
-- "$cur"))
88
[[ $1 == functions ]] || _comp_ltrim_colon_completions "$prefix$cur"
99
}
@@ -41,7 +41,7 @@ _comp_cmd_perl()
4141
temp="${cur#-}"
4242
prefix+=${cur%"$temp"}
4343
cur="$temp"
44-
_comp_cmd_perl__helper modules "$1"
44+
_comp_cmd_perl__helper "$1" modules
4545
return
4646
;;
4747
-*V)
@@ -61,7 +61,7 @@ _comp_cmd_perl()
6161
temp="${cur#:}"
6262
prefix=$prefix${cur%"$temp"}
6363
cur="Devel::$temp"
64-
_comp_cmd_perl__helper modules "$1"
64+
_comp_cmd_perl__helper "$1" modules
6565
fi
6666
;;
6767
esac
@@ -106,8 +106,9 @@ _comp_cmd_perldoc()
106106
prefix=$prev
107107
fi
108108

109-
local perl="${1%doc}"
110-
[[ $perl == "$1" ]] || ! type "$perl" &>/dev/null && perl=
109+
# Prefer `perl` in the same dir in utility functions
110+
local pathcmd
111+
pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
111112

112113
case $prev in
113114
-*[hVnoMwL])
@@ -118,7 +119,7 @@ _comp_cmd_perldoc()
118119
return
119120
;;
120121
-*f)
121-
_comp_cmd_perl__helper functions "$perl"
122+
_comp_cmd_perl__helper "" functions
122123
return
123124
;;
124125
esac
@@ -128,7 +129,7 @@ _comp_cmd_perldoc()
128129
else
129130
# return available modules (unless it is clearly a file)
130131
if [[ $cur != @(*/|[.~])* ]]; then
131-
_comp_cmd_perl__helper perldocs "$perl"
132+
_comp_cmd_perl__helper "" perldocs
132133
if [[ $cur == p* ]]; then
133134
COMPREPLY+=($(compgen -W \
134135
'$(PERLDOC_PAGER=cat "$1" -u perl | \

0 commit comments

Comments
 (0)