Avoid trailing blanks in SingleLineComment (#3589)

Fixes #3588.
openrewrite · Oct 1, 2023 · e900928 · e900928
1 parent 8e76a43
commit e900928
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/format/SingleLineCommentsTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/format/SingleLineCommentsTest.java
@@ -47,4 +47,17 @@ class Test {
           )
         );
     }
+
+    @Test
+    void emptyCommentLineDoesNotGetTrailingBlank() {
+        rewriteRun(
+          java(
+            """
+              // Copyright
+              //
+              // Some long license text
+              """
+          )
+        );
+    }
 }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/SingleLineComments.java b/rewrite-java/src/main/java/org/openrewrite/java/format/SingleLineComments.java
@@ -42,8 +42,9 @@ public Space visitSpace(Space space, Space.Location loc, ExecutionContext ctx) {
                 return space.withComments(ListUtils.map(space.getComments(), c -> {
                     if (!c.isMultiline()) {
                         TextComment tc = (TextComment) c;
-                        if (!tc.getText().startsWith(" ")) {
-                            return tc.withText(" " + tc.getText());
+                        String commentText = tc.getText();
+                        if (!commentText.isEmpty() && !commentText.startsWith(" ")) {
+                            return tc.withText(" " + commentText);
                         }
                     }
                     return c;