Skip to content

Commit 5abf5fb

Browse files
author
Gennaro Prota
committed
fix: code snippet doesn't include a semicolon when there are base classes
1 parent 9a53a1a commit 5abf5fb

39 files changed

+203
-202
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
{{/each~}}
2020
{{!-- Don't show a semicolon if the record is final, because something
2121
like `class A final;` is ill-formed (`final` can't be used on a
22-
non-defining declaration). --}}
23-
{{/unless}}{{#isSeeBelow}} { /* see-below */ }{{/isSeeBelow}}{{#if isFinal}} final{{else}};{{/if}}
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}}

test-files/golden-tests/config/auto-relates/derived.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Declared in `<derived.cpp>`
5252
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
5353
----
5454
struct A
55-
: link:#ABase[ABase];
55+
: link:#ABase[ABase]
5656
----
5757

5858
=== Base Classes
@@ -141,7 +141,7 @@ Declared in `<derived.cpp>`
141141
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
142142
----
143143
struct AView
144-
: link:#ABase[ABase];
144+
: link:#ABase[ABase]
145145
----
146146

147147
=== Base Classes
@@ -194,7 +194,7 @@ Declared in `<derived.cpp>`
194194
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
195195
----
196196
struct AView2
197-
: link:#AView[AView];
197+
: link:#AView[AView]
198198
----
199199

200200
=== Base Classes

test-files/golden-tests/config/auto-relates/derived.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ <h3>Synopsis</h3>
6161
<pre>
6262
<code class="source-code cpp">
6363
struct A
64-
: <a href="#ABase">ABase</a>;
64+
: <a href="#ABase">ABase</a>
6565
</code>
6666
</pre>
6767
</div>
@@ -172,7 +172,7 @@ <h3>Synopsis</h3>
172172
<pre>
173173
<code class="source-code cpp">
174174
struct AView
175-
: <a href="#ABase">ABase</a>;
175+
: <a href="#ABase">ABase</a>
176176
</code>
177177
</pre>
178178
</div>
@@ -241,7 +241,7 @@ <h3>Synopsis</h3>
241241
<pre>
242242
<code class="source-code cpp">
243243
struct AView2
244-
: <a href="#AView">AView</a>;
244+
: <a href="#AView">AView</a>
245245
</code>
246246
</pre>
247247
</div>

test-files/golden-tests/config/extract-implicit-specializations/base.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Declared in `&lt;base&period;cpp&gt;`
2323
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
2424
----
2525
struct A
26-
: link:#B[B];
26+
: link:#B[B]
2727
----
2828

2929
=== Base Classes

test-files/golden-tests/config/extract-implicit-specializations/base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h3>Synopsis</h3>
3535
<pre>
3636
<code class="source-code cpp">
3737
struct A
38-
: <a href="#B">B</a>;
38+
: <a href="#B">B</a>
3939
</code>
4040
</pre>
4141
</div>

test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Declared in `&lt;extract&hyphen;implicit&hyphen;specializations&period;cpp&gt;`
2323
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
2424
----
2525
struct A
26-
: link:#B-00[B&lt;int&gt;];
26+
: link:#B-00[B&lt;int&gt;]
2727
----
2828

2929
=== Base Classes

test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h3>Synopsis</h3>
3535
<pre>
3636
<code class="source-code cpp">
3737
struct A
38-
: <a href="#B-00">B&lt;int&gt;</a>;
38+
: <a href="#B-00">B&lt;int&gt;</a>
3939
</code>
4040
</pre>
4141
</div>

test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Declared in `&lt;no&hyphen;extract&hyphen;implicit&hyphen;specializations&period
2323
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
2424
----
2525
struct A
26-
: link:#B[B&lt;int&gt;];
26+
: link:#B[B&lt;int&gt;]
2727
----
2828

2929
=== Base Classes

test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h3>Synopsis</h3>
3535
<pre>
3636
<code class="source-code cpp">
3737
struct A
38-
: <a href="#B">B&lt;int&gt;</a>;
38+
: <a href="#B">B&lt;int&gt;</a>
3939
</code>
4040
</pre>
4141
</div>

test-files/golden-tests/config/inherit-base-members/base-overload-set.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Declared in `&lt;base&hyphen;overload&hyphen;set&period;cpp&gt;`
2424
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
2525
----
2626
class Base
27-
: public link:#ConstBase[ConstBase];
27+
: public link:#ConstBase[ConstBase]
2828
----
2929

3030
=== Base Classes
@@ -118,7 +118,7 @@ Declared in `&lt;base&hyphen;overload&hyphen;set&period;cpp&gt;`
118118
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
119119
----
120120
class C
121-
: public link:#Base[Base];
121+
: public link:#Base[Base]
122122
----
123123

124124
=== Base Classes

0 commit comments

Comments
 (0)