From a24998abac2cd9e0e91e8fed23a32742a3c2bd10 Mon Sep 17 00:00:00 2001
From: Kevin Ballard <kevin@sb.org>
Date: Wed, 20 Aug 2014 22:28:42 -0700
Subject: [PATCH] Highlight "$foo[1]" properly

Preserve the highlighting applied to the slice brackets when coloring
variables inside of double-quoted strings.
---
 highlight.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/highlight.cpp b/highlight.cpp
index 8145e5f30..f560264c2 100644
--- a/highlight.cpp
+++ b/highlight.cpp
@@ -861,7 +861,11 @@ static void color_argument_internal(const wcstring &buffstr, std::vector<highlig
              */
             case e_double_quoted:
             {
-                colors[in_pos] = highlight_spec_quote;
+                // slices are colored in advance, past `in_pos`, and we don't want to overwrite that
+                if (colors[in_pos] == highlight_spec_param)
+                {
+                    colors[in_pos] = highlight_spec_quote;
+                }
                 switch (c)
                 {
                     case L'"':