From 5bb5703b0dab128125c4948fb41d543c644452ed Mon Sep 17 00:00:00 2001
From: Matthew Martin <phy1729@gmail.com>
Date: Mon, 1 Oct 2018 18:24:03 -0400
Subject: [PATCH] main: Move TOKENS_CONTROL_FLOW handling into command word
 branch

No functional change.
---
 highlighters/main/main-highlighter.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index 18c30a3..210c735 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -788,6 +788,9 @@ _zsh_highlight_main_highlighter_highlight_list()
                         ;;
       esac
      fi
+     if [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_CONTROL_FLOW:#"$arg"} ]]; then
+      next_word=':start:'
+     fi
    else # $arg is a non-command word
       case $arg in
         $'\x29') # subshell or end of array assignment
@@ -854,9 +857,6 @@ _zsh_highlight_main_highlighter_highlight_list()
         next_word=':start:'
         highlight_glob=true
       fi
-    elif
-       [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_CONTROL_FLOW:#"$arg"} && $this_word == *':start:'* ]]; then
-      next_word=':start:'
     fi
   done
   REPLY=$(( end_pos - 1 ))