nimpretty: relax line length rules when dealing with (inline) comments (#11657)

This commit is contained in:
Miran 2019-07-05 09:32:56 +02:00 • committed by Andreas Rumpf
commit 96a19ea1b4
4 changed files with 36 additions and 10 deletions

View file

@ -19,8 +19,7 @@ var body = newNimNode(nnkIfExpr).add(
ident("kind"))),
condition
),
newNimNode(nnkElse).add(newStmtList(newNimNode(nnkReturnStmt).add(ident(
"false"))))
newNimNode(nnkElse).add(newStmtList(newNimNode(nnkReturnStmt).add(ident("false"))))
)
# comment
@ -122,7 +121,7 @@ type
inquote {.pragmaHereWrongCurlyEnd.}: bool
col, lastLineNumber, lineSpan, indentLevel: int
content: string
fixedUntil: int # marks where we must not go in the content
fixedUntil: int # marks where we must not go in the content
altSplitPos: array[SplitKind, int] # alternative split positions
proc openEmitter*[T, S](em: var Emitter; config: ConfigRef;
@ -695,3 +694,17 @@ proc newRecordGen(ctx: Context; typ: TypRef): PNode =
nkRecList.t(
typ.recFields.map(newRecFieldGen))))
let
lla = 42394219 - 42429849 + 1293293 - 13918391 + 424242 # this here is an okayish comment
llb = 42394219 - 42429849 + 1293293 - 13918391 +
424242 # this here is a very long comment which should be split
llc = 42394219 - 42429849 + 1293293 - 13918391 + 424242 - 3429424 + 4239489 - 42399
lld = 42394219 - 42429849 + 1293293 - 13918391 + 424242 - 342949924 +
423948999 - 42399
type
MyLongEnum = enum ## doc comment here
first, ## this is a long comment here, but please align it
secondWithAVeryLongNameMightBreak, ## this is a short one
thirdOne ## it's ok

View file

@ -9,8 +9,7 @@ proc fun() =
echo "ok1"
proc fun2(a = "fooo" & "bar" & "bar" & "bar" & "bar" & ("bar" & "bar" & "bar") &
"bar" & "bar" & "bar" & "bar" & "bar" & "bar" & "bar" & "bar" &
"bar"): auto =
"bar" & "bar" & "bar" & "bar" & "bar" & "bar" & "bar" & "bar" & "bar"): auto =
discard
fun2()