Java: realign Javadoc cursor for stripped continuation-line whitespace

Java 23+ javac's `DCText`/`DCComment` `getBody()` strips per-line leading
whitespace that older versions preserved. The cleaned source still carries
that whitespace, so when an older parser (e.g. `rewrite-java-21`) runs on
a Java 25 JVM, `visitText` falls one character behind on every continuation
line — dropping the `*`-margin trailing space and emitting a duplicated
trailing char from the leftover-source branch in `visitDocComment`.

After consuming a `\n`, advance the cursor over any source whitespace that
the body lacks at the corresponding position. Mirrors what the Java 25
visitor already does inline.

Author: timtebeek

rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11JavadocVisitor.java

@@ -932,6 +932,16 @@ public List<Javadoc> visitText(String node) {
                 cursor++;
                 Javadoc.LineBreak lineBreak = lineBreaks.remove(cursor);
                 texts.add(lineBreak);
+
+                // Java 23+ javac's DCText/DCComment getBody() strips per-line leading whitespace that
+                // older versions preserved; the cleaned source still carries that whitespace, so realign
+                // cursor by appending any source whitespace before node's next non-whitespace character.
+                if (i + 1 < node.length() && !Character.isWhitespace(node.charAt(i + 1))) {
+                    while (cursor < source.length() && source.charAt(cursor) != '\n' && Character.isWhitespace(source.charAt(cursor))) {
+                        text.append(source.charAt(cursor));
+                        cursor++;
+                    }
+                }
             } else if (source.charAt(cursor) != c && (source.startsWith(unicodeEscaped(c), cursor) || source.startsWith(unicodeEscaped(c).toLowerCase(), cursor) )) {
                 int escapedCharLength = unicodeEscaped(c).length();
                 text.append(source, cursor, cursor + escapedCharLength);

rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17JavadocVisitor.java

@@ -934,6 +934,16 @@ public List<Javadoc> visitText(String node) {
                 cursor++;
                 Javadoc.LineBreak lineBreak = lineBreaks.remove(cursor);
                 texts.add(lineBreak);
+
+                // Java 23+ javac's DCText/DCComment getBody() strips per-line leading whitespace that
+                // older versions preserved; the cleaned source still carries that whitespace, so realign
+                // cursor by appending any source whitespace before node's next non-whitespace character.
+                if (i + 1 < node.length() && !Character.isWhitespace(node.charAt(i + 1))) {
+                    while (cursor < source.length() && source.charAt(cursor) != '\n' && Character.isWhitespace(source.charAt(cursor))) {
+                        text.append(source.charAt(cursor));
+                        cursor++;
+                    }
+                }
             } else if (source.charAt(cursor) != c && (source.startsWith(unicodeEscaped(c), cursor) || source.startsWith(unicodeEscaped(c).toLowerCase(), cursor) )) {
                 int escapedCharLength = unicodeEscaped(c).length();
                 text.append(source, cursor, cursor + escapedCharLength);

rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21JavadocVisitor.java

@@ -975,6 +975,16 @@ public List<Javadoc> visitText(String node) {
                 cursor++;
                 Javadoc.LineBreak lineBreak = lineBreaks.remove(cursor);
                 texts.add(lineBreak);
+
+                // Java 23+ javac's DCText/DCComment getBody() strips per-line leading whitespace that
+                // older versions preserved; the cleaned source still carries that whitespace, so realign
+                // cursor by appending any source whitespace before node's next non-whitespace character.
+                if (i + 1 < node.length() && !Character.isWhitespace(node.charAt(i + 1))) {
+                    while (cursor < source.length() && source.charAt(cursor) != '\n' && Character.isWhitespace(source.charAt(cursor))) {
+                        text.append(source.charAt(cursor));
+                        cursor++;
+                    }
+                }
             } else if (source.charAt(cursor) != c && (source.startsWith(unicodeEscaped(c), cursor) || source.startsWith(unicodeEscaped(c).toLowerCase(), cursor) )) {
                 int escapedCharLength = unicodeEscaped(c).length();
                 text.append(source, cursor, cursor + escapedCharLength);

rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8JavadocVisitor.java

@@ -870,6 +870,16 @@ public List<Javadoc> visitText(String node) {
                 cursor++;
                 Javadoc.LineBreak lineBreak = lineBreaks.remove(cursor);
                 texts.add(lineBreak);
+
+                // Java 23+ javac's DCText/DCComment getBody() strips per-line leading whitespace that
+                // older versions preserved; the cleaned source still carries that whitespace, so realign
+                // cursor by appending any source whitespace before node's next non-whitespace character.
+                if (i + 1 < node.length() && !Character.isWhitespace(node.charAt(i + 1))) {
+                    while (cursor < source.length() && source.charAt(cursor) != '\n' && Character.isWhitespace(source.charAt(cursor))) {
+                        text.append(source.charAt(cursor));
+                        cursor++;
+                    }
+                }
             } else if (source.charAt(cursor) != c && (source.startsWith(unicodeEscaped(c), cursor) || source.startsWith(unicodeEscaped(c).toLowerCase(), cursor) )) {
                 int escapedCharLength = unicodeEscaped(c).length();
                 text.append(source, cursor, cursor + escapedCharLength);

rewrite-java-tck/src/main/java/org/openrewrite/java/tree/JavadocTest.java

@@ -2231,6 +2231,58 @@ class Test {}
         );
     }
 
+    @Test
+    void plainAsciiJavadocRoundTrips() {
+        rewriteRun(
+          java(
+            """
+              /**
+               * This is a regular ASCII comment.
+               * No changes should be made here.
+               */
+              public class Example {
+                  /**
+                   * Another regular method comment.
+                   */
+                  public void regularMethod() {
+                  }
+              }
+              """
+          )
+        );
+    }
+
+    @Test
+    void plainNonAsciiJavadocRoundTrips() {
+        rewriteRun(
+          java(
+            """
+              /**
+               * Coração de leão.
+               * Mañana es otro día.
+               */
+              public class Example {
+              }
+              """
+          )
+        );
+    }
+
+    @Test
+    void htmlCommentFollowedByPlainTextInSameJavadoc() {
+        rewriteRun(
+          java(
+            """
+              /**
+               * <!-- inline html comment -->
+               * Following plain text on its own line.
+               */
+              class Test {}
+              """
+          )
+        );
+    }
+
     @Issue("https://github.com/openrewrite/rewrite/issues/5443")
     @Test
     void parsingIncorrectJavadocValueReference() {