nimpretty: fixes #9673 [backport]

(cherry picked from commit 5326471)
nim-lang · Nov 24, 2018 · fa3017f · fa3017f
1 parent 172e95b
commit fa3017f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/compiler/layouter.nim b/compiler/layouter.nim
@@ -246,7 +246,7 @@ proc emitTok*(em: var Emitter; L: TLexer; tok: TToken) =
     wr(TokTypeToStr[tok.tokType])
     if not em.inquote: wr(" ")
   of tkOpr, tkDotDot:
-    if tok.strongSpaceA == 0 and tok.strongSpaceB == 0:
+    if (tok.strongSpaceA == 0 and tok.strongSpaceB == 0) or em.inquote:
       # bug #9504: remember to not spacify a keyword:
       lastTokWasTerse = true
       # if not surrounded by whitespace, don't produce any whitespace either:

diff --git a/nimpretty/tests/exhaustive.nim b/nimpretty/tests/exhaustive.nim
@@ -357,3 +357,6 @@ proc fun3() =
 ##[
 foobar
 ]##
+
+# bug #9673
+discard `* `(1, 2)
diff --git a/nimpretty/tests/expected/exhaustive.nim b/nimpretty/tests/expected/exhaustive.nim
@@ -366,3 +366,6 @@ proc fun3() =
 ##[
 foobar
 ]##
+
+# bug #9673
+discard `*`(1, 2)