Merge pull request #42 from jroper/fix-trailing-comma-comments

Fixed trailing comma comments bug
gurkankaymak · Aug 12, 2023 · 9ccc664 · 9ccc664
2 parents 6ee0f72 + 5cb5942
commit 9ccc664
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/parser.go b/parser.go
@@ -633,7 +633,12 @@ func (p *parser) extractArray() (Array, error) {
 
 			token = p.scanner.TokenText()
 
-			if p.scanner.TokenText() == commaToken {
+			if token == commentToken {
+				p.consumeComment()
+				token = p.scanner.TokenText()
+			}
+
+			if token == commaToken {
 				return nil, adjacentCommasError(p.scanner.Line, p.scanner.Column)
 			}
 		}

diff --git a/parser_test.go b/parser_test.go
@@ -1172,6 +1172,14 @@ func TestExtractArray(t *testing.T) {
 		assertDeepEqual(t, got, Array{Int(1)})
 	})
 
+	t.Run("extract the array without an error when the trailing comma is followed by a comment", func(t *testing.T) {
+		parser := newParser(strings.NewReader("[1,#comment\n]"))
+		parser.advance()
+		got, err := parser.extractArray()
+		assertNoError(t, err)
+		assertDeepEqual(t, got, Array{Int(1)})
+	})
+
 	t.Run("extract the array without an error if if elements are separated with ASCII newline", func(t *testing.T) {
 		parser := newParser(strings.NewReader("[1\n2]"))
 		parser.advance()