fix format with comment (#645)

goccy · Feb 9, 2025 · e6c495e · e6c495e
1 parent 0653c80
commit e6c495e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/decode_test.go b/decode_test.go
@@ -2757,8 +2757,9 @@ type unmarshalList struct {
 
 func (u *unmarshalList) UnmarshalYAML(b []byte) error {
 	expected := `
-- b: c
-  d: |
+- b: c # comment
+  # comment
+  d: | # comment
     hello
 
     hello
@@ -2807,8 +2808,9 @@ config:
 func TestDecoder_UnmarshalBytesWithSeparatedList(t *testing.T) {
 	yml := `
 a:
- - b: c
-   d: |
+ - b: c # comment
+   # comment
+   d: | # comment
      hello
 
      hello
@@ -2818,7 +2820,8 @@ a:
 	var v struct {
 		A unmarshalList
 	}
-	if err := yaml.Unmarshal([]byte(yml), &v); err != nil {
+	cm := yaml.CommentMap{}
+	if err := yaml.UnmarshalWithOptions([]byte(yml), &v, yaml.CommentToMap(cm)); err != nil {
 		t.Fatal(err)
 	}
 	if len(v.A.v) != 2 {

diff --git a/internal/format/format.go b/internal/format/format.go
@@ -80,31 +80,31 @@ func (f *Formatter) formatDocument(n *ast.DocumentNode) string {
 }
 
 func (f *Formatter) formatNull(n *ast.NullNode) string {
-	return f.formatCommentGroup(n.Comment) + f.origin(n.Token)
+	return f.origin(n.Token) + f.formatCommentGroup(n.Comment)
 }
 
 func (f *Formatter) formatString(n *ast.StringNode) string {
-	return f.formatCommentGroup(n.Comment) + f.origin(n.Token)
+	return f.origin(n.Token) + f.formatCommentGroup(n.Comment)
 }
 
 func (f *Formatter) formatInteger(n *ast.IntegerNode) string {
-	return f.formatCommentGroup(n.Comment) + f.origin(n.Token)
+	return f.origin(n.Token) + f.formatCommentGroup(n.Comment)
 }
 
 func (f *Formatter) formatFloat(n *ast.FloatNode) string {
-	return f.formatCommentGroup(n.Comment) + f.origin(n.Token)
+	return f.origin(n.Token) + f.formatCommentGroup(n.Comment)
 }
 
 func (f *Formatter) formatBool(n *ast.BoolNode) string {
-	return f.formatCommentGroup(n.Comment) + f.origin(n.Token)
+	return f.origin(n.Token) + f.formatCommentGroup(n.Comment)
 }
 
 func (f *Formatter) formatInfinity(n *ast.InfinityNode) string {
-	return f.formatCommentGroup(n.Comment) + f.origin(n.Token)
+	return f.origin(n.Token) + f.formatCommentGroup(n.Comment)
 }
 
 func (f *Formatter) formatNan(n *ast.NanNode) string {
-	return f.formatCommentGroup(n.Comment) + f.origin(n.Token)
+	return f.origin(n.Token) + f.formatCommentGroup(n.Comment)
 }
 
 func (f *Formatter) formatLiteral(n *ast.LiteralNode) string {