瀏覽代碼

better placing of the end brace

Daniel Gavin 4 年之前
父節點
當前提交
ca112c0b6d
共有 2 個文件被更改,包括 3 次插入5 次删除
  1. 1 0
      core/odin/printer/printer.odin
  2. 2 5
      core/odin/printer/visit.odin

+ 1 - 0
core/odin/printer/printer.odin

@@ -907,3 +907,4 @@ align_comments :: proc(p: ^Printer) {
 		}
 	}
 }
+ 

+ 2 - 5
core/odin/printer/visit.odin

@@ -9,7 +9,7 @@ import "core:unicode/utf8"
 import "core:mem"
 import "core:sort"
 
-//right the attribute order is not linearly parsed(bug?)
+//right now the attribute order is not linearly parsed(bug?)
 @(private)
 sort_attribute :: proc(s: ^[dynamic]^ast.Attribute) -> sort.Interface {
 	return sort.Interface {
@@ -576,8 +576,6 @@ visit_stmt :: proc(p: ^Printer, stmt: ^ast.Stmt, block_type: Block_Type = .Gener
 
 			visit_block_stmts(p, v.stmts, len(v.stmts) > 1 && p.config.split_multiple_stmts);
 
-			set_source_position(p, v.end);
-
 			if !empty_block {
 				visit_end_brace(p, v.end);
 			}
@@ -1259,8 +1257,7 @@ visit_begin_brace :: proc(p: ^Printer, begin: tokenizer.Pos, type: Block_Type, c
 }
 
 visit_end_brace :: proc(p: ^Printer, end: tokenizer.Pos) {
-	set_source_position(p, end);
-	newline_position(p, 1);
+	move_line(p, end);
 	push_generic_token(p, .Close_Brace, 0);
 	unindent(p);
 	p.current_line.depth = p.depth;