Fix PlainTextParser conversion marker handling (#6157)

* Fixed an issue where conversion would print markers to the text result + to the commit keeping Markup markers present

* Fixed an issue where conversion would print markers to the text result + to the commit keeping Markup markers present

* Minor polish

* Change copyright year in PlainTextParserConversionTest

Updated copyright year from 2024 to 2025.

---------

Co-authored-by: Tim te Beek <tim@moderne.io>

Author: Jenson3210

rewrite-core/src/main/java/org/openrewrite/text/FindAndReplace.java

@@ -155,7 +155,7 @@ public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
 
                 return plainText
                         .withText(newText)
-                        .withMarkers(sourceFile.getMarkers().add(new AlreadyReplaced(randomId(), find, replace)));
+                        .withMarkers(plainText.getMarkers().add(new AlreadyReplaced(randomId(), find, replace)));
             }
         };
 
@@ -173,5 +173,4 @@ public PlainText visitText(PlainText text, ExecutionContext ctx) {
         }
         return visitor;
     }
-
 }

rewrite-core/src/main/java/org/openrewrite/text/PlainTextParser.java

@@ -16,11 +16,12 @@
 package org.openrewrite.text;
 
 import org.jspecify.annotations.Nullable;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Parser;
-import org.openrewrite.SourceFile;
+import org.openrewrite.*;
 import org.openrewrite.internal.EncodingDetectingInputStream;
 import org.openrewrite.jgit.diff.RawText;
+import org.openrewrite.marker.Marker;
+import org.openrewrite.marker.Markup;
+import org.openrewrite.marker.SearchResult;
 import org.openrewrite.tree.ParseError;
 import org.openrewrite.tree.ParsingEventListener;
 import org.openrewrite.tree.ParsingExecutionContextView;
@@ -32,7 +33,9 @@
 import java.nio.file.Path;
 import java.nio.file.PathMatcher;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
@@ -52,13 +55,14 @@ public static PlainText convert(SourceFile sourceFile) {
             return (PlainText) sourceFile;
         }
         PlainText text = PlainTextParser.builder().build()
-                .parse(sourceFile.printAll())
+                .parse(sourceFile.printAll(new PrintOutputCapture<>(0, PrintOutputCapture.MarkerPrinter.SANITIZED)))
                 .findFirst()
                 .orElseThrow(() -> new IllegalStateException("Failed to parse as plain text"))
                 .withSourcePath(sourceFile.getSourcePath())
                 .withFileAttributes(sourceFile.getFileAttributes())
                 .withCharsetBomMarked(sourceFile.isCharsetBomMarked())
-                .withId(sourceFile.getId());
+                .withId(sourceFile.getId())
+                .withMarkers(sourceFile.getMarkers().withMarkers(gatherMarkers(sourceFile)));
         if (sourceFile.getCharset() != null) {
             text = (PlainText) text.withCharset(sourceFile.getCharset());
         }
@@ -156,4 +160,20 @@ public String getDslName() {
             return "text";
         }
     }
+
+    private static List<Marker> gatherMarkers(SourceFile sourceFile) {
+        return new TreeVisitor<Tree, List<Marker>>() {
+            @Override
+            public @Nullable Tree visit(@Nullable Tree tree, List<Marker> markers) {
+                if (tree != null && tree != sourceFile) {
+                    tree.getMarkers().getMarkers().forEach(marker -> {
+                        if (marker instanceof SearchResult || marker instanceof Markup) {
+                            markers.add(marker);
+                        }
+                    });
+                }
+                return super.visit(tree, markers);
+            }
+        }.reduce(sourceFile, new ArrayList<>(sourceFile.getMarkers().getMarkers()));
+    }
 }

rewrite-java/src/test/java/org/openrewrite/java/PlainTextParserConversionTest.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2025 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.SourceFile;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.marker.AlreadyReplaced;
+import org.openrewrite.marker.Markup;
+import org.openrewrite.marker.RecipesThatMadeChanges;
+import org.openrewrite.test.RewriteTest;
+import org.openrewrite.text.FindAndReplace;
+import org.openrewrite.text.PlainText;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.openrewrite.java.Assertions.java;
+import static org.openrewrite.test.RewriteTest.toRecipe;
+
+class PlainTextParserConversionTest implements RewriteTest {
+
+    private static final Recipe markClassDeclaration = toRecipe(() -> new JavaVisitor<>() {
+        @Override
+        public J visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
+            return Markup.info(classDecl, "test");
+        }
+    });
+
+    @DocumentExample
+    @Test
+    void markersAreAddedWhenConvertingToTextLst() {
+        rewriteRun(
+          spec -> {
+              spec.afterRecipe(run -> {
+                  SourceFile result = run.getChangeset().getAllResults().getFirst().getAfter();
+                  assertThat(result).isInstanceOf(PlainText.class);
+                  assertThat(result.getMarkers().getMarkers()).hasSize(3);
+                  assertThat(result.getMarkers().findAll(AlreadyReplaced.class)).isNotEmpty();
+                  assertThat(result.getMarkers().findAll(Markup.class)).isNotEmpty();
+                  assertThat(result.getMarkers().findFirst(RecipesThatMadeChanges.class).get().getRecipes()).hasSize(2);
+              });
+              spec.recipes(markClassDeclaration, new FindAndReplace("class", "public class", null, null, null, null, null, null));
+          },
+          java(
+            """
+              package com.example;
+              
+              class Test {
+              }
+              """,
+            """
+              ~~(test)~~>package com.example;
+              
+              public class Test {
+              }
+              """
+          )
+        );
+    }
+
+    @Test
+    void markersAreKeptWhenNoConversionToTextLst() {
+        rewriteRun(
+          spec ->
+            spec.recipes(markClassDeclaration, new FindAndReplace("doesNotExist", "willNotAppear", null, null, null, null, null, null)),
+          java(
+            """
+              package com.example;
+              
+              class Test {
+              }
+              """,
+            """
+              package com.example;
+              
+              /*~~(test)~~>*/class Test {
+              }
+              """
+          )
+        );
+    }
+}