JavaScript Highlighter: fix parsing multiple subexpressions in the same array element

MongoView/Synax Highlighting/JavaScriptHighlighter.swift

@@ -316,21 +316,18 @@ class JavaScriptHighlighter {
         emit(token: .punctuation, range: prevCharRange())
         indent += "  "
         array:
-        while currentIndex < text.endIndex && peek() != "]" {
+        while currentIndex < text.endIndex {
             consumeWhitespace()
-            while currentIndex < text.endIndex {
+            if peek() == "," {
-                if peek() == "," {
+                consume() // ,
-                    consume() // ,
+                print("Array separator")
-                    print("Array separator")
+                emit(token: .punctuation, range: prevCharRange())
-                    emit(token: .punctuation, range: prevCharRange())
+            } else if peek() == "]" {
-                    break
+                break array
-                } else if peek() == "]" {
+            } else {
-                    break array
+                print("Array element")
-                } else {
+                while let char = peek(), char != ",", char != "]" {
-                    indent += "  "
-                    print("Array element")
                     consumeExpression()
-                    indent = String(indent.dropLast(2))
                 }
             }
         }

jstest/main.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-let source = ".1 + .2"
+let source = "[1 + 2, 3,]"
 let highlighter = JavaScriptHighlighter(text: source)
 highlighter.debug = true
 highlighter.highlight()