mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

39856: module completion improvements.

Browse source 
Follow symbolic links when finding.

Use _multi_parts for paths when completing modules.
This commit is contained in:
Peter Stephenson 2016-11-07 14:49:00 +00:00
parent 0921a3537a
commit 5411cdf378
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2016-11-07 Peter Stephenson <p.stephenson@samsung.com>
* Felix Neumärker: Completion/Unix/Command/_module: follow
symbolic links and use _multi_parts for paths.
* zsh-users/22083: Doc/Zsh/expn.yo: attempt to explain a bit
better what a "word" is in parameter substitution.

20
Completion/Unix/Command/_module
View file

@ -85,7 +85,7 @@ _module_available_modules()
{
if [[ -n $MODULEPATH ]] && [[ ${+_available_modules} -eq 0 ]]
then
_available_modules=(${$(find ${(e)=MODULEPATH//:/ } -xtype f -print 2>/dev/null | grep -v \\.version | sed -e 's,\('${${(e)=MODULEPATH//:/\/\\\|}%\\\|}'\),,g' -e 's,^/*,,g'):#*\~})
_available_modules=(${$(find -L ${(e)=MODULEPATH//:/ } -type f -print 2>/dev/null | grep -v \\.version | sed -e 's,\('${${(e)=MODULEPATH//:/\/\\\|}%\\\|}'\),,g' -e 's,^/*,,g'):#*\~})
fi
}
@ -93,14 +93,14 @@ _module_available_modules()
(( $+functions[_module_help] )) || _module_help()
{
_module_available_modules
compadd "$@" -a -- _available_modules
_multi_parts / "($_available_modules)"
}
# Completion function for load|add
(( $+functions[_module_load] )) || _module_load()
{
_module_available_modules
compadd "$@" -a -- _available_modules
_multi_parts / "($_available_modules)"
}
# Completion function for unload|rm
@ -114,14 +114,14 @@ _module_available_modules()
{
# Actually first argument could be a loaded module
_module_available_modules
compadd "$@" -a -- _available_modules
_multi_parts / "($_available_modules)"
}
# Completion function for display|show
(( $+functions[_module_display] )) || _module_display()
{
_module_available_modules
compadd "$@" -a -- _available_modules
_multi_parts / "($_available_modules)"
}
# Completion function for avail
@ -145,35 +145,35 @@ _module_available_modules()
(( $+functions[_module_whatis] )) || _module_whatis()
{
_module_available_modules
compadd "$@" -a -- _available_modules
_multi_parts / "($_available_modules)"
}
# Completion function for initadd
(( $+functions[_module_initadd] )) || _module_initadd()
{
_module_available_modules
compadd "$@" -a -- _available_modules
_multi_parts / "($_available_modules)"
}
# Completion function for initprepend
(( $+functions[_module_initprepend] )) || _module_initprepend()
{
_module_available_modules
compadd "$@" -a -- _available_modules
_multi_parts / "($_available_modules)"
}
# Completion function for initrm
(( $+functions[_module_initrm] )) || _module_initrm()
{
_module_available_modules
compadd "$@" -a -- _available_modules
_multi_parts / "($_available_modules)"
}
# Completion function for initswitch
(( $+functions[_module_initswitch] )) || _module_initswitch()
{
_module_available_modules
compadd "$@" -a -- _available_modules
_multi_parts / "($_available_modules)"
}
_module "$@"