From bc3b94349d0a401598560ee8c462f00b9616dff6 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <danielsh@apache.org>
Date: Thu, 16 Jan 2020 19:31:55 +0000
Subject: [PATCH] WIP: Snapshot that *almost* passes tests, but may or may not
 be correct.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Current test failures:

    Running test main
    # parameter-value-contains-command-position1
    1..2
    ok 1 - [1,7] «$foobar»
    not ok 2 - have 1 expectations and 2 region_highlight entries: «expected_region_highlight=( '1 7 assign' )» «region_highlight=( '0 7 assign' '0 7 assign' )»
    # parameter-value-contains-command-position2
    1..2
    ok 1 - [1,2] «$y»
    not ok 2 - have 1 expectations and 2 region_highlight entries: «expected_region_highlight=( '1 2 assign' )» «region_highlight=( '0 2 assign' '0 2 assign' )»
---
 highlighters/main/main-highlighter.zsh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index eee1c23..938614b 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -78,8 +78,13 @@ _zsh_highlight_main_add_region_highlight() {
     return
   fi
   if (( in_param )); then
-    [[ $1 == unknown-token ]] && param_style=unknown-token
-    return
+    if [[ $1 == unknown-token ]]; then
+      param_style=unknown-token
+    fi
+    if [[ -n $param_style ]]; then
+      return
+    fi
+    param_style=$1
   fi
 
   # The calculation was relative to $buf but region_highlight is relative to $BUFFER.
@@ -963,8 +968,9 @@ _zsh_highlight_main_highlighter_highlight_list()
     fi
     _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
   done
+  : ${param_style:=$style}
   (( in_alias == 1 )) && in_alias=0 _zsh_highlight_main_add_region_highlight $start_pos $end_pos $alias_style
-  (( in_param == 1 )) && in_param=0 _zsh_highlight_main_add_region_highlight $start_pos $end_pos ${param_style:-"unknown-token"}
+  (( in_param == 1 )) && in_param=0 _zsh_highlight_main_add_region_highlight $start_pos $end_pos $param_style
   [[ "$proc_buf" = (#b)(#s)(([[:space:]]|\\$'\n')#) ]]
   REPLY=$(( end_pos + ${#match[1]} - 1 ))
   reply=($list_highlights)