From 83762fa4a48e79a065d8cadcc3c84c03388ecfb4 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Sat, 12 Mar 2022 11:08:32 +0200
Subject: [PATCH] native: align the disassembly/comment column in the `-v -b
 native` output

---
 vlib/v/gen/native/gen.v | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/vlib/v/gen/native/gen.v b/vlib/v/gen/native/gen.v
index a7fd1e5dbb..e42b3d648d 100644
--- a/vlib/v/gen/native/gen.v
+++ b/vlib/v/gen/native/gen.v
@@ -7,6 +7,7 @@ import os
 import strings
 import v.ast
 import v.util
+import v.mathutil as mu
 import v.token
 import v.errors
 import v.pref
@@ -453,19 +454,25 @@ fn (mut g Gen) println(comment string) {
 		return
 	}
 	addr := g.debug_pos.hex()
+	mut sb := strings.new_builder(80)
 	// println('$g.debug_pos "$addr"')
-	print(term.red(strings.repeat(`0`, 6 - addr.len) + addr + '  '))
+	sb.write_string(term.red(strings.repeat(`0`, 6 - addr.len) + addr + '  '))
 	for i := g.debug_pos; i < g.pos(); i++ {
 		s := g.buf[i].hex()
 		if s.len == 1 {
-			print(term.blue('0'))
+			sb.write_string(term.blue('0'))
 		}
 		gbihex := g.buf[i].hex()
 		hexstr := term.blue(gbihex) + ' '
-		print(hexstr)
+		sb.write_string(hexstr)
 	}
 	g.debug_pos = g.buf.len
-	println(' ' + comment)
+	//
+	colored := sb.str()
+	plain := term.strip_ansi(colored)
+	padding := ' '.repeat(mu.max(1, 40 - plain.len))
+	final := '$colored$padding$comment'
+	println(final)
 }
 
 fn (mut g Gen) gen_forc_stmt(node ast.ForCStmt) {