ast: append new line at the end of file (#329)

goccy · Dec 8, 2022 · dc3fed8 · dc3fed8
1 parent 49dc308
commit dc3fed8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/ast/ast.go b/ast/ast.go
@@ -566,7 +566,11 @@ func (f *File) String() string {
 	for _, doc := range f.Docs {
 		docs = append(docs, doc.String())
 	}
-	return strings.Join(docs, "\n")
+	if len(docs) > 0 {
+		return strings.Join(docs, "\n") + "\n"
+	} else {
+		return ""
+	}
 }
 
 // DocumentNode type of Document

diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -595,7 +595,7 @@ i: 'j'
 			for _, doc := range f.Docs {
 				ast.Walk(&v, doc.Body)
 			}
-			expect := fmt.Sprintf("\n%+v\n", f)
+			expect := fmt.Sprintf("\n%+v", f)
 			if test.expect != expect {
 				tokens.Dump()
 				t.Fatalf("unexpected output: [%s] != [%s]", test.expect, expect)
@@ -614,7 +614,7 @@ func TestNewLineChar(t *testing.T) {
 		if err != nil {
 			t.Fatalf("%+v", err)
 		}
-		actual := fmt.Sprintf("%v\n", ast)
+		actual := fmt.Sprintf("%v", ast)
 		expect := `a: "a"
 b: 1
 `
@@ -800,7 +800,7 @@ foo: > # comment
 			if err != nil {
 				t.Fatalf("%+v", err)
 			}
-			got := "\n" + f.String() + "\n"
+			got := "\n" + f.String()
 			if test.yaml != got {
 				t.Fatalf("expected:%s\ngot:%s", test.yaml, got)
 			}

diff --git a/path_test.go b/path_test.go
@@ -343,7 +343,7 @@ a:
 				if err := path.MergeFromReader(file, strings.NewReader(test.src)); err != nil {
 					t.Fatalf("%+v", err)
 				}
-				actual := "\n" + file.String() + "\n"
+				actual := "\n" + file.String()
 				if test.expected != actual {
 					t.Fatalf("expected: %q. but got %q", test.expected, actual)
 				}
@@ -360,7 +360,7 @@ a:
 				if err := path.MergeFromFile(file, src); err != nil {
 					t.Fatalf("%+v", err)
 				}
-				actual := "\n" + file.String() + "\n"
+				actual := "\n" + file.String()
 				if test.expected != actual {
 					t.Fatalf("expected: %q. but got %q", test.expected, actual)
 				}
@@ -380,7 +380,7 @@ a:
 				if err := path.MergeFromNode(file, src.Docs[0]); err != nil {
 					t.Fatalf("%+v", err)
 				}
-				actual := "\n" + file.String() + "\n"
+				actual := "\n" + file.String()
 				if test.expected != actual {
 					t.Fatalf("expected: %q. but got %q", test.expected, actual)
 				}
@@ -525,7 +525,7 @@ building:
 				if err := path.ReplaceWithReader(file, strings.NewReader(test.src)); err != nil {
 					t.Fatalf("%+v", err)
 				}
-				actual := "\n" + file.String() + "\n"
+				actual := "\n" + file.String()
 				if test.expected != actual {
 					t.Fatalf("expected: %q. but got %q", test.expected, actual)
 				}
@@ -542,7 +542,7 @@ building:
 				if err := path.ReplaceWithFile(file, src); err != nil {
 					t.Fatalf("%+v", err)
 				}
-				actual := "\n" + file.String() + "\n"
+				actual := "\n" + file.String()
 				if test.expected != actual {
 					t.Fatalf("expected: %q. but got %q", test.expected, actual)
 				}
@@ -562,7 +562,7 @@ building:
 				if err := path.ReplaceWithNode(file, src.Docs[0]); err != nil {
 					t.Fatalf("%+v", err)
 				}
-				actual := "\n" + file.String() + "\n"
+				actual := "\n" + file.String()
 				if test.expected != actual {
 					t.Fatalf("expected: %q. but got %q", test.expected, actual)
 				}