From 74c7ffc9b53d395d04bdbf737cb420065ac35bfe Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <danielsh@apache.org>
Date: Sun, 12 Jan 2020 19:04:57 +0000
Subject: [PATCH] 'main': Factor out common logic to after the case/esac.

---
 highlighters/main/main-highlighter.zsh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index 114fd41..a2802cc 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -656,7 +656,6 @@ _zsh_highlight_main_highlighter_highlight_list()
       local MATCH; integer MBEGIN MEND
       local parameter_name
       local -a words
-      integer elision_is_happening
       if [[ $arg[1] == '$' ]] && [[ ${arg[2]} == '{' ]] && [[ ${arg[-1]} == '}' ]]; then
         parameter_name=${${arg:2}%?}
       elif [[ $arg[1] == '$' ]]; then
@@ -670,20 +669,18 @@ _zsh_highlight_main_highlighter_highlight_list()
         case ${(tP)MATCH} in
           (*array*|*assoc*)
             words=( ${(P)MATCH} )
-            elision_is_happening=$(( $#words == 0 ))
             ;;
           ("")
             # not set
             words=( )
-            elision_is_happening=1
             ;;
           (*)
             # scalar, presumably
             words=( ${(P)MATCH} )
-            elision_is_happening=$(( $#words == 0 ))
             ;;
         esac
-        if (( elision_is_happening )); then
+        if (( $#words == 0 )); then
+          # Parameter elision is happening
           (( ++in_redirection ))
           _zsh_highlight_main_add_region_highlight $start_pos $end_pos comment
           continue