fix flow-mapping-edge-cases (#621)

scanner/scanner.go

@@ -962,6 +962,12 @@ func (s *Scanner) scanMapDelim(ctx *Context) (bool, error) {
 		// like http://
 		return false, nil
 	}
+	if s.startedFlowMapNum > 0 {
+		tk := ctx.lastToken()
+		if tk != nil && tk.Type == token.MappingValueType {
+			return false, nil
+		}
+	}
 
 	if strings.HasPrefix(strings.TrimPrefix(string(ctx.obuf), " "), "\t") && !strings.HasPrefix(string(ctx.buf), "\t") {
 		invalidTk := token.Invalid("tab character cannot use as a map key directly", string(ctx.obuf), s.pos())

yaml_test_suite_test.go

@@ -22,6 +22,7 @@ var failureTestNames = []string{
 	"empty-keys-in-block-and-flow-mapping",             // no json.
 	"empty-lines-at-end-of-document",                   // no json.
 	"flow-mapping-separate-values",                     // no json.
+	"flow-sequence-in-flow-mapping",                    // no json.
 	"implicit-flow-mapping-key-on-one-line",            // no json.
 	"mapping-key-and-flow-sequence-item-anchors",       // no json.
 	"nested-implicit-complex-keys",                     // no json.
@@ -46,10 +47,8 @@ var failureTestNames = []string{
 	"comment-without-whitespace-after-doublequoted-scalar",
 	"construct-binary",
 	"dash-in-flow-sequence",
-	"flow-sequence-in-flow-mapping",
 	"flow-collections-over-many-lines/01",
 	"flow-mapping-colon-on-line-after-key/02",
-	"flow-mapping-edge-cases",
 	"invalid-comment-after-comma",
 	"invalid-comment-after-end-of-flow-sequence",
 	"invalid-comma-in-tag",