Merge pull request #135 from goccy/feature/fix-literal

Fix processing of Literal with NewLineCharacter

ast/ast.go

@@ -586,7 +586,7 @@ func (n *LiteralNode) GetValue() interface{} {
 // String literal to text
 func (n *LiteralNode) String() string {
 	origin := n.Value.GetToken().Origin
-	return fmt.Sprintf("|\n%s", strings.TrimRight(strings.TrimRight(origin, " "), "\n"))
+	return fmt.Sprintf("%s\n%s", n.Start.Value, strings.TrimRight(strings.TrimRight(origin, " "), "\n"))
 }
 
 // MergeKeyNode type of merge key node

decode_test.go

@@ -1950,3 +1950,44 @@ b:
 		t.Fatal("failed to unmarshal with alias")
 	}
 }
+
+func TestDecoder_LiteralWithNewLine(t *testing.T) {
+	type A struct {
+		Node     string `yaml:"b"`
+		LastNode string `yaml:"last"`
+	}
+	tests := []A{
+		A{
+			Node: "hello\nworld",
+		},
+		A{
+			Node: "hello\nworld\n",
+		},
+		A{
+			Node: "hello\nworld\n\n",
+		},
+		A{
+			LastNode: "hello\nworld",
+		},
+		A{
+			LastNode: "hello\nworld\n",
+		},
+		A{
+			LastNode: "hello\nworld\n\n",
+		},
+	}
+	// struct(want) -> Marshal -> Unmarchal -> struct(got)
+	for _, want := range tests {
+		bytes, _ := yaml.Marshal(want)
+		got := A{}
+		if err := yaml.Unmarshal(bytes, &got); err != nil {
+			t.Fatal(err)
+		}
+		if want.Node != got.Node {
+			t.Fatalf("expected:%q but got %q", want.Node, got.Node)
+		}
+		if want.LastNode != got.LastNode {
+			t.Fatalf("expected:%q but got %q", want.LastNode, got.LastNode)
+		}
+	}
+}

parser/parser_test.go

@@ -518,6 +518,30 @@ a:
   d: e
 - f: g
   h: i
+`,
+		},
+		{
+			`
+a: |-
+  value
+b: c
+`,
+			`
+a: |-
+  value
+b: c
+`,
+		},
+		{
+			`
+a:  |+
+  value
+b: c
+`,
+			`
+a: |+
+  value
+b: c
 `,
 		},
 	}

scanner/scanner.go

@@ -329,7 +329,7 @@ func (s *Scanner) scanComment(ctx *Context) (tk *token.Token, pos int) {
 func (s *Scanner) scanLiteral(ctx *Context, c rune) {
 	ctx.addOriginBuf(c)
 	if ctx.isEOS() {
-		if c != '\r' && c != '\n' {
+		if ctx.isLiteral {
 			ctx.addBuf(c)
 		}
 		value := ctx.bufferedSrc()