Skip to content

Commit 01cc476

Browse files
author
Gennaro Prota
committed
fix: don't show "final" after "{ /* see-below */ }" in the HTML and AsciiDoc outputs
That is, don't show ill-formed code. Also, "{ /* see-below */ }" is now always followed by a semicolon, even if the record is final and/or base classes are present.
1 parent 5abf5fb commit 01cc476

File tree

1 file changed

+9
-5
lines changed
  • share/mrdocs/addons/generator/common/partials/symbol/signature

1 file changed

+9
-5
lines changed

share/mrdocs/addons/generator/common/partials/symbol/signature/record.hbs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
{{#unless (eq access ../defaultAccess)}} {{access}}{{/unless~}}
1818
{{#if isVirtual}} virtual{{/if}} {{>type/declarator type~}}
1919
{{/each~}}
20-
{{!-- Don't show a semicolon if the record is final, because something
21-
like `class A final;` is ill-formed (`final` can't be used on a
22-
non-defining declaration). Similarly, don't show a semicolon if
23-
there are base classes. --}}
24-
{{/unless}}{{#isSeeBelow}} { /* see-below */ }{{/isSeeBelow}}{{#if isFinal}} final{{else}}{{#if bases}}{{!-- no semicolon --}}{{else}};{{/if}}{{/if}}
20+
{{/unless}}
21+
{{!-- Unless we are going to show a class body ("{ ... }"), don't add a
22+
semicolon if the record is final, because something like `class A
23+
final;` is ill-formed (`final` can't be used on a non-defining
24+
declaration). Similarly, don't show a semicolon if there are base
25+
classes. --}}
26+
{{~#if isFinal}} final{{/if~}}
27+
{{~#unless isSeeBelow}}{{~#unless isFinal}}{{~#unless bases}};{{/unless~}}{{/unless~}}{{/unless~}}
28+
{{~#isSeeBelow}} { /* see-below */ };{{/isSeeBelow~}}

0 commit comments

Comments
 (0)