From 85841cd318f44c35ea584651fce2fb488998ed66 Mon Sep 17 00:00:00 2001
From: flywind <xzsflywind@gmail.com>
Date: Mon, 25 Apr 2022 17:19:21 +0800
Subject: [PATCH] fix NimNode comment repr() regression [backport: 1.2]
 (#19726)

(cherry picked from commit 15ae9323e8f1e045bdd68e16231528f8c08fb611)
---
 compiler/renderer.nim     |  2 ++
 tests/macros/tmacros1.nim | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/compiler/renderer.nim b/compiler/renderer.nim
index 22a2d4cbdb..ba6f961528 100644
--- a/compiler/renderer.nim
+++ b/compiler/renderer.nim
@@ -162,6 +162,7 @@ proc putNL(g: var TSrcGen) =
 proc optNL(g: var TSrcGen, indent: int) =
   g.pendingNL = indent
   g.lineLen = indent
+  g.col = g.indent
   when defined(nimpretty): g.pendingNewlineCount = 0
 
 proc optNL(g: var TSrcGen) =
@@ -170,6 +171,7 @@ proc optNL(g: var TSrcGen) =
 proc optNL(g: var TSrcGen; a, b: PNode) =
   g.pendingNL = g.indent
   g.lineLen = g.indent
+  g.col = g.indent
   when defined(nimpretty): g.pendingNewlineCount = lineDiff(a, b)
 
 proc indentNL(g: var TSrcGen) =
diff --git a/tests/macros/tmacros1.nim b/tests/macros/tmacros1.nim
index 53af4287ce..c588ff7e64 100644
--- a/tests/macros/tmacros1.nim
+++ b/tests/macros/tmacros1.nim
@@ -60,3 +60,22 @@ macro foo(t: static Tuple): untyped =
   doAssert t.b == 12345
 
 foo((a: "foo", b: 12345))
+
+
+# bug #16307
+
+macro bug(x: untyped): string =
+  newLit repr(x)
+
+let res = bug:
+  block:
+    ## one
+    ## two
+    ## three
+
+doAssert res == """
+
+block:
+  ## one
+  ## two
+  ## three"""