Fixing handling of trailing empty single-line comment (#5077)

openrewrite · Feb 21, 2025 · 217c918 · 217c918
1 parent 49855ca
commit 217c918
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 4 deletions.
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/Space.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/Space.java
@@ -225,7 +225,7 @@ public static Space format(String formatting) {
             last = c;
         }
 
-        if ((comment.length() > 0)) {
+        if ((comment.length() > 0) || inSingleLineComment) {
             comments.add(new Comment(inLineSlashOrHashComment, comment.toString(), prefix.toString(), Markers.EMPTY));
             prefix = new StringBuilder();
         }

diff --git a/rewrite-hcl/src/test/java/org/openrewrite/hcl/tree/HclCommentTest.java b/rewrite-hcl/src/test/java/org/openrewrite/hcl/tree/HclCommentTest.java
@@ -223,4 +223,18 @@ void emptyDoubleSlashCommentJustBeforeCurlyBraceEnd() {
           )
         );
     }
+
+    @Test
+    void emptySingleLineCommentAtTheEndOfTheFile() {
+        rewriteRun(
+          hcl(
+            """
+              module "something" {
+                source = "../else/"
+              }
+              //
+              """
+          )
+        );
+    }
 }
diff --git a/rewrite-json/src/main/java/org/openrewrite/json/tree/Space.java b/rewrite-json/src/main/java/org/openrewrite/json/tree/Space.java
@@ -221,7 +221,7 @@ public static Space format(String formatting, int beginIndex, int toIndex) {
             last = c;
         }
         // If a file ends with a single-line comment there may be no terminating newline
-        if (comment.length() > 0) {
+        if (comment.length() > 0 || inSingleLineComment) {
             comments.add(new Comment(false, comment.toString(), prefix.toString(), Markers.EMPTY));
             prefix.setLength(0);
         }

diff --git a/rewrite-json/src/test/java/org/openrewrite/json/JsonParserTest.java b/rewrite-json/src/test/java/org/openrewrite/json/JsonParserTest.java
@@ -39,7 +39,7 @@ public void defaults(RecipeSpec spec) {
     void parseJsonDocument() {
         rewriteRun(
           json(
-      """
+            """
             {
               // comments
               unquoted: 'and you can quote me on that',
@@ -50,6 +50,7 @@ void parseJsonDocument() {
               trailingComma: 'in objects', andIn: ['arrays',],
               "backwardsCompatible": "with JSON",
             }
+            //
             """
           )
         );

diff --git a/rewrite-toml/src/main/java/org/openrewrite/toml/tree/Space.java b/rewrite-toml/src/main/java/org/openrewrite/toml/tree/Space.java
@@ -189,7 +189,7 @@ public static Space format(String formatting, int beginIndex, int toIndex) {
             }
         }
         // If a file ends with a single-line comment there may be no terminating newline
-        if (comment.length() > 0) {
+        if (comment.length() > 0 || inSingleLineComment) {
             comments.add(new Comment(comment.toString(), prefix.toString(), Markers.EMPTY));
             prefix.setLength(0);
         }

diff --git a/rewrite-toml/src/test/java/org/openrewrite/toml/TomlParserTest.java b/rewrite-toml/src/test/java/org/openrewrite/toml/TomlParserTest.java
@@ -336,6 +336,18 @@ void trailingComment() {
         );
     }
 
+    @Test
+    void trailingEmptyComment() {
+        rewriteRun(
+          toml(
+              """
+              str = "I'm a string. \\"You can quote me\\". Name\\tJos\\u00E9\\nLocation\\tSF."
+              #
+              """
+          )
+        );
+    }
+
     @Test
     void multiBytesUnicode() {
         rewriteRun(