xinb
/
zsh-syntax-highlighting
mirror of https://github.com/zsh-users/zsh-syntax-highlighting.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

'main': Work around type -w bug in zsh 

Even if 'type -w' returns 'none', it still hashes it in $commands:
http://www.zsh.org/mla/workers/2016/msg01583.html

Before 12b879caf7, we ran 'type -w'
in a subshell, so this bug did not manifest. Now that we don't,
the $commands array is poisoned with invalid entries.

To prevent this, while still keeping the perfomance benefit of
avoiding the subshell, we make sure we remove invalid entries
from $commands again.
This commit is contained in:
m0viefreak 2016-08-24 23:28:04 +02:00
parent 11c9081967
commit ff6681ccd4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
highlighters/main/main-highlighter.zsh
View File

@ -101,7 +101,13 @@ _zsh_highlight_main__type() {
fi fi
unset REPLY unset REPLY
if zmodload -e zsh/parameter; then if zmodload -e zsh/parameter; then
if (( $+aliases[(e)$1] )); then if ! builtin type -w -- $1 >/dev/null 2>&1; then
REPLY=none
# work around zsh bug: even if type -w encounters an invalid command,
# it hashes it anyways. http://www.zsh.org/mla/workers/2016/msg01583.html
# we force an unhash here to keep the hash tables clean.
(( $+commands[(e)$1] )) && unhash $1
elif (( $+aliases[(e)$1] )); then
REPLY=alias REPLY=alias
elif (( $+saliases[(e)${1##*.}] )); then elif (( $+saliases[(e)${1##*.}] )); then
REPLY='suffix alias' REPLY='suffix alias'
@ -113,8 +119,6 @@ _zsh_highlight_main__type() {
REPLY=builtin REPLY=builtin
elif (( $+commands[(e)$1] )); then elif (( $+commands[(e)$1] )); then
REPLY=command REPLY=command
elif ! builtin type -w -- $1 >/dev/null 2>&1; then
REPLY=none
fi fi
fi fi
if ! (( $+REPLY )); then if ! (( $+REPLY )); then