diff --git a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11JavadocVisitor.java b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11JavadocVisitor.java index 7be5a964e8..852262dcb3 100644 --- a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11JavadocVisitor.java +++ b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11JavadocVisitor.java @@ -1158,6 +1158,8 @@ private List convertMultiline(List dts) { js.addAll(whitespaceBefore()); if (dt instanceof DCTree.DCText) { js.addAll(visitText(((DCTree.DCText) dt).getBody())); + } else if (dt instanceof DCTree.DCComment) { + js.addAll(visitText(((DCTree.DCComment) dt).getBody())); } else { js.add((Javadoc) scan(dt, emptyList())); } diff --git a/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17JavadocVisitor.java b/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17JavadocVisitor.java index 5d2020ce61..be93916fd0 100644 --- a/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17JavadocVisitor.java +++ b/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17JavadocVisitor.java @@ -1161,6 +1161,8 @@ private List convertMultiline(List dts) { js.addAll(whitespaceBefore()); if (dt instanceof DCTree.DCText) { js.addAll(visitText(((DCTree.DCText) dt).getBody())); + } else if (dt instanceof DCTree.DCComment) { + js.addAll(visitText(((DCTree.DCComment) dt).getBody())); } else { js.add((Javadoc) scan(dt, emptyList())); } diff --git a/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21JavadocVisitor.java b/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21JavadocVisitor.java index 51dc244a24..0899cc509c 100644 --- a/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21JavadocVisitor.java +++ b/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21JavadocVisitor.java @@ -1196,6 +1196,8 @@ private List convertMultiline(List dts) { js.addAll(whitespaceBefore()); if (dt instanceof DCTree.DCText) { js.addAll(visitText(((DCTree.DCText) dt).getBody())); + } else if (dt instanceof DCTree.DCComment) { + js.addAll(visitText(((DCTree.DCComment) dt).getBody())); } else { js.add((Javadoc) scan(dt, emptyList())); } diff --git a/rewrite-java-25/src/main/java/org/openrewrite/java/isolated/ReloadableJava25JavadocVisitor.java b/rewrite-java-25/src/main/java/org/openrewrite/java/isolated/ReloadableJava25JavadocVisitor.java index a1ba0c5d17..9cc0793f80 100644 --- a/rewrite-java-25/src/main/java/org/openrewrite/java/isolated/ReloadableJava25JavadocVisitor.java +++ b/rewrite-java-25/src/main/java/org/openrewrite/java/isolated/ReloadableJava25JavadocVisitor.java @@ -1339,6 +1339,8 @@ private List convertMultiline(List dts) { js.addAll(visitText(textNode.getBody())); } else if (dt instanceof DCTree.DCRawText rawTextNode) { js.addAll(visitText(rawTextNode.getContent())); + } else if (dt instanceof DCTree.DCComment commentNode) { + js.addAll(visitText(commentNode.getBody())); } else { js.add((Javadoc) scan(dt, emptyList())); } diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8JavadocVisitor.java b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8JavadocVisitor.java index 74ab88307a..f7402c0b86 100644 --- a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8JavadocVisitor.java +++ b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8JavadocVisitor.java @@ -1086,6 +1086,8 @@ private List convertMultiline(List dts) { js.addAll(whitespaceBefore()); if (dt instanceof DCTree.DCText) { js.addAll(visitText(((DCTree.DCText) dt).getBody())); + } else if (dt instanceof DCTree.DCComment) { + js.addAll(visitText(((DCTree.DCComment) dt).getBody())); } else { js.add((Javadoc) scan(dt, emptyList())); } diff --git a/rewrite-java-tck/src/main/java/org/openrewrite/java/tree/JavadocTest.java b/rewrite-java-tck/src/main/java/org/openrewrite/java/tree/JavadocTest.java index c020151dea..f6c881fdf0 100644 --- a/rewrite-java-tck/src/main/java/org/openrewrite/java/tree/JavadocTest.java +++ b/rewrite-java-tck/src/main/java/org/openrewrite/java/tree/JavadocTest.java @@ -2214,6 +2214,23 @@ class Test { ); } + @Test + void multilineHtmlCommentInBlockTag() { + rewriteRun( + java( + """ + /** + * @version 0.1 + * + **/ + class Test {} + """ + ) + ); + } + @Issue("https://github.com/openrewrite/rewrite/issues/5443") @Test void parsingIncorrectJavadocValueReference() {