juledoc: update to latest julefmt formatting

Author: mertcandav

builder/formatter.jule

@@ -192,10 +192,10 @@ impl formatter {
 		}
 	}
 
-	fn popRowCommentsByF(&self, row: int, col: int, buf: bool, f: fn(&comment)) {
+	fn popRowCommentsByF(&self, row: int, col: int, buf: bool, f: fn(mut &comment)) {
 		mut i := 0
 		for i < len(self.cm.buf) {
-			c := self.cm.buf[i]
+			mut c := self.cm.buf[i]
 			if c.row == row && (col == -1 || c.col < col) {
 				if buf {
 					f(c)
@@ -772,17 +772,17 @@ impl formatter {
 		}
 	}
 
-	fn getMax(self, lines: [][]byte, rows: []int): (max: int, n: int) {
+	fn getMax(self, lines: [][]byte, rows: []int, comments: [][]&comment): (max: int, n: int) {
 		if len(lines) == 0 || len(rows) == 0 {
 			ret 0, 0
 		}
-		if !self.isPopsRowCommentsByF(rows[0], -1) {
+		if len(comments[0]) == 0 {
 			ret
 		}
 		max = utf8::RuneCount(lines[0])
 		n = 1
 		for n < len(lines); n++ {
-			if rows[n-1] == rows[n] || !self.isPopsRowCommentsByF(rows[n], -1) {
+			if rows[n-1] == rows[n] || len(comments[n]) == 0 {
 				break
 			}
 			diff := utf8::RuneCount(lines[n])
@@ -797,6 +797,7 @@ impl formatter {
 	fn fieldGroupDecls(&self, mut fields: []&field, mut &i: int): (wr: bool) {
 		mut lines := make([][]byte, 0, len(fields))
 		mut rows := make([]int, 0, len(fields))
+		mut comments := make([][]&comment, 0, len(fields))
 
 		mut start := i
 		self.row = -1
@@ -831,6 +832,12 @@ impl formatter {
 			if row != -1 && decl.token.Row != self.row {
 				break
 			}
+			mut rowComments := make([]&comment, 0)
+			mut &_rowComments := rowComments // for closure
+			self.popRowCommentsByF(decl.token.Row, -1, true, fn(mut c: &comment) {
+				unsafe { _rowComments = append(_rowComments, c) }
+			})
+			comments = append(comments, rowComments)
 			rows = append(rows, decl.token.Row)
 			if fm > fieldMax {
 				fieldMax = fm
@@ -866,13 +873,15 @@ impl formatter {
 			// to last statement of inline statements.
 			if len(lines)-k < 2 || rows[k] != rows[k+1] {
 				if n == 0 {
-					max, n = self.getMax(lines[k:], rows[k:])
+					max, n = self.getMax(lines[k:], rows[k:], comments[k:])
 				}
 				if n > 0 {
-					self.popRowCommentsByF(row, -1, isPub, fn(c: &comment) {
-						self.write(strings::Repeat(" ", paddingAbs(max-utf8::RuneCount(line))+1))
-						self.writeComment(c)
-					})
+					if isPub {
+						for _, c in comments[k] {
+							self.write(strings::Repeat(" ", paddingAbs(max-utf8::RuneCount(line))+1))
+							self.writeComment(c)
+						}
+					}
 					n--
 				}
 			}
@@ -889,6 +898,7 @@ impl formatter {
 		mut lines := make([][]byte, 0, len(vars[i:]))
 		mut rows := make([]int, 0, len(vars[i:]))
 		mut counts := make([][2]int, 0, len(vars[i:]))
+		mut comments := make([][]&comment, 0, len(vars[i:]))
 
 		start := i
 		mut n := self.buf.Len()
@@ -1027,6 +1037,21 @@ impl formatter {
 			rows = append(rows, self.row)
 			self.setBuf(self.ubuf()[:n])
 		}
+
+		// Collects comments separately.
+		// For line collection, they are needed.
+		n = 0
+		z = start
+		for z < i; z++ {
+			mut rowComments := make([]&comment, 0)
+			mut &_rowComments := rowComments // for closure
+			self.popRowCommentsByF(rows[n], -1, true, fn(mut c: &comment) {
+				unsafe { _rowComments = append(_rowComments, c) }
+			})
+			comments = append(comments, rowComments)
+			n++
+		}
+
 		n = 0
 		mut max := 0
 		mut rowBreak := indexRowBrake(rows)
@@ -1047,13 +1072,15 @@ impl formatter {
 			// to last statement of inline statements.
 			if len(lines)-j < 2 || rows[j] != rows[j+1] {
 				if n == 0 {
-					max, n = self.getMax(lines[j:rowBreak], rows[j:rowBreak])
+					max, n = self.getMax(lines[j:rowBreak], rows[j:rowBreak], comments[j:rowBreak])
 				}
 				if n > 0 {
-					self.popRowCommentsByF(row, -1, isPub, fn(c: &comment) {
-						self.write(strings::Repeat(" ", paddingAbs(max-utf8::RuneCount(line))+1))
-						self.writeComment(c)
-					})
+					if isPub {
+						for _, c in comments[j] {
+							self.write(strings::Repeat(" ", paddingAbs(max-utf8::RuneCount(line))+1))
+							self.writeComment(c)
+						}
+					}
 					n--
 				}
 			}
@@ -1117,6 +1144,7 @@ impl formatter {
 		const Cap = 1 << 4
 		mut lines := make([][]byte, 0, Cap)
 		mut rows := make([]int, 0, Cap)
+		mut comments := make([][]&comment, 0, Cap)
 
 		all := i == -1
 		if all {
@@ -1153,6 +1181,12 @@ impl formatter {
 			writer(decl)
 			mut line := cloneBuf(self.ubuf()[n:])
 			lines = append(lines, line)
+			mut rowComments := make([]&comment, 0)
+			mut &_rowComments := rowComments // for closure
+			self.popRowCommentsByF(row, -1, true, fn(mut c: &comment) {
+				unsafe { _rowComments = append(_rowComments, c) }
+			})
+			comments = append(comments, rowComments)
 			rows = append(rows, self.row)
 			self.setBuf(self.ubuf()[:n])
 			i++
@@ -1168,9 +1202,7 @@ impl formatter {
 		n = 0
 		mut max := 0
 		for j, line in lines {
-			row := rows[j]
 			wr := len(line) > 0 // Do not write empty lines.
-			self.writeCommentsExcept(row, wr)
 			if wr {
 				self.buf.Write(line)!
 			}
@@ -1179,13 +1211,15 @@ impl formatter {
 			// to last statement of inline statements.
 			if len(lines)-j < 2 || rows[j] != rows[j+1] {
 				if n == 0 {
-					max, n = self.getMax(lines[j:], rows[j:])
+					max, n = self.getMax(lines[j:], rows[j:], comments[j:])
 				}
 				if n > 0 {
-					self.popRowCommentsByF(row, -1, wr, fn(c: &comment) {
-						self.write(strings::Repeat(" ", paddingAbs(max-utf8::RuneCount(line))+1))
-						self.writeComment(c)
-					})
+					if wr {
+						for _, c in comments[j] {
+							self.write(strings::Repeat(" ", paddingAbs(max-utf8::RuneCount(line))+1))
+							self.writeComment(c)
+						}
+					}
 					n--
 				}
 			}