Add '---' separator not after last item. (#916)

Signed-off-by: Ernst von Oelsen <[email protected]>
carvel-dev · Sep 20, 2024 · 9ac89ff · 9ac89ff
1 parent b60ca0d
commit 9ac89ff
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/pkg/yamlfmt/filetests/comment-only.yml b/pkg/yamlfmt/filetests/comment-only.yml
@@ -0,0 +1,6 @@
+# comment
+
++++
+
+
+# comment
diff --git a/pkg/yamlfmt/filetests/comments-doc.yml b/pkg/yamlfmt/filetests/comments-doc.yml
@@ -14,4 +14,3 @@
 ---
 
 # after
----
diff --git a/pkg/yamlfmt/filetests/comments-extra-space.yml b/pkg/yamlfmt/filetests/comments-extra-space.yml
@@ -29,4 +29,3 @@
 - test2 # inline
 
 # after
----
diff --git a/pkg/yamlfmt/filetests/comments-list.yml b/pkg/yamlfmt/filetests/comments-list.yml
@@ -13,4 +13,3 @@
 - test2
 
 # after
----
diff --git a/pkg/yamlfmt/filetests/comments-map.yml b/pkg/yamlfmt/filetests/comments-map.yml
@@ -28,4 +28,3 @@ nested:
   test4: val
 
 # nested-after
----
diff --git a/pkg/yamlfmt/printer.go b/pkg/yamlfmt/printer.go
@@ -45,7 +45,7 @@ func (p *Printer) print(val interface{}, ws whitespace, writer *writer) {
 		for i, item := range typedVal.Items {
 			// TODO deal with first empty doc
 			meta := p.printMeta(item, ws, writer, i == 0)
-			if i != 0 || len(meta.Suffix) > 0 {
+			if (i > 0 && i < len(typedVal.Items)-1) || len(meta.Suffix) > 0 {
 				writer.AddContent(writerChunk{
 					Indent:  ws.Indent,
 					Content: "---" + meta.Suffix,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,3 @@ nested:
		test4: val

		# nested-after
		---