Merge pull request #270 from igorpeshansky/fix-flow-mode-quotes

Quote strings with special characters in flow mode.

encode.go

@@ -411,6 +411,9 @@ func (e *Encoder) isNeedQuoted(v string) bool {
 	if e.useLiteralStyleIfMultiline && strings.ContainsAny(v, "\n\r") {
 		return false
 	}
+	if e.isFlowStyle && strings.ContainsAny(v, `]},'"`) {
+		return true
+	}
 	if token.IsNeedQuoted(v) {
 		return true
 	}
@@ -629,19 +632,18 @@ func (e *Encoder) encodeStruct(ctx context.Context, value reflect.Value, column
 			// omit encoding
 			continue
 		}
-		value, err := e.encodeValue(ctx, fieldValue, column)
+		ve := e
+		if !e.isFlowStyle && structField.IsFlow {
+			ve = &Encoder{}
+			*ve = *e
+			ve.isFlowStyle = true
+		}
+		value, err := ve.encodeValue(ctx, fieldValue, column)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to encode value")
 		}
-		if m, ok := value.(*ast.MappingNode); ok {
-			if !e.isFlowStyle && structField.IsFlow {
-				m.SetIsFlowStyle(true)
-			}
+		if _, ok := value.(*ast.MappingNode); ok {
 			value.AddColumn(e.indent)
-		} else if s, ok := value.(*ast.SequenceNode); ok {
-			if !e.isFlowStyle && structField.IsFlow {
-				s.SetIsFlowStyle(true)
-			}
 		}
 		var key ast.MapKeyNode = e.encodeString(structField.RenderName, column)
 		switch {

encode_test.go

@@ -548,6 +548,88 @@ func TestEncoder(t *testing.T) {
 			}{struct{ B, D string }{"c", "e"}},
 			nil,
 		},
+		// Quoting in flow mode
+		{
+			`a: [b, "c,d", e]` + "\n",
+			struct {
+				A []string `yaml:"a,flow"`
+			}{[]string{"b", "c,d", "e"}},
+			[]yaml.EncodeOption{
+				yaml.UseSingleQuote(false),
+			},
+		},
+		{
+			`a: [b, "c]", d]` + "\n",
+			struct {
+				A []string `yaml:"a,flow"`
+			}{[]string{"b", "c]", "d"}},
+			[]yaml.EncodeOption{
+				yaml.UseSingleQuote(false),
+			},
+		},
+		{
+			`a: [b, "c}", d]` + "\n",
+			struct {
+				A []string `yaml:"a,flow"`
+			}{[]string{"b", "c}", "d"}},
+			[]yaml.EncodeOption{
+				yaml.UseSingleQuote(false),
+			},
+		},
+		{
+			`a: [b, "c\"", d]` + "\n",
+			struct {
+				A []string `yaml:"a,flow"`
+			}{[]string{"b", `c"`, "d"}},
+			[]yaml.EncodeOption{
+				yaml.UseSingleQuote(false),
+			},
+		},
+		{
+			`a: [b, "c'", d]` + "\n",
+			struct {
+				A []string `yaml:"a,flow"`
+			}{[]string{"b", "c'", "d"}},
+			[]yaml.EncodeOption{
+				yaml.UseSingleQuote(false),
+			},
+		},
+		// No quoting in non-flow mode
+		{
+			"a:\n- b\n- c,d\n- e\n",
+			struct {
+				A []string `yaml:"a"`
+			}{[]string{"b", "c,d", "e"}},
+			nil,
+		},
+		{
+			`a: [b, "c]", d]` + "\n",
+			struct {
+				A []string `yaml:"a,flow"`
+			}{[]string{"b", "c]", "d"}},
+			nil,
+		},
+		{
+			`a: [b, "c}", d]` + "\n",
+			struct {
+				A []string `yaml:"a,flow"`
+			}{[]string{"b", "c}", "d"}},
+			nil,
+		},
+		{
+			`a: [b, "c\"", d]` + "\n",
+			struct {
+				A []string `yaml:"a,flow"`
+			}{[]string{"b", `c"`, "d"}},
+			nil,
+		},
+		{
+			`a: [b, "c'", d]` + "\n",
+			struct {
+				A []string `yaml:"a,flow"`
+			}{[]string{"b", "c'", "d"}},
+			nil,
+		},
 
 		// Multi bytes
 		{