fix formatting multiline comments

rivet-lang · Dec 5, 2023 · 64c6f21 · 64c6f21
1 parent d467b70
commit 64c6f21
Showing 1 changed file with 14 additions and 21 deletions.
diff --git a/lib/rivet/src/fmt/comments.ri b/lib/rivet/src/fmt/comments.ri
@@ -41,29 +41,22 @@ extend Formatter {
                 self.writeln();
             }
         } else {
-            lines := comment.text.trim_space().split_into_lines();
-            start_break := comment.text[0].is_alnum() or comment.text[0].is_space();
-            end_break := {
-                trimmed_bytes := comment.text.trim("\t").as_bytes();
-                trimmed_bytes[trimmed_bytes.len - 1].is_alnum()
-            } or {
-                bytes := comment.text.as_bytes();
-                bytes[bytes.len - 1].is_space()
-            };
+            lines := comment.text.split_into_lines();
             self.write("/*");
-            if start_break {
-                self.writeln();
-            }
-            for line in lines {
-                self.writeln(line.trim_right(" "));
-                self.empty_line = false;
-            }
-            if end_break {
-                self.empty_line = true;
-            } else {
-                _ = self.remove_new_line();
+            for i, line in lines {
+                if i == lines.len - 1 {
+                    self.empty_line = true;
+                    if comment.text[comment.text.len - 1] == b'\n' {
+                        self.writeln(line);
+                    } else {
+                        self.write(line);
+                    }
+                    self.write("*/");
+                } else {
+                    self.empty_line = false;
+                    self.writeln(line.trim_right(" "));
+                }
             }
-            self.write("*/");
         }
         if level == .Indent {
             self.indent -= 1;