diff --git a/compiler/renderer.nim b/compiler/renderer.nim index 756513f8e2..eb410bc5d8 100644 --- a/compiler/renderer.nim +++ b/compiler/renderer.nim @@ -598,7 +598,7 @@ proc isHideable(config: ConfigRef, n: PNode): bool = # xxx compare `ident` directly with `getIdent(cache, wRaises)`, but # this requires a `cache`. case n.kind - of nkExprColonExpr: result = n[0].kind == nkIdent and n[0].ident.s in ["raises", "tags", "extern", "deprecated"] + of nkExprColonExpr: result = n[0].kind == nkIdent and n[0].ident.s in ["raises", "tags", "extern", "deprecated", "forbids"] of nkIdent: result = n.ident.s in ["gcsafe", "deprecated"] else: result = false diff --git a/nimdoc/test_out_index_dot_html/expected/index.html b/nimdoc/test_out_index_dot_html/expected/index.html index 50a18bdae9..6ee8a62b85 100644 --- a/nimdoc/test_out_index_dot_html/expected/index.html +++ b/nimdoc/test_out_index_dot_html/expected/index.html @@ -77,7 +77,7 @@
- 
proc foo() {....raises: [], tags: [], forbids: [].}
+ 
proc foo() {....raises: [], tags: [], forbids: [].}
I do foo diff --git a/nimdoc/testproject/expected/subdir/subdir_b/utils.html b/nimdoc/testproject/expected/subdir/subdir_b/utils.html index d888a4609c..07fe3be16d 100644 --- a/nimdoc/testproject/expected/subdir/subdir_b/utils.html +++ b/nimdoc/testproject/expected/subdir/subdir_b/utils.html @@ -302,7 +302,7 @@ Ref.
- 
func `'big`(a: string): SomeType {....raises: [], tags: [], forbids: [].}
+ 
func `'big`(a: string): SomeType {....raises: [], tags: [], forbids: [].}
@@ -347,7 +347,7 @@ Ref.
- 
proc f(x: G[int]) {....raises: [], tags: [], forbids: [].}
+ 
proc f(x: G[int]) {....raises: [], tags: [], forbids: [].}
There is also variant f(G[string]) @@ -355,7 +355,7 @@ Ref.
- 
proc f(x: G[string]) {....raises: [], tags: [], forbids: [].}
+ 
proc f(x: G[string]) {....raises: [], tags: [], forbids: [].}
See also f(G[int]). @@ -377,7 +377,7 @@ Ref.
- 
proc fn2() {....raises: [], tags: [], forbids: [].}
+ 
proc fn2() {....raises: [], tags: [], forbids: [].}
comment @@ -385,7 +385,7 @@ Ref.
- 
proc fn2(x: int) {....raises: [], tags: [], forbids: [].}
+ 
proc fn2(x: int) {....raises: [], tags: [], forbids: [].}
fn2 comment @@ -393,7 +393,7 @@ Ref.
- 
proc fn2(x: int; y: float) {....raises: [], tags: [], forbids: [].}
+ 
proc fn2(x: int; y: float) {....raises: [], tags: [], forbids: [].}
@@ -404,7 +404,7 @@ Ref.
- 
proc fn3(): auto {....raises: [], tags: [], forbids: [].}
+ 
proc fn3(): auto {....raises: [], tags: [], forbids: [].}
comment @@ -415,7 +415,7 @@ Ref.
- 
proc fn4(): auto {....raises: [], tags: [], forbids: [].}
+ 
proc fn4(): auto {....raises: [], tags: [], forbids: [].}
comment @@ -426,7 +426,7 @@ Ref.
- 
proc fn5() {....raises: [], tags: [], forbids: [].}
+ 
proc fn5() {....raises: [], tags: [], forbids: [].}
comment @@ -437,7 +437,7 @@ Ref.
- 
proc fn6() {....raises: [], tags: [], forbids: [].}
+ 
proc fn6() {....raises: [], tags: [], forbids: [].}
comment @@ -448,7 +448,7 @@ Ref.
- 
proc fn7() {....raises: [], tags: [], forbids: [].}
+ 
proc fn7() {....raises: [], tags: [], forbids: [].}
comment @@ -459,7 +459,7 @@ Ref.
- 
proc fn8(): auto {....raises: [], tags: [], forbids: [].}
+ 
proc fn8(): auto {....raises: [], tags: [], forbids: [].}
comment @@ -470,7 +470,7 @@ Ref.
- 
func fn9(a: int): int {....raises: [], tags: [], forbids: [].}
+ 
func fn9(a: int): int {....raises: [], tags: [], forbids: [].}
comment @@ -481,7 +481,7 @@ Ref.
- 
func fn10(a: int): int {....raises: [], tags: [], forbids: [].}
+ 
func fn10(a: int): int {....raises: [], tags: [], forbids: [].}
comment @@ -492,7 +492,7 @@ Ref.
- 
func fN11() {....raises: [], tags: [], forbids: [].}
+ 
func fN11() {....raises: [], tags: [], forbids: [].}
@@ -500,7 +500,7 @@ Ref.
- 
func fN11(x: int) {....raises: [], tags: [], forbids: [].}
+ 
func fN11(x: int) {....raises: [], tags: [], forbids: [].}
@@ -522,7 +522,7 @@ Ref.
- 
proc someType(): SomeType {....raises: [], tags: [], forbids: [].}
+ 
proc someType(): SomeType {....raises: [], tags: [], forbids: [].}
constructor. @@ -539,7 +539,7 @@ Ref.
- 
iterator fooBar(a: seq[SomeType]): int {....raises: [], tags: [], forbids: [].}
+ 
iterator fooBar(a: seq[SomeType]): int {....raises: [], tags: [], forbids: [].}
diff --git a/nimdoc/testproject/expected/testproject.html b/nimdoc/testproject/expected/testproject.html index ea0269710e..6fc31508aa 100644 --- a/nimdoc/testproject/expected/testproject.html +++ b/nimdoc/testproject/expected/testproject.html @@ -472,7 +472,7 @@
- 
proc addfBug14485() {....raises: [], tags: [], forbids: [].}
+ 
proc addfBug14485() {....raises: [], tags: [], forbids: [].}
Some proc @@ -495,7 +495,7 @@
- 
proc anything() {....raises: [], tags: [], forbids: [].}
+ 
proc anything() {....raises: [], tags: [], forbids: [].}
There is no block quote after blank lines at the beginning. @@ -507,7 +507,7 @@ 
proc asyncFun1(): Future[int] {....raises: [Exception, ValueError],
-                                tags: [RootEffect], forbids: [].}
+ tags: [RootEffect], forbids: [].}
ok1 @@ -519,7 +519,7 @@ 
proc asyncFun2(): owned(Future[void]) {....raises: [Exception], tags: [RootEffect],
-                                        forbids: [].}
+ forbids: [].}
@@ -531,7 +531,7 @@ 
proc asyncFun3(): owned(Future[void]) {....raises: [Exception], tags: [RootEffect],
-                                        forbids: [].}
+ forbids: [].}
@@ -555,7 +555,7 @@
- 
proc baz() {....raises: [], tags: [], forbids: [].}
+ 
proc baz() {....raises: [], tags: [], forbids: [].}
@@ -592,7 +592,7 @@ 
proc c_nonexistent(frmt: cstring): cint {.importc: "nonexistent",
-    header: "<stdio.h>", varargs, discardable, ...raises: [], tags: [], forbids: [].}
+ header: "<stdio.h>", varargs, discardable, ...raises: [], tags: [], forbids: [].}
@@ -605,7 +605,7 @@ 
proc c_printf(frmt: cstring): cint {.importc: "printf", header: "<stdio.h>",
                                      varargs, discardable, ...raises: [], tags: [],
-                                     forbids: [].}
+ forbids: [].}
the c printf. etc. @@ -616,7 +616,7 @@
- 
proc fromUtils3() {....raises: [], tags: [], forbids: [].}
+ 
proc fromUtils3() {....raises: [], tags: [], forbids: [].}
came form utils but should be shown where fromUtilsGen is called @@ -642,7 +642,7 @@ 
proc low[T: Ordinal | enum | range](x: T): T {.magic: "Low", noSideEffect,
-    ...raises: [], tags: [], forbids: [].}
+ ...raises: [], tags: [], forbids: [].}

Returns the lowest possible value of an ordinal value x. As a special semantic rule, x may also be a type identifier.

@@ -658,7 +658,7 @@ 
proc low2[T: Ordinal | enum | range](x: T): T {.magic: "Low", noSideEffect,
-    ...raises: [], tags: [], forbids: [].}
+ ...raises: [], tags: [], forbids: [].}

Returns the lowest possible value of an ordinal value x. As a special semantic rule, x may also be a type identifier.

@@ -675,7 +675,7 @@
- 
proc p1() {....raises: [], tags: [], forbids: [].}
+ 
proc p1() {....raises: [], tags: [], forbids: [].}
cp1 @@ -702,7 +702,7 @@ this is a nested doc comment
- 
func someFunc() {....raises: [], tags: [], forbids: [].}
+ 
func someFunc() {....raises: [], tags: [], forbids: [].}
My someFunc. Stuff in quotes here. Some link @@ -713,7 +713,7 @@ this is a nested doc comment
- 
proc tripleStrLitTest() {....raises: [], tags: [], forbids: [].}
+ 
proc tripleStrLitTest() {....raises: [], tags: [], forbids: [].}
@@ -760,7 +760,7 @@ at indent 0
- 
proc z1(): Foo {....raises: [], tags: [], forbids: [].}
+ 
proc z1(): Foo {....raises: [], tags: [], forbids: [].}
cz1 @@ -771,7 +771,7 @@ at indent 0
- 
proc z2() {....raises: [], tags: [], forbids: [].}
+ 
proc z2() {....raises: [], tags: [], forbids: [].}
cz2 @@ -784,7 +784,7 @@ at indent 0
- 
proc z3() {....raises: [], tags: [], forbids: [].}
+ 
proc z3() {....raises: [], tags: [], forbids: [].}
cz3 @@ -795,7 +795,7 @@ at indent 0
- 
proc z4() {....raises: [], tags: [], forbids: [].}
+ 
proc z4() {....raises: [], tags: [], forbids: [].}
cz4 @@ -806,7 +806,7 @@ at indent 0
- 
proc z5(): int {....raises: [], tags: [], forbids: [].}
+ 
proc z5(): int {....raises: [], tags: [], forbids: [].}
cz5 @@ -817,7 +817,7 @@ at indent 0
- 
proc z6(): int {....raises: [], tags: [], forbids: [].}
+ 
proc z6(): int {....raises: [], tags: [], forbids: [].}
cz6 @@ -828,7 +828,7 @@ at indent 0
- 
proc z7(): int {....raises: [], tags: [], forbids: [].}
+ 
proc z7(): int {....raises: [], tags: [], forbids: [].}
cz7 @@ -839,7 +839,7 @@ at indent 0
- 
proc z8(): int {....raises: [], tags: [], forbids: [].}
+ 
proc z8(): int {....raises: [], tags: [], forbids: [].}
cz8 @@ -850,7 +850,7 @@ at indent 0
- 
proc z9() {....raises: [], tags: [], forbids: [].}
+ 
proc z9() {....raises: [], tags: [], forbids: [].}
@@ -863,7 +863,7 @@ at indent 0
- 
proc z10() {....raises: [], tags: [], forbids: [].}
+ 
proc z10() {....raises: [], tags: [], forbids: [].}
@@ -876,7 +876,7 @@ at indent 0
- 
proc z11() {....raises: [], tags: [], forbids: [].}
+ 
proc z11() {....raises: [], tags: [], forbids: [].}
@@ -889,7 +889,7 @@ at indent 0
- 
proc z12(): int {....raises: [], tags: [], forbids: [].}
+ 
proc z12(): int {....raises: [], tags: [], forbids: [].}
@@ -902,7 +902,7 @@ at indent 0
- 
proc z13() {....raises: [], tags: [], forbids: [].}
+ 
proc z13() {....raises: [], tags: [], forbids: [].}
cz13 @@ -915,7 +915,7 @@ at indent 0
- 
proc z17() {....raises: [], tags: [], forbids: [].}
+ 
proc z17() {....raises: [], tags: [], forbids: [].}
cz17 rest @@ -934,7 +934,7 @@ at indent 0
- 
method method1(self: Moo) {.base, ...raises: [], tags: [], forbids: [].}
+ 
method method1(self: Moo) {.base, ...raises: [], tags: [], forbids: [].}
foo1 @@ -945,7 +945,7 @@ at indent 0
- 
method method2(self: Moo): int {.base, ...raises: [], tags: [], forbids: [].}
+ 
method method2(self: Moo): int {.base, ...raises: [], tags: [], forbids: [].}
foo2 @@ -956,7 +956,7 @@ at indent 0
- 
method method3(self: Moo): int {.base, ...raises: [], tags: [], forbids: [].}
+ 
method method3(self: Moo): int {.base, ...raises: [], tags: [], forbids: [].}
foo3 @@ -973,7 +973,7 @@ at indent 0
- 
iterator fromUtils1(): int {....raises: [], tags: [], forbids: [].}
+ 
iterator fromUtils1(): int {....raises: [], tags: [], forbids: [].}
@@ -988,7 +988,7 @@ at indent 0
- 
iterator iter1(n: int): int {....raises: [], tags: [], forbids: [].}
+ 
iterator iter1(n: int): int {....raises: [], tags: [], forbids: [].}
foo1 @@ -999,7 +999,7 @@ at indent 0
- 
iterator iter2(n: int): int {....raises: [], tags: [], forbids: [].}
+ 
iterator iter2(n: int): int {....raises: [], tags: [], forbids: [].}
foo2