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': Add infrastructure for treating literal newlines differently to semicolons. 

Used by the next commit.
This commit is contained in:
Daniel Shahaf 2020-03-15 14:17:51 +00:00
parent e58e45273f
commit a4525a0826
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,6 +359,7 @@ _zsh_highlight_highlighter_main_paint()
ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR=( ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR=(
'|' '||' ';' '&' '&&' '|' '||' ';' '&' '&&'
$'\n' # ${(z)} returns ';' but we convert it to $'\n'
'|&' '|&'
'&!' '&|' '&!' '&|'
# ### 'case' syntax, but followed by a pattern, not by a command # ### 'case' syntax, but followed by a pattern, not by a command
@ -535,12 +536,17 @@ _zsh_highlight_main_highlighter_highlight_list()
if (( in_alias == 0 && in_param == 0 )); then if (( in_alias == 0 && in_param == 0 )); then
# Compute the new $start_pos and $end_pos, skipping over whitespace in $buf. # Compute the new $start_pos and $end_pos, skipping over whitespace in $buf.
[[ "$proc_buf" = (#b)(#s)(([ $'\t']|\\$'\n')#)* ]] [[ "$proc_buf" = (#b)(#s)(([ $'\t']|[\\]$'\n')#)(?|)* ]]
# The first, outer parenthesis # The first, outer parenthesis
integer offset="${#match[1]}" integer offset="${#match[1]}"
(( start_pos = end_pos + offset )) (( start_pos = end_pos + offset ))
(( end_pos = start_pos + $#arg )) (( end_pos = start_pos + $#arg ))
# The zsh lexer considers ';' and newline to be the same token, so
# ${(z)} converts all newlines to semicolons. Convert them back here to
# make later processing simplier.
[[ $arg == ';' && ${match[3]} == $'\n' ]] && arg=$'\n'
# Compute the new $proc_buf. We advance it # Compute the new $proc_buf. We advance it
# (chop off characters from the beginning) # (chop off characters from the beginning)
# beyond what end_pos points to, by skipping # beyond what end_pos points to, by skipping
@ -731,7 +737,7 @@ _zsh_highlight_main_highlighter_highlight_list()
else else
style=unknown-token style=unknown-token
fi fi
if [[ $arg == ';' ]] && $in_array_assignment; then if [[ $arg == (';'|$'\n') ]] && $in_array_assignment; then
# literal newline inside an array assignment # literal newline inside an array assignment
next_word=':regular:' next_word=':regular:'
else else