Comments cannot be parsed properly (#4624)

* Invalid comments cannot be properly parsed * Add more example * Format * Reduce testcase * Fixed bug with parsing multiline comments * Add continue * Assert the exact output comments expected * Restore break in ReloadableJava21ParserVisitor Likely accidentally removed --------- Co-authored-by: Niels de Bruin <[email protected]> Co-authored-by: Tim te Beek <[email protected]>
openrewrite · Oct 30, 2024 · ed1a481 · ed1a481
1 parent 6ba5a6d
commit ed1a481
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 6 deletions.
diff --git a/...te-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java b/...te-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java
@@ -1815,7 +1815,8 @@ private int positionOfNext(String untilDelim, @Nullable Character stop) {
                         case '*':
                             if(c2 == '/') {
                                 inMultiLineComment = false;
-                                delimIndex += 2;
+                                delimIndex++;
+                                continue;
                             }
                             break;
                     }

diff --git a/...te-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java b/...te-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java
@@ -1903,7 +1903,8 @@ private int positionOfNext(String untilDelim, @Nullable Character stop) {
                         case '*':
                             if (c2 == '/') {
                                 inMultiLineComment = false;
-                                delimIndex += 2;
+                                delimIndex++;
+                                continue;
                             }
                             break;
                     }

diff --git a/...te-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21ParserVisitor.java b/...te-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21ParserVisitor.java
@@ -1900,7 +1900,8 @@ private int positionOfNext(String untilDelim, @Nullable Character stop) {
                         case '*':
                             if (c2 == '/') {
                                 inMultiLineComment = false;
-                                delimIndex += 2;
+                                delimIndex++;
+                                continue;
                             }
                             break;
                     }

diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java
@@ -1808,7 +1808,8 @@ private int positionOfNext(String untilDelim, @Nullable Character stop) {
                         case '*':
                             if(c2 == '/') {
                                 inMultiLineComment = false;
-                                delimIndex += 2;
+                                delimIndex++;
+                                continue;
                             }
                             break;
                     }

diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/JavaParserTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/JavaParserTest.java
@@ -154,15 +154,64 @@ void shouldResolvePathUsingPublicClasses(@Language("java") String source) {
         rewriteRun(
           java(
             source,
-            spec -> spec.afterRecipe(cu -> assertThat(cu.getSourcePath()).isEqualTo(Path.of("my","example","PublicClass.java")))
+            spec -> spec.afterRecipe(cu -> assertThat(cu.getSourcePath()).isEqualTo(Path.of("my", "example", "PublicClass.java")))
           )
         );
     }
 
     @Test
     @Issue("https://github.com/openrewrite/rewrite/issues/1895")
-    void moduleInfo(){
+    void moduleInfo() {
         // Ignored until properly handled: https://github.com/openrewrite/rewrite/issues/4054#issuecomment-2267605739
         assertFalse(JavaParser.fromJavaVersion().build().accept(Path.of("src/main/java/foo/module-info.java")));
     }
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/pull/4624")
+    void shouldParseComments() {
+        rewriteRun(
+          java(
+            """
+              class A {
+                  /*
+                   * public Some getOther() { return other; }
+                   *
+                   *//**
+                   * Sets the value of the other property.
+                   *
+                   * @param value allowed object is {@link Some }
+                   *
+                   *//*
+                   * public void setOther(Some value) { this.other =
+                   * value; }
+                   */
+              }
+              """,
+            spec -> spec.afterRecipe(cu -> assertThat(cu.getClasses().get(0).getBody().getEnd().getComments())
+              .extracting("text")
+              .containsExactly(
+                """
+                  
+                       * public Some getOther() { return other; }
+                       *
+                       \
+                  """,
+                """
+                  *
+                       * Sets the value of the other property.
+                       *
+                       * @param value allowed object is {@link Some }
+                       *
+                       \
+                  """,
+                """
+                  
+                       * public void setOther(Some value) { this.other =
+                       * value; }
+                       \
+                  """
+              ))
+          )
+        );
+    }
 }