Yaml newline after end of document (#6035)

* Add testcase and initial implementation

* Move suffix to Yaml/Documents

Author: Laurens Westerlaken

rewrite-yaml/src/main/java/org/openrewrite/yaml/YamlParser.java

@@ -138,6 +138,7 @@ private Yaml.Documents parseFromInput(Path sourceFile, EncodingDetectingInputStr
             Yaml.Document document = null;
             Stack<BlockBuilder> blockStack = new Stack<>();
             String newLine = "";
+            String suffix = "";
 
             for (Event event = parser.getEvent(); event != null; event = parser.getEvent()) {
                 switch (event.getEventId()) {
@@ -430,14 +431,18 @@ private Yaml.Documents parseFromInput(Path sourceFile, EncodingDetectingInputStr
                         break;
                     }
                     case StreamEnd: {
-                        String fmt = newLine + reader.prefix(lastEnd, event);
-                        if (document == null && !fmt.isEmpty()) {
-                            documents.add(
-                                    new Yaml.Document(
-                                            randomId(), fmt, Markers.EMPTY, false,
-                                            new Yaml.Mapping(randomId(), Markers.EMPTY, null, emptyList(), null, null, null),
-                                            new Yaml.Document.End(randomId(), "", Markers.EMPTY, false)
-                                    ));
+                        if (document == null) {
+                            String fmt = newLine + reader.prefix(lastEnd, event);
+                            if (!fmt.isEmpty()) {
+                                documents.add(
+                                        new Yaml.Document(
+                                                randomId(), fmt, Markers.EMPTY, false,
+                                                new Yaml.Mapping(randomId(), Markers.EMPTY, null, emptyList(), null, null, null),
+                                                new Yaml.Document.End(randomId(), "", Markers.EMPTY, false)
+                                        ));
+                            }
+                        } else {
+                            suffix = reader.prefix(lastEnd, event);
                         }
                         break;
                     }
@@ -446,7 +451,7 @@ private Yaml.Documents parseFromInput(Path sourceFile, EncodingDetectingInputStr
                 }
             }
 
-            Yaml.Documents result = new Yaml.Documents(randomId(), Markers.EMPTY, sourceFile, FileAttributes.fromPath(sourceFile), source.getCharset().name(), source.isCharsetBomMarked(), null, documents);
+            Yaml.Documents result = new Yaml.Documents(randomId(), Markers.EMPTY, sourceFile, FileAttributes.fromPath(sourceFile), source.getCharset().name(), source.isCharsetBomMarked(), null, suffix, documents);
             if (helmTemplateByUuid.isEmpty() && variableByUuid.isEmpty()) {
                 return result;
             }

rewrite-yaml/src/main/java/org/openrewrite/yaml/internal/YamlPrinter.java

@@ -29,6 +29,7 @@ public class YamlPrinter<P> extends YamlVisitor<PrintOutputCapture<P>> {
     public Yaml visitDocuments(Yaml.Documents documents, PrintOutputCapture<P> p) {
         visitMarkers(documents.getMarkers(), p);
         visit(documents.getDocuments(), p);
+        p.append(documents.getSuffix());
         afterSyntax(documents, p);
         return documents;
     }

rewrite-yaml/src/main/java/org/openrewrite/yaml/tree/Yaml.java

@@ -86,6 +86,9 @@ class Documents implements Yaml, SourceFileWithReferences {
         @Nullable
         Checksum checksum;
 
+        @Nullable
+        String suffix;
+
         @Override
         public Charset getCharset() {
             return charsetName == null ? StandardCharsets.UTF_8 : Charset.forName(charsetName);
@@ -106,7 +109,7 @@ public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
         @Override
         public Documents copyPaste() {
             return new Documents(randomId(), Markers.EMPTY,
-                    sourcePath, fileAttributes, charsetName, charsetBomMarked, checksum, documents.stream().map(Document::copyPaste).collect(toList()));
+                    sourcePath, fileAttributes, charsetName, charsetBomMarked, checksum, suffix, documents.stream().map(Document::copyPaste).collect(toList()));
         }
 
         /**

rewrite-yaml/src/test/java/org/openrewrite/yaml/YamlParserTest.java

@@ -22,6 +22,7 @@
 import org.openrewrite.Issue;
 import org.openrewrite.SourceFile;
 import org.openrewrite.test.RewriteTest;
+import org.openrewrite.test.SourceSpec;
 import org.openrewrite.tree.ParseError;
 import org.openrewrite.yaml.tree.Yaml;
 
@@ -465,6 +466,23 @@ void withAnchorSequenceOnRootLevel() {
         );
     }
 
+    @Issue("https://github.com/moderneinc/customer-requests/issues/1471")
+    @Test
+    void yamlWithDocumentEndMarker() {
+        rewriteRun(
+          yaml(
+            """
+              ---
+              applications:
+                - name: modified-app-name
+                  memory: 1G
+              ...
+              """,
+            SourceSpec::noTrim
+          )
+        );
+    }
+
     @Test
     void helmTemplateMatchingDocumentEndParsesCorrectly() {
         rewriteRun(