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': use zsh/parameter to resolve alias 

If possible, use zsh/parameter to avoid forks.

Fixes #263.
This commit is contained in:
m0viefreak 2016-03-28 23:38:51 +02:00 committed by Daniel Shahaf
parent 3ce01076b5
commit 2f18ba64e3
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,19 @@ _zsh_highlight_main__type() {
LC_ALL=C builtin type -w -- $1 2>/dev/null LC_ALL=C builtin type -w -- $1 2>/dev/null
} }
# Resolve alias.
#
# Takes a single argument.
#
# The result will be stored in REPLY.
_zsh_highlight_main__resolve_alias() {
if zmodload -e zsh/parameter; then
REPLY=${aliases[$arg]}
else
REPLY="${"$(alias -- $arg)"#*=}"
fi
}
# Main syntax highlighting function. # Main syntax highlighting function.
_zsh_highlight_main_highlighter() _zsh_highlight_main_highlighter()
{ {
@ -344,8 +357,9 @@ _zsh_highlight_main_highlighter()
style=unknown-token style=unknown-token
else else
style=alias style=alias
local aliased_command="${"$(alias -- $arg)"#*=}" _zsh_highlight_main__resolve_alias $arg
[[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS:#"$aliased_command"} && -z ${(M)ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS:#"$arg"} ]] && ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS+=($arg) local alias_target="$REPLY"
[[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS:#"$alias_target"} && -z ${(M)ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS:#"$arg"} ]] && ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS+=($arg)
fi fi
} }
;; ;;