瀏覽代碼

work on comments

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

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

@@ -233,7 +233,7 @@ align_comments :: proc(p: ^Printer) {
 
 	for info in comment_infos {
 
-		if info.begin == info.end {
+		if info.begin == info.end || info.length == 0 {
 			continue;
 		}
 

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

@@ -63,8 +63,10 @@ push_comment :: proc(p: ^Printer, comment: tokenizer.Token) -> int {
 			format_token.spaces_before = 0;
 		}
 
-		p.current_line.used = true;
-		p.current_line.depth = p.depth;
+		if !p.current_line.used {
+			p.current_line.used = true;
+			p.current_line.depth = p.depth;
+		}
 
 		append(&p.current_line.format_tokens, format_token); 
 		p.last_token = &p.current_line.format_tokens[len(p.current_line.format_tokens)-1];
@@ -135,8 +137,10 @@ push_comment :: proc(p: ^Printer, comment: tokenizer.Token) -> int {
 				unindent(p);
 			}
 
-			p.current_line.used = true;
-			p.current_line.depth = p.depth;
+			if !p.current_line.used {
+				p.current_line.used = true;
+				p.current_line.depth = p.depth;
+			}
 
 			append(&p.current_line.format_tokens, format_token); 
 			p.last_token = &p.current_line.format_tokens[len(p.current_line.format_tokens)-1];
@@ -416,7 +420,7 @@ visit_decl :: proc(p: ^Printer, decl: ^ast.Decl, called_in_stmt := false) {
 
 		if v.type != nil {
             if !v.is_mutable && v.type != nil {
-                push_generic_token(p, .Colon, 1);
+                push_generic_token(p, .Colon, 0);
 		    } else {
                 push_generic_token(p, .Colon, 0);
             }