Fix single-line comments.

lf-lang · Jun 20, 2023 · 300fb84 · 300fb84
1 parent eb30b90
commit 300fb84
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/core/src/main/java/org/lflang/ast/FormattingUtil.java b/core/src/main/java/org/lflang/ast/FormattingUtil.java
@@ -127,12 +127,13 @@ static String lineWrapComments(List<String> comments, int width, String singleLi
   }
   /** Wrap lines. Do not merge lines that start with weird characters. */
   private static String lineWrapComment(String comment, int width, String singleLineCommentPrefix) {
-    if (!MULTILINE_COMMENT.matcher(comment).matches()) return comment;
+    comment =
+            comment
+                    .strip()
+                    .replaceAll("^/?((\\*|//|#)\\s*)+", "");
+    if (!MULTILINE_COMMENT.matcher(comment).matches()) return comment.isBlank() ? "" : singleLineCommentPrefix + " " + comment;
     width = Math.max(width, MINIMUM_COMMENT_WIDTH_IN_COLUMNS);
-    var stripped =
-        comment
-            .strip()
-            .replaceAll("^/?((\\*|//|#)\\s*)+", "")
+    var stripped = comment
             .replaceAll("\\s*\\*/$", "")
             .replaceAll("(?<=(\\r\\n|\\r|\\n))\\h*(\\*|//|#)\\h?(\\h*)", "$3");
     var preformatted = false;