juledoc: fix handling of grouped variable declarations and comments

Author: mertcandav

builder/builder.jule

@@ -75,23 +75,16 @@ impl Builder {
 	}
 
 	fn formatMainNode(self, mut ast: &ast::AST, mut &i: int): str {
-		match type ast.Nodes[i].Data {
-		| &ast::Var:
-			// No-op:
-		|:
+		mut data, ok := ast.Nodes[i].Data.(&ast::Var)
+		if !ok {
 			ret self.formatNode(ast.Nodes[i])
 		}
 		// For variables, do not use plain node formatting.
 		// Variables may be grouped with a common documentation.
 		// Do not waste it.
 		self.fmt.buf.Clear()
 		{
-			data := ast.Nodes[i].Data.(&ast::Var)
-			// Format directly if data is grouped explicitly.
-			if data.Group != nil {
-				ret self.formatNode(ast.Nodes[i])
-			}
-			mut row := data.Token.Row
+			mut row := ast.Nodes[i].Token.Row
 			if len(data.Directives) > 0 {
 				row = data.Directives[0].Tag.Row
 			}
@@ -107,7 +100,11 @@ impl Builder {
 				}
 			}
 		})
-		i-- // Build function will advance the offset, avoid false offset.
+		// If variable is not grouped, the build function will advance the offset,
+		// avoid false offset.
+		if len(data.Group) == 0 {
+			i--
+		}
 		ret strings::TrimSpace(self.fmt.buf.Str())
 	}
 

builder/formatter.jule

@@ -809,6 +809,30 @@ impl formatter {
 			ret
 		}
 
+		// If group declaration used, fall-back to special group handling.
+		const match type T {
+		| &ast::Var:
+			const match type Node {
+			| &ast::Var:
+				if nodes[i].Group != nil {
+					self.varGroup(nodes[i])
+					ret
+				}
+			| ast::Node | ast::Stmt:
+				mut v, ok := nodes[i].Data.(T)
+				if ok && v.Group != nil {
+					self.varGroup(v)
+					ret
+				}
+			}
+		| ast::Node | ast::Stmt:
+			mut v, ok := nodes[i].Data.(&ast::Var)
+			if ok && v.Group != nil {
+				self.varGroup(v)
+				ret
+			}
+		}
+
 		const Cap = 1 << 4
 		mut lines := make([][]byte, 0, Cap)
 		mut rows := make([]int, 0, Cap)