zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

completion: make bash completion work in zsh

Browse Source 
`compgen -W` does not behave the same way in zsh as it does in bash; it seems not to
actually generate the completions we want.

- [x] add a zsh equivalent and `_compgen_w` to abstract it away
- [x] use `_compgen_w` instead of `compgen -W`
This commit is contained in:
Todd Gamblin 2023-08-26 23:19:55 -07:00
parent 396f219011
commit 6693dc5eb8
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
share/spack/bash/spack-completion.bash
View File

@ -52,6 +52,20 @@ if test -n "${ZSH_VERSION:-}" ; then
fi fi
fi fi
# compgen -W doesn't work in some versions of zsh, so use this instead.
# see https://www.zsh.org/mla/workers/2011/msg00582.html
_compgen_w() {
if test -n "${ZSH_VERSION:-}" ; then
typeset -a words
words=( ${~=1} )
local find="$2"
results=(${(M)words[@]:#$find*})
echo "${results[@]}"
else
compgen -W "$1" -- "$2"
fi
}
# Bash programmable completion for Spack # Bash programmable completion for Spack
_bash_completion_spack() { _bash_completion_spack() {
# In all following examples, let the cursor be denoted by brackets, i.e. [] # In all following examples, let the cursor be denoted by brackets, i.e. []
@ -137,7 +151,7 @@ _bash_completion_spack() {
if [[ "$(LC_ALL=C type $subfunction 2>&1)" =~ $rgx ]] if [[ "$(LC_ALL=C type $subfunction 2>&1)" =~ $rgx ]]
then then
$subfunction $subfunction
COMPREPLY=($(compgen -W "$SPACK_COMPREPLY" -- "$cur")) COMPREPLY=($(_compgen_w "$SPACK_COMPREPLY" "$cur"))
fi fi
# if every completion is an alias for the same thing, just return that thing. # if every completion is an alias for the same thing, just return that thing.
@ -359,7 +373,7 @@ _spack_compress_aliases() {
fi fi
# get the alias of the first thing in the list of completions # get the alias of the first thing in the list of completions
_spack_get_alias "${COMPREPLY[0]}" _spack_get_alias "${COMPREPLY[@]:0:1}"
local first_alias="$SPACK_ALIAS" local first_alias="$SPACK_ALIAS"
# if anything in the list would alias to something different, stop # if anything in the list would alias to something different, stop

18
share/spack/spack-completion.bash
View File

@ -52,6 +52,20 @@ if test -n "${ZSH_VERSION:-}" ; then
fi fi
fi fi
# compgen -W doesn't work in some versions of zsh, so use this instead.
# see https://www.zsh.org/mla/workers/2011/msg00582.html
_compgen_w() {
if test -n "${ZSH_VERSION:-}" ; then
typeset -a words
words=( ${~=1} )
local find="$2"
results=(${(M)words[@]:#$find*})
echo "${results[@]}"
else
compgen -W "$1" -- "$2"
fi
}
# Bash programmable completion for Spack # Bash programmable completion for Spack
_bash_completion_spack() { _bash_completion_spack() {
# In all following examples, let the cursor be denoted by brackets, i.e. [] # In all following examples, let the cursor be denoted by brackets, i.e. []
@ -137,7 +151,7 @@ _bash_completion_spack() {
if [[ "$(LC_ALL=C type $subfunction 2>&1)" =~ $rgx ]] if [[ "$(LC_ALL=C type $subfunction 2>&1)" =~ $rgx ]]
then then
$subfunction $subfunction
COMPREPLY=($(compgen -W "$SPACK_COMPREPLY" -- "$cur")) COMPREPLY=($(_compgen_w "$SPACK_COMPREPLY" "$cur"))
fi fi
# if every completion is an alias for the same thing, just return that thing. # if every completion is an alias for the same thing, just return that thing.
@ -359,7 +373,7 @@ _spack_compress_aliases() {
fi fi
# get the alias of the first thing in the list of completions # get the alias of the first thing in the list of completions
_spack_get_alias "${COMPREPLY[0]}" _spack_get_alias "${COMPREPLY[@]:0:1}"
local first_alias="$SPACK_ALIAS" local first_alias="$SPACK_ALIAS"
# if anything in the list would alias to something different, stop # if anything in the list would alias to something different, stop