fix invalid sequence at map context (#493)

goccy · Oct 31, 2024 · 3788afc · 3788afc
1 parent bbcd692
commit 3788afc
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/parser/parser.go b/parser/parser.go
@@ -231,17 +231,21 @@ func (p *parser) createMapValueNode(ctx *context, key ast.MapKeyNode, colonToken
 }
 
 func (p *parser) validateMapValue(ctx *context, key, value ast.Node) error {
-	keyColumn := key.GetToken().Position.Column
-	valueColumn := value.GetToken().Position.Column
-	if keyColumn != valueColumn {
+	keyTk := key.GetToken()
+	valueTk := value.GetToken()
+
+	if keyTk.Position.Line == valueTk.Position.Line && valueTk.Type == token.SequenceEntryType {
+		return errors.ErrSyntax("block sequence entries are not allowed in this context", valueTk)
+	}
+	if keyTk.Position.Column != valueTk.Position.Column {
 		return nil
 	}
 	if value.Type() != ast.StringType {
 		return nil
 	}
 	ntk := ctx.nextToken()
 	if ntk == nil || (ntk.Type != token.MappingValueType && ntk.Type != token.SequenceEntryType) {
-		return errors.ErrSyntax("could not find expected ':' token", value.GetToken())
+		return errors.ErrSyntax("could not find expected ':' token", valueTk)
 	}
 	return nil
 }
@@ -352,7 +356,7 @@ func (p *parser) parseSequenceEntry(ctx *context) (*ast.SequenceNode, error) {
 		ctx.progress(1) // skip sequence token
 		tk = ctx.currentToken()
 		if tk == nil {
-			return nil, errors.ErrSyntax("empty sequence entry", ctx.previousToken())
+			return nil, errors.ErrSyntax("empty sequence value", ctx.previousToken())
 		}
 		var comment *ast.CommentGroupNode
 		if tk.Type == token.CommentType {

diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -706,7 +706,7 @@ a:
 - b: c
 - `,
 			`
-[4:1] empty sequence entry
+[4:1] empty sequence value
    2 | a:
    3 | - b: c
 >  4 | -
@@ -774,6 +774,29 @@ b
                 ^
 `,
 		},
+		{
+			`
+a: -
+b: -
+`,
+			`
+[3:4] empty sequence value
+   2 | a: -
+>  3 | b: -
+          ^
+`,
+		},
+		{
+			`
+a: - 1
+b: - 2
+`,
+			`
+[2:4] block sequence entries are not allowed in this context
+>  2 | a: - 1
+          ^
+   3 | b: - 2`,
+		},
 	}
 	for _, test := range tests {
 		t.Run(test.source, func(t *testing.T) {