Teach the highlighter about multiple adjacent square bracket expansions

Fixes #1627

1 files changed, 12 insertions, 1 deletions

diff --git a/fish_tests.cpp b/fish_tests.cpp
index 0ec8bf7b..c46dcf7a 100644
--- a/fish_tests.cpp
+++ b/fish_tests.cpp
@@ -3620,8 +3620,19 @@ static void test_highlighting(void)
         {NULL, -1}
     };
 
+    const highlight_component_t components13[] =
+    {
+        {L"echo", highlight_spec_command},
+        {L"$$foo[", highlight_spec_operator},
+        {L"1", highlight_spec_param},
+        {L"][", highlight_spec_operator},
+        {L"2", highlight_spec_param},
+        {L"]", highlight_spec_operator},
+        {L"[3]", highlight_spec_param}, // two dollar signs, so last one is not an expansion
+        {NULL, -1}
+    };
 
-    const highlight_component_t *tests[] = {components1, components2, components3, components4, components5, components6, components7, components8, components9, components10, components11, components12};
+    const highlight_component_t *tests[] = {components1, components2, components3, components4, components5, components6, components7, components8, components9, components10, components11, components12, components13};
     for (size_t which = 0; which < sizeof tests / sizeof *tests; which++)
     {
         const highlight_component_t *components = tests[which];