From 411beaa3bf981ae7a8baab348a417c05c55d29cd Mon Sep 17 00:00:00 2001
From: Daniel Gavin <danielgavin5@hotmail.com>
Date: Wed, 14 Apr 2021 01:15:46 +0200
Subject: [PATCH] work on comments

---
 core/odin/printer/printer.odin |  2 +-
 core/odin/printer/visit.odin   | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/odin/printer/printer.odin b/core/odin/printer/printer.odin
index fd62f96f0..55a67ca70 100644
--- a/core/odin/printer/printer.odin
+++ b/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;
 		}
 
diff --git a/core/odin/printer/visit.odin b/core/odin/printer/visit.odin
index 9794635ef..8899b8e5f 100644
--- a/core/odin/printer/visit.odin
+++ b/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);
             }