julefmt: minor improvements

julelang · Mar 25, 2024 · 51166f6 · 51166f6
1 parent 45b1d79
commit 51166f6
Showing 1 changed file with 40 additions and 34 deletions.
diff --git a/src/format.jule b/src/format.jule
@@ -45,6 +45,33 @@ impl Formatter {
         self.indent = self.indent[:self.indent.len - 4]
     }
 
+    fn write_comment(&self, &c: &Comment) {
+        if self.indent.len > 0 && c.txt[1] == '*' {
+            // Range comment should be checked.
+            // Endind is should be padded by indentation.
+            let mut i = c.txt.len - 3
+        lookup:
+            for i > 1; i-- {
+                let b = c.txt[i]
+                match b {
+                | ' ' | '\t' | '\v' | '\r':
+                    continue
+                | '\n':
+                    let cmt = c.txt[:i + 1]
+                    i = strings::find_last(self.buf, "\n")
+                    let n = self.buf.len - i - 1
+                    self.write(cmt)
+                    self.write(strings::repeat(" ", n))
+                    self.write("*/")
+                    ret
+                |:
+                    break lookup
+                }
+            }
+        }
+        self.write(c.txt)
+    }
+
     fn write_comments_except(&self, row: int): int {
         let mut lrow = row
         for {
@@ -58,28 +85,7 @@ impl Formatter {
             lrow = c.row
             self.cm.drop_first()
             self.write(self.indent)
-            if self.indent.len > 0 && c.txt[1] == '*' {
-                // Range comment should be checked.
-                // Endind is should be padded by indentation.
-                let mut i = c.txt.len - 3
-            lookup:
-                for i > 1; i-- {
-                    let b = c.txt[i]
-                    match b {
-                    | ' ' | '\t' | '\v' | '\r':
-                        continue
-                    | '\n':
-                        self.write(c.txt[:i + 1])
-                        self.write(self.indent)
-                        self.write("*/")
-                        goto end
-                    |:
-                        break lookup
-                    }
-                }
-            }
-            self.write(c.txt)
-        end:
+            self.write_comment(c)
             self.write("\n")
         }
         ret lrow
@@ -399,7 +405,7 @@ impl Formatter {
             let c = self.cm.pop(m.token.row)
             if c != nil {
                 self.write(" ")
-                self.write(c.txt)
+                self.write_comment(c)
             }
             self.write("\n")
         }
@@ -507,7 +513,7 @@ impl Formatter {
             if c != nil && c.row == row {
                 self.cm.drop_first()
                 self.write(strings::repeat(" ", max - line.len + 1))
-                self.write(c.txt)
+                self.write_comment(c)
             }
             self.write("\n")
             start++
@@ -572,7 +578,7 @@ impl Formatter {
             if c != nil && c.row == row {
                 self.cm.drop_first()
                 self.write(strings::repeat(" ", max - line.len + 1))
-                self.write(c.txt)
+                self.write_comment(c)
             }
             self.write("\n")
             start++
@@ -938,7 +944,7 @@ impl ScopeFormatter {
                     let c = self.fmt.cm.pop(row)
                     if c != nil {
                         self.write(" ")
-                        self.write(c.txt)
+                        self.fmt.write_comment(c)
                     }
                 }
                 self.fmt.write_comments_except(expr.token.row)
@@ -958,7 +964,7 @@ impl ScopeFormatter {
             let cmt = self.fmt.cm.pop(row)
             if cmt != nil {
                 self.write(" ")
-                self.write(cmt.txt)
+                self.fmt.write_comment(cmt)
             }
             self.write("\n")
             self.fmt.add_indent()
@@ -1092,7 +1098,7 @@ impl ScopeFormatter {
                 let c = self.fmt.cm.pop(stmt.token.row)
                 if c != nil {
                     self.write(" ")
-                    self.write(c.txt)
+                    self.fmt.write_comment(c)
                 }
             }
             if old != i {
@@ -1230,12 +1236,12 @@ impl ExprFormatter {
                 let c = self.fmt.cm.pop(row)
                 if c != nil {
                     self.write(" ")
-                    self.write(c.txt)
+                    self.fmt.write_comment(c)
                 }
                 self.write("\n")
                 self.write(self.fmt.indent)
                 row = arg.token.row
-            } else {
+            } else if i > 0 {
                 self.write(" ")
             }
             self.format(arg)
@@ -1258,7 +1264,7 @@ impl ExprFormatter {
             let c = self.fmt.cm.pop(f.args[f.args.len - 1].token.row)
             if c != nil {
                 self.write(" ")
-                self.write(c.txt)
+                self.fmt.write_comment(c)
             }
         }
         if f.ignored() {
@@ -1363,7 +1369,7 @@ impl ExprFormatter {
                 let c = self.fmt.cm.pop(expr.token.row)
                 if c != nil {
                     self.write(strings::repeat(" ", max - exprs[j].len + 1))
-                    self.write(c.txt)
+                    self.fmt.write_comment(c)
                 }
                 j++
             }
@@ -1387,7 +1393,7 @@ impl ExprFormatter {
         let c = self.fmt.cm.pop(lit.token.row)
         if c != nil {
             self.write(" ")
-            self.write(c.txt)
+            self.fmt.write_comment(c)
         }
     }
 
@@ -1404,7 +1410,7 @@ impl ExprFormatter {
         let c = self.fmt.cm.pop(s.token.row)
         if c != nil {
             self.write(" ")
-            self.write(c.txt)
+            self.fmt.write_comment(c)
         }
     }