mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-08-25 08:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimpretty: fixes #11699

Browse Source 
(cherry picked from commit 7deb49e992)
This commit is contained in:
Araq
2019-07-18 11:28:25 +02:00
committed by narimiran
parent ce7a0e3ffb
commit ace3b341a3
3 changed files with 71 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
compiler/layouter.nim
View File

@@ -153,8 +153,15 @@ proc lenOfNextTokens(em: Emitter; pos: int): int =
if em.kinds[pos+i] in {ltCrucialNewline, ltSplittingNewline, ltOptionalNewline}: break
inc result, em.tokens[pos+i].len
proc lacksGuidingInd(em: Emitter; pos: int): bool =
result = true
proc guidingInd(em: Emitter; pos: int): int =
var i = pos - 1
while i >= 0 and em.kinds[i] != ltSomeParLe:
dec i
while i+1 <= em.kinds.high and em.kinds[i] != ltSomeParRi:
if em.kinds[i] == ltSplittingNewline and em.kinds[i+1] == ltSpaces:
return em.tokens[i+1].len
inc i
result = -1
proc closeEmitter*(em: var Emitter) =
template defaultCase() =
@@ -209,11 +216,13 @@ proc closeEmitter*(em: var Emitter) =
let spaces = em.tokens[i-1].len
content.setLen(content.len - spaces)
content.add "\L"
content.add em.tokens[i]
lineLen = em.tokens[i].len
if false: # openPars == 0 or lacksGuidingInd(em, i):
content.add repeat(' ', em.indWidth*2)
lineLen += em.indWidth*2
let guide = if openPars > 0: guidingInd(em, i) else: -1
if guide >= 0:
content.add repeat(' ', guide)
lineLen = guide
else:
content.add em.tokens[i]
lineLen = em.tokens[i].len
lineBegin = i+1
if i+1 < em.kinds.len and em.kinds[i+1] == ltSpaces:
# inhibit extra spaces at the start of a new line