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

Merge pull request #1503 from okomestudio/ts/bugfix/alias-completion 

Pass the aliased command as an argument to _filedir_xspec
pull/1507/head
Nils Winkler 2020-02-24 08:36:03 +01:00 committed by GitHub
parent bf5dd87f33 fbc8f7ddf4
commit 9e92ef342f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,13 @@ 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 {
(( COMP_CWORD += ${#alias_arg_words[@]} )) (( COMP_CWORD += ${#alias_arg_words[@]} ))
@ -70,7 +77,7 @@ function alias_completion {
(( 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 $compl_func_args
}" >> "$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