From 97398edc05af108968b861ad39d4c7f9d7ba37ad Mon Sep 17 00:00:00 2001 From: Andreas Rumpf Date: Sat, 16 Jun 2018 01:58:52 +0200 Subject: nimpretty: render and/or/notin/in properly --- compiler/layouter.nim | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'compiler/layouter.nim') diff --git a/compiler/layouter.nim b/compiler/layouter.nim index 8c6237294..90e9d6fd7 100644 --- a/compiler/layouter.nim +++ b/compiler/layouter.nim @@ -9,6 +9,7 @@ ## Layouter for nimpretty. Still primitive but useful. ## TODO +## - Fix 'echo ()' vs 'echo()' difference! ## - Make indentations consistent. ## - Align 'if' and 'case' expressions properly. @@ -132,13 +133,19 @@ proc emitTok*(em: var Emitter; L: TLexer; tok: TToken) = case tok.tokType of tokKeywordLow..tokKeywordHigh: - if endsInAlpha(em): wr(" ") + if endsInAlpha(em): + wr(" ") + elif not em.inquote and not endsInWhite(em): + wr(" ") + wr(TokTypeToStr[tok.tokType]) case tok.tokType of tkAnd: rememberSplit(splitAnd) of tkOr: rememberSplit(splitOr) - of tkIn: rememberSplit(splitIn) + of tkIn, tkNotin: + rememberSplit(splitIn) + wr(" ") else: discard of tkColon: -- cgit 1.4.1-2-gfad0