From 3b901d1e361f49d48fb64d115e42c04a4a37100c Mon Sep 17 00:00:00 2001 From: Andreas Rumpf Date: Wed, 7 Oct 2020 14:39:13 +0200 Subject: [PATCH] docgen: improve alignment of comments (still not perfect) (#15506) * docgen: improve alignment of comments (still not perfect) * fix error message text in `tunknown_named_parameter` Co-authored-by: narimiran --- compiler/renderer.nim | 2 +- nimdoc/testproject/expected/testproject.html | 11 ++++++----- tests/errmsgs/tunknown_named_parameter.nim | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/compiler/renderer.nim b/compiler/renderer.nim index 08012bb55d..1de56a2966 100644 --- a/compiler/renderer.nim +++ b/compiler/renderer.nim @@ -183,9 +183,9 @@ proc put(g: var TSrcGen, kind: TokType, s: string; sym: PSym = nil) = addPendingNL(g) if s.len > 0: addTok(g, kind, s, sym) - inc(g.lineLen, s.len) else: g.pendingWhitespace = s.len + inc(g.lineLen, s.len) proc putComment(g: var TSrcGen, s: string) = if s.len == 0: return diff --git a/nimdoc/testproject/expected/testproject.html b/nimdoc/testproject/expected/testproject.html index 9c06211c97..a5522a2e26 100644 --- a/nimdoc/testproject/expected/testproject.html +++ b/nimdoc/testproject/expected/testproject.html @@ -661,16 +661,16 @@ Some proc -
proc c_printf(frmt: cstring): cint {...}{.importc: "printf", header: "<stdio.h>", varargs,
-                                 discardable.}
+
proc c_printf(frmt: cstring): cint {...}{.importc: "printf", header: "<stdio.h>",
+                                     varargs, discardable.}
the c printf. etc.
-
proc c_nonexistant(frmt: cstring): cint {...}{.importc: "nonexistant", header: "<stdio.h>",
-                                      varargs, discardable.}
+
proc c_nonexistant(frmt: cstring): cint {...}{.importc: "nonexistant",
+    header: "<stdio.h>", varargs, discardable.}
@@ -744,7 +744,8 @@ at indent 0
-
proc asyncFun1(): Future[int] {...}{.raises: [Exception, ValueError], tags: [RootEffect].}
+
proc asyncFun1(): Future[int] {...}{.raises: [Exception, ValueError],
+                                tags: [RootEffect].}
ok1 diff --git a/tests/errmsgs/tunknown_named_parameter.nim b/tests/errmsgs/tunknown_named_parameter.nim index b139310db9..829ab9497b 100644 --- a/tests/errmsgs/tunknown_named_parameter.nim +++ b/tests/errmsgs/tunknown_named_parameter.nim @@ -10,7 +10,8 @@ proc rsplit(s: string; sep: string; maxsplit: int = -1): seq[string] first type mismatch at position: 2 required type for sep: string but expression '{':'}' is of type: set[char] -proc rsplit(s: string; seps: set[char] = Whitespace; maxsplit: int = -1): seq[string] +proc rsplit(s: string; seps: set[char] = Whitespace; maxsplit: int = -1): seq[ + string] first type mismatch at position: 3 unknown named parameter: maxsplits @@ -22,6 +23,5 @@ expression: rsplit("abc:def", {':'}, maxsplits = 1) # bug #8043 - import strutils "abc:def".rsplit({':'}, maxsplits = 1)