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: Consolidate conditionals together. 

No functional change.
This commit is contained in:
Matthew Martin 2018-10-01 18:06:33 -04:00
parent 9289a57de0
commit b075147888
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -631,12 +631,12 @@ _zsh_highlight_main_highlighter_highlight_list()
fi fi
# The Great Fork: is this a command word? Is this a non-command word? # The Great Fork: is this a command word? Is this a non-command word?
if (( in_redirection )); then if false; then
elif [[ $this_word == *':always:'* && $arg == 'always' ]]; then elif ! (( in_redirection)) && [[ $this_word == *':always:'* && $arg == 'always' ]]; then
# try-always construct # try-always construct
style=reserved-word # de facto a reserved word, although not de jure style=reserved-word # de facto a reserved word, although not de jure
next_word=':start:' next_word=':start:'
elif [[ $this_word == *':start:'* ]]; then # $arg is the command word elif ! (( in_redirection)) && [[ $this_word == *':start:'* ]]; then # $arg is the command word
if (( ${+precommand_options[$arg]} )) && _zsh_highlight_main__is_runnable $arg; then if (( ${+precommand_options[$arg]} )) && _zsh_highlight_main__is_runnable $arg; then
[[ $res != alias ]] && style=precommand [[ $res != alias ]] && style=precommand
flags_with_argument=${precommand_options[$arg]%:*} flags_with_argument=${precommand_options[$arg]%:*}
@ -788,10 +788,7 @@ _zsh_highlight_main_highlighter_highlight_list()
;; ;;
esac esac
fi fi
fi else # $arg is a non-command word
if [[ $style == unknown-token ]] && # not handled by the 'command word' codepath
{ (( in_redirection )) || [[ $this_word == *':regular:'* ]] || [[ $this_word == *':sudo_opt:'* ]] || [[ $this_word == *':sudo_arg:'* ]] }
then # $arg is a non-command word
case $arg in case $arg in
$'\x29') # subshell or end of array assignment $'\x29') # subshell or end of array assignment
if $in_array_assignment; then if $in_array_assignment; then