Fix commentOffsetA for doc comments (#15643)

nim-lang · Oct 19, 2020 · f20e485 · f20e485
1 parent 0f4b1ed
commit f20e485
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/compiler/lexer.nim b/compiler/lexer.nim
@@ -1042,7 +1042,7 @@ proc scanComment(L: var Lexer, tok: var Token) =
   tok.iNumber = 0
   assert L.buf[pos+1] == '#'
   when defined(nimpretty):
-    tok.commentOffsetA = L.offsetBase + pos - 1
+    tok.commentOffsetA = L.offsetBase + pos
 
   if L.buf[pos+2] == '[':
     skipMultiLineComment(L, tok, pos+3, true)

diff --git a/nimpretty/tests/expected/simple.nim b/nimpretty/tests/expected/simple.nim
@@ -11,3 +11,8 @@ proc a() =
 
   # comment 2
   discard
+
+# bug #15596
+discard ## comment 3
+
+discard # comment 4
diff --git a/nimpretty/tests/simple.nim b/nimpretty/tests/simple.nim
@@ -11,3 +11,8 @@ proc a() =
 
   # comment 2
   discard
+
+# bug #15596
+discard## comment 3
+
+discard # comment 4