From ef68f50c048fd7d7ce54b76774a86f6719f4ed21 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Fri, 13 May 2016 02:50:17 +0000
Subject: [PATCH] =?UTF-8?q?'main':=20Fix=20issue=20#290,=20=C2=ABMishighli?=
 =?UTF-8?q?ghts=20"longloops"=20'repeat'=C2=BB.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 highlighters/main/main-highlighter.zsh        | 5 ++++-
 highlighters/main/test-data/control-flow2.zsh | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index cb7e55c..92ddda1 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -497,8 +497,11 @@ _zsh_highlight_main_highlighter()
       # The redirection mechanism assumes $this_word describes the word
       # 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.
-      this_word=':start:'
+      this_word=':start::regular:'
     fi
     start_pos=$end_pos
     (( in_redirection == 0 )) && this_word=$next_word
diff --git a/highlighters/main/test-data/control-flow2.zsh b/highlighters/main/test-data/control-flow2.zsh
index 3871adb..acf99e1 100644
--- a/highlighters/main/test-data/control-flow2.zsh
+++ b/highlighters/main/test-data/control-flow2.zsh
@@ -32,7 +32,7 @@ BUFFER='repeat 42; do ls; done'
 expected_region_highlight+=(
   "1 6 reserved-word" # repeat
   "8 9 default" # 42
-  "10 10 commandseparator 'issue #290'" # ;
+  "10 10 commandseparator" # ;
   "12 13 reserved-word" # do
   "15 16 command" # ls
   "17 17 commandseparator" # ;