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': Fix issue #290, «Mishighlights "longloops" 'repeat'».

This commit is contained in:
Daniel Shahaf 2016-05-13 02:50:17 +00:00
parent 4832f18c50
commit ef68f50c04
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -497,8 +497,11 @@ _zsh_highlight_main_highlighter()
# The redirection mechanism assumes $this_word describes the word # The redirection mechanism assumes $this_word describes the word
# following the redirection. Make it so. # following the redirection. Make it so.
# #
# That word can be a command word with shortloops (`repeat 2 ls`)
# or a command separator (`repeat 2; ls` or `repeat 2; do ls; done`).
#
# The repeat-count word will be handled like a redirection target. # The repeat-count word will be handled like a redirection target.
this_word=':start:' this_word=':start::regular:'
fi fi
start_pos=$end_pos start_pos=$end_pos
(( in_redirection == 0 )) && this_word=$next_word (( in_redirection == 0 )) && this_word=$next_word

2
highlighters/main/test-data/control-flow2.zsh
View File

@ -32,7 +32,7 @@ BUFFER='repeat 42; do ls; done'
expected_region_highlight+=( expected_region_highlight+=(
"1 6 reserved-word" # repeat "1 6 reserved-word" # repeat
"8 9 default" # 42 "8 9 default" # 42
"10 10 commandseparator 'issue #290'" # ; "10 10 commandseparator" # ;
"12 13 reserved-word" # do "12 13 reserved-word" # do
"15 16 command" # ls "15 16 command" # ls
"17 17 commandseparator" # ; "17 17 commandseparator" # ;