ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

force all enums newlined if there is more than one line

Browse Source
This commit is contained in:
Daniel Gavin
2021-04-23 23:42:53 +02:00
parent 5fba548aa0
commit 87bfd31664
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/odin/printer/printer.odin
+1 -1
View File
@@ -24,7 +24,7 @@ Line :: struct {
} }
/* /*
Represents an singular token in a unwrapped line Represents a singular token in a unwrapped line
*/ */
Format_Token :: struct { Format_Token :: struct {
kind: tokenizer.Token_Kind, kind: tokenizer.Token_Kind,
core/odin/printer/visit.odin
+12 -5
View File
@@ -476,7 +476,7 @@ visit_decl :: proc(p: ^Printer, decl: ^ast.Decl, called_in_stmt := false) {
} }
@(private) @(private)
visit_exprs :: proc(p: ^Printer, list: []^ast.Expr, add_comma := false, trailing := false) { visit_exprs :: proc(p: ^Printer, list: []^ast.Expr, add_comma := false, trailing := false, force_newline := false) {
if len(list) == 0 { if len(list) == 0 {
return; return;
@@ -484,9 +484,12 @@ visit_exprs :: proc(p: ^Printer, list: []^ast.Expr, add_comma := false, trailing
//we have to newline the expressions to respect the source //we have to newline the expressions to respect the source
for expr, i in list { for expr, i in list {
//Don't move the first expression, it looks bad //Don't move the first expression, it looks bad
if i != 0 { if i != 0 && force_newline {
newline_position(p, 1);
}
else if i != 0 {
move_line_limit(p, expr.pos, 1); move_line_limit(p, expr.pos, 1);
} }
@@ -496,6 +499,10 @@ visit_exprs :: proc(p: ^Printer, list: []^ast.Expr, add_comma := false, trailing
push_generic_token(p, .Comma, 0); push_generic_token(p, .Comma, 0);
} }
} }
if len(list) > 1 && force_newline {
newline_position(p, 1);
}
} }
@(private) @(private)
@@ -506,7 +513,6 @@ visit_attributes :: proc(p: ^Printer, attributes: [dynamic]^ast.Attribute) {
} }
for attribute, i in attributes { for attribute, i in attributes {
move_line_limit(p, attribute.pos, 1); move_line_limit(p, attribute.pos, 1);
push_generic_token(p, .At, 0); push_generic_token(p, .At, 0);
@@ -1029,7 +1035,8 @@ visit_expr :: proc(p: ^Printer, expr: ^ast.Expr) {
visit_begin_brace(p, v.pos, .Generic, len(v.fields)); visit_begin_brace(p, v.pos, .Generic, len(v.fields));
newline_position(p, 1); newline_position(p, 1);
set_source_position(p, v.fields[0].pos); set_source_position(p, v.fields[0].pos);
visit_exprs(p, v.fields, true, true); visit_exprs(p, v.fields, true, true, true);
set_source_position(p, v.end);
visit_end_brace(p, v.end); visit_end_brace(p, v.end);
} }