Skip to content

Commit 3b6beba

Browse files
authored
fix flow sequence with map (#620)
1 parent 4260634 commit 3b6beba

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

decode_test.go

+17
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,23 @@ merge:
647647
"v: [A,1,C]",
648648
map[string]interface{}{"v": []interface{}{"A", 1, "C"}},
649649
},
650+
{
651+
"v: [a: b, c: d]",
652+
map[string]any{"v": []any{
653+
map[string]any{"a": "b"},
654+
map[string]any{"c": "d"},
655+
}},
656+
},
657+
{
658+
"v: [{a: b}, {c: d, e: f}]",
659+
map[string]any{"v": []any{
660+
map[string]any{"a": "b"},
661+
map[string]any{
662+
"c": "d",
663+
"e": "f",
664+
},
665+
}},
666+
},
650667

651668
// Block sequence
652669
{

parser/parser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ func (p *parser) validateMapKeyValueNextToken(ctx *context, keyTk, tk *Token) er
533533
if tk.Column() <= keyTk.Column() {
534534
return nil
535535
}
536-
if ctx.isFlow && tk.Type() == token.CollectEntryType {
536+
if ctx.isFlow && (tk.Type() == token.CollectEntryType || tk.Type() == token.SequenceEndType) {
537537
return nil
538538
}
539539
// a: b

0 commit comments

Comments
 (0)