From e7692ce1e72dd936a3945d02ba5247bc8bfcde2e Mon Sep 17 00:00:00 2001 From: alandefreitas Date: Tue, 3 Dec 2024 17:31:33 -0300 Subject: [PATCH] fix: tables have no enumerator anchors --- .../generator/adoc/partials/symbol.adoc.hbs | 11 +++++---- .../generator/html/partials/symbol.html.hbs | 4 ++++ test-files/golden-tests/enum.adoc | 24 ++++++++++++------- test-files/golden-tests/enum.html | 16 ++++++------- 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs index c2e2d90b9b..666e0cf519 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs @@ -45,20 +45,23 @@ {{>symbol/tranche tranche=symbol.interface label="" is-namespace=true}} {{/if}} -{{else if symbol.members}} +{{else if (and symbol.members (ne symbol.kind "overloads"))}} {{! Members }} -{{#if (and symbol.members (ne symbol.kind "overloads"))}} {{#> markup/dynamic-level-h }}Members{{/markup/dynamic-level-h}} [,cols=2] |=== |Name |Description {{#each symbol.members}} -|xref:{{{anchor}}}[`pass:v[{{>symbol/name . nolink=true}}]`] | {{~doc.brief}} +{{#if (ne kind "enumerator")}} +|xref:{{{anchor}}}[`{{>symbol/name . nolink=true}}`] +{{else}} +|`{{>symbol/name . nolink=true}}` +{{/if}} +|{{~doc.brief}} {{/each}} |=== -{{/if}} {{/if}} {{! Using directives }} {{#if symbol.usingDirectives}} diff --git a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs index 933382b6c2..d9629742aa 100644 --- a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs @@ -67,7 +67,11 @@ {{#each symbol.members}} +{{#if (ne kind "enumerator")}} {{>symbol/name . nolink=true}} +{{else}} +{{>symbol/name . nolink=true}} +{{/if}} {{{doc.brief}}} {{/each}} diff --git a/test-files/golden-tests/enum.adoc b/test-files/golden-tests/enum.adoc index 2a96b13731..ea6e3567bc 100644 --- a/test-files/golden-tests/enum.adoc +++ b/test-files/golden-tests/enum.adoc @@ -47,10 +47,12 @@ enum E0; [,cols=2] |=== |Name |Description -|xref:E0-e0[`pass:v[e0]`] |pass:[ +|`e0` +|pass:[ e0 brief. ] -|xref:E0-e1[`pass:v[e1]`] |pass:[ +|`e1` +|pass:[ e1 brief. ] |=== @@ -119,8 +121,10 @@ enum E1 : char; [,cols=2] |=== |Name |Description -|xref:E1-e2[`pass:v[e2]`] | -|xref:E1-e3[`pass:v[e3]`] | +|`e2` +| +|`e3` +| |=== [#E1-e2] @@ -165,10 +169,12 @@ enum E2 : int; [,cols=2] |=== |Name |Description -|xref:E2-e4[`pass:v[e4]`] |pass:[ +|`e4` +|pass:[ e4 brief. ] -|xref:E2-e5[`pass:v[e5]`] |pass:[ +|`e5` +|pass:[ e5 brief. ] |=== @@ -237,8 +243,10 @@ enum E3 : char; [,cols=2] |=== |Name |Description -|xref:E3-e6[`pass:v[e6]`] | -|xref:E3-e7[`pass:v[e7]`] | +|`e6` +| +|`e7` +| |=== [#E3-e6] diff --git a/test-files/golden-tests/enum.html b/test-files/golden-tests/enum.html index 8cd452873f..3f738eb012 100644 --- a/test-files/golden-tests/enum.html +++ b/test-files/golden-tests/enum.html @@ -64,13 +64,13 @@

Members

-e0 +e0

e0 brief.

-e1 +e1

e1 brief.

@@ -167,11 +167,11 @@

Members

-e2 +e2 -e3 +e3 @@ -239,13 +239,13 @@

Members

-e4 +e4

e4 brief.

-e5 +e5

e5 brief.

@@ -342,11 +342,11 @@

Members

-e6 +e6 -e7 +e7