@@ -293,6 +293,8 @@ pub fn (f Fmt) imp_stmt_str(imp ast.Import) string {
293293 return '$imp.mod$imp_alias_suffix '
294294}
295295
296+ // === Node helpers ===//
297+
296298fn (f Fmt) should_insert_newline_before_node (node ast.Node, prev_node ast.Node) bool {
297299 // No need to insert a newline if there is already one
298300 if f.out.last_n (2 ) == '\n\n ' {
@@ -345,6 +347,22 @@ fn (f Fmt) should_insert_newline_before_node(node ast.Node, prev_node ast.Node)
345347 return true
346348}
347349
350+ pub fn (mut f Fmt) node_str (node ast.Node) string {
351+ was_empty_line := f.empty_line
352+ prev_line_len := f.line_len
353+ pos := f.out.len
354+ match node {
355+ ast.Stmt { f.stmt (node) }
356+ ast.Expr { f.expr (node) }
357+ else { panic ('´f.node_str()´ is not implemented for ${node} .' ) }
358+ }
359+ str := f.out.after (pos).trim_space ()
360+ f.out.go_back_to (pos)
361+ f.empty_line = was_empty_line
362+ f.line_len = prev_line_len
363+ return str
364+ }
365+
348366// === General Stmt-related methods and helpers ===//
349367
350368pub fn (mut f Fmt) stmts (stmts []ast.Stmt) {
@@ -456,18 +474,6 @@ fn stmt_is_single_line(stmt ast.Stmt) bool {
456474 }
457475}
458476
459- pub fn (mut f Fmt) stmt_str (node ast.Stmt) string {
460- was_empty_line := f.empty_line
461- prev_line_len := f.line_len
462- pos := f.out.len
463- f.stmt (node)
464- str := f.out.after (pos).trim_space ()
465- f.out.go_back_to (pos)
466- f.empty_line = was_empty_line
467- f.line_len = prev_line_len
468- return str
469- }
470-
471477// === General Expr-related methods and helpers ===//
472478
473479pub fn (mut f Fmt) expr (node ast.Expr) {
@@ -622,20 +628,14 @@ pub fn (mut f Fmt) expr(node ast.Expr) {
622628
623629fn expr_is_single_line (expr ast.Expr) bool {
624630 match expr {
631+ ast.Comment, ast.IfExpr, ast.MapInit, ast.MatchExpr {
632+ return false
633+ }
625634 ast.AnonFn {
626635 if ! expr.decl.no_body {
627636 return false
628637 }
629638 }
630- ast.IfExpr {
631- return false
632- }
633- ast.Comment {
634- return false
635- }
636- ast.MatchExpr {
637- return false
638- }
639639 ast.StructInit {
640640 if ! expr.is_short && (expr.fields.len > 0 || expr.pre_comments.len > 0 ) {
641641 return false
@@ -1399,15 +1399,32 @@ pub fn (mut f Fmt) array_init(node ast.ArrayInit) {
13991399 penalty--
14001400 }
14011401 }
1402- is_new_line := f.wrap_long_line (penalty, ! inc_indent)
1402+ mut is_new_line := f.wrap_long_line (penalty, ! inc_indent)
14031403 if is_new_line && ! inc_indent {
14041404 f.indent++
14051405 inc_indent = true
14061406 }
1407- if ! is_new_line && i > 0 {
1408- f.write (' ' )
1407+ single_line_expr := expr_is_single_line (expr)
1408+ if single_line_expr {
1409+ estr := f.node_str (expr)
1410+ if ! is_new_line && ! f.buffering && f.line_len + estr.len > fmt.max_len.last () {
1411+ f.writeln ('' )
1412+ is_new_line = true
1413+ if ! inc_indent {
1414+ f.indent++
1415+ inc_indent = true
1416+ }
1417+ }
1418+ if ! is_new_line && i > 0 {
1419+ f.write (' ' )
1420+ }
1421+ f.write (estr)
1422+ } else {
1423+ if ! is_new_line && i > 0 {
1424+ f.write (' ' )
1425+ }
1426+ f.expr (expr)
14091427 }
1410- f.expr (expr)
14111428 if i < node.ecmnts.len && node.ecmnts[i].len > 0 {
14121429 expr_pos := expr.position ()
14131430 for cmt in node.ecmnts[i] {
@@ -2089,7 +2106,7 @@ pub fn (mut f Fmt) or_expr(node ast.OrExpr) {
20892106 } else if node.stmts.len == 1 && stmt_is_single_line (node.stmts[0 ]) {
20902107 // the control stmts (return/break/continue...) print a newline inside them,
20912108 // so, since this'll all be on one line, trim any possible whitespace
2092- str := f.stmt_str (node.stmts[0 ]).trim_space ()
2109+ str := f.node_str (node.stmts[0 ]).trim_space ()
20932110 single_line := ' or { $str }'
20942111 if single_line.len + f.line_len < = fmt.max_len.last () {
20952112 f.write (single_line)
0 commit comments