XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1509 from okomestudio/ts/proper-arg-passing 

Pass all the expected arguments to the completion function
pull/1511/head
Nils Winkler 2020-03-03 08:43:22 +01:00 committed by GitHub
parent 95da7f27c7 a7a777b20a
commit a6b757e19b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/available/alias-completion.plugin.bash
View File

@ -63,21 +63,23 @@ function alias_completion {
local compl_func="${new_completion/#* -F /}"; compl_func="${compl_func%% *}" local compl_func="${new_completion/#* -F /}"; compl_func="${compl_func%% *}"
# avoid recursive call loops by ignoring our own functions # avoid recursive call loops by ignoring our own functions
if [[ "${compl_func#_$namespace::}" == $compl_func ]]; then if [[ "${compl_func#_$namespace::}" == $compl_func ]]; then
# the completion function stored in compl_func may need argument(s),
# in which case they should be provided in compl_func_args (see #1497)
local compl_func_args=
if [[ $compl_func == _filedir_xspec ]]; then
compl_func_args=$alias_cmd
fi
local compl_wrapper="_${namespace}::${alias_name}" local compl_wrapper="_${namespace}::${alias_name}"
echo "function $compl_wrapper { echo "function $compl_wrapper {
local compl_word=\$2
local prec_word=\$3
# check if prec_word is the alias itself. if so, replace it
# with the last word in the unaliased form, i.e.,
# alias_cmd + ' ' + alias_args.
if [[ \$COMP_LINE == \"\$prec_word \$compl_word\" ]]; then
prec_word=\"$alias_cmd $alias_args\"
prec_word=\${prec_word#* }
fi
(( COMP_CWORD += ${#alias_arg_words[@]} )) (( COMP_CWORD += ${#alias_arg_words[@]} ))
COMP_WORDS=($alias_cmd $alias_args \${COMP_WORDS[@]:1}) COMP_WORDS=($alias_cmd $alias_args \${COMP_WORDS[@]:1})
(( COMP_POINT -= \${#COMP_LINE} )) (( COMP_POINT -= \${#COMP_LINE} ))
COMP_LINE=\${COMP_LINE/$alias_name/$alias_cmd $alias_args} COMP_LINE=\${COMP_LINE/$alias_name/$alias_cmd $alias_args}
(( COMP_POINT += \${#COMP_LINE} )) (( COMP_POINT += \${#COMP_LINE} ))
$compl_func $compl_func_args $compl_func \"$alias_cmd\" \"\$compl_word\" \"\$prec_word\"
}" >> "$tmp_file" }" >> "$tmp_file"
new_completion="${new_completion/ -F $compl_func / -F $compl_wrapper }" new_completion="${new_completion/ -F $compl_func / -F $compl_wrapper }"
fi fi