Skip to content

Commit d722b7d

Browse files
committed
feat(handlebars): using declaration page includes shadows and briefs
1 parent 21ce3e7 commit d722b7d

26 files changed

+97
-63
lines changed

share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,25 @@
134134
{{! Using symbols }}
135135
{{#if symbol.shadows}}
136136
{{#> markup/dynamic-level-h }}Introduced Symbols{{/markup/dynamic-level-h}}
137+
{{#if (any_of_by symbol.shadows "doc")}}
138+
[cols=2]
139+
|===
140+
| Name
141+
| Description
142+
{{#each symbol.shadows}}
143+
| {{> symbol/qualified-name . }}
144+
| {{> javadoc/inline-brief doc.brief }}
145+
{{/each}}
146+
|===
147+
{{else}}
137148
[cols=1]
138149
|===
139150
| Name
140151
{{#each symbol.shadows}}
141-
| {{name}}
152+
| {{> symbol/qualified-name . }}
142153
{{/each}}
143154
|===
144-
155+
{{/if}}
145156
{{/if}}
146157
{{! Exceptions }}
147158
{{#if symbol.doc.exceptions}}

share/mrdocs/addons/generator/html/partials/symbol.html.hbs

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,20 +183,39 @@
183183
{{#if symbol.shadows}}
184184
<div>
185185
{{#> markup/dynamic-level-h level=2 }}Introduced Symbols{{/markup/dynamic-level-h}}
186+
{{#if (any_of_by symbol.shadows "doc")}}
186187
<table>
187188
<thead>
188189
<tr>
189190
<th>Name</th>
191+
<th>Description</th>
190192
</tr>
191193
</thead>
192194
<tbody>
193195
{{#each symbol.shadows}}
194196
<tr>
195-
<td>{{name}}</td>
197+
<td>{{> symbol/qualified-name . }}</td>
198+
<td>{{> javadoc/inline-brief doc.brief }}</td>
196199
</tr>
197200
{{/each}}
198201
</tbody>
199202
</table>
203+
{{else}}
204+
<table>
205+
<thead>
206+
<tr>
207+
<th>Name</th>
208+
</tr>
209+
</thead>
210+
<tbody>
211+
{{#each symbol.shadows}}
212+
<tr>
213+
<td>{{> symbol/qualified-name . }}</td>
214+
</tr>
215+
{{/each}}
216+
</tbody>
217+
</table>
218+
{{/if}}
200219
</div>
201220

202221
{{/if}}

test-files/golden-tests/symbols/using/using-function-after.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ using A::f;
101101
[cols=1]
102102
|===
103103
| Name
104-
| f
104+
| link:#A-f-01[A::f]
105105
|===
106106

107-
108107
[.small]#Created with https://www.mrdocs.com[MrDocs]#

test-files/golden-tests/symbols/using/using-function-after.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ <h3>Introduced Symbols</h3>
138138
</thead>
139139
<tbody>
140140
<tr>
141-
<td>f</td>
141+
<td><a href="#A-f-01">A::f</a></td>
142142
</tr>
143143
</tbody>
144144
</table>

test-files/golden-tests/symbols/using/using-function-and-type.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,8 @@ using A::f;
122122
[cols=1]
123123
|===
124124
| Name
125-
| f
126-
| f
125+
| link:#A-f-05[A::f]
126+
| link:#A-f-01[A::f]
127127
|===
128128

129-
130129
[.small]#Created with https://www.mrdocs.com[MrDocs]#

test-files/golden-tests/symbols/using/using-function-and-type.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ <h3>Introduced Symbols</h3>
181181
</thead>
182182
<tbody>
183183
<tr>
184-
<td>f</td>
184+
<td><a href="#A-f-05">A::f</a></td>
185185
</tr>
186186
<tr>
187-
<td>f</td>
187+
<td><a href="#A-f-01">A::f</a></td>
188188
</tr>
189189
</tbody>
190190
</table>

test-files/golden-tests/symbols/using/using-function-excluded.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ using A::f;
6161
[cols=1]
6262
|===
6363
| Name
64-
| f
64+
| link:#A-f[A::f]
6565
|===
6666

67-
6867
[.small]#Created with https://www.mrdocs.com[MrDocs]#

test-files/golden-tests/symbols/using/using-function-excluded.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ <h3>Introduced Symbols</h3>
9494
</thead>
9595
<tbody>
9696
<tr>
97-
<td>f</td>
97+
<td><a href="#A-f">A::f</a></td>
9898
</tr>
9999
</tbody>
100100
</table>

test-files/golden-tests/symbols/using/using-function-local-overloads.adoc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,9 @@ using A::f;
148148
[cols=1]
149149
|===
150150
| Name
151-
| f
152-
| f
153-
| f
151+
| link:#A-f-037[A::f]
152+
| link:#A-f-039[A::f]
153+
| link:#A-f-01[A::f]
154154
|===
155155

156-
157156
[.small]#Created with https://www.mrdocs.com[MrDocs]#

test-files/golden-tests/symbols/using/using-function-local-overloads.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,13 @@ <h3>Introduced Symbols</h3>
195195
</thead>
196196
<tbody>
197197
<tr>
198-
<td>f</td>
198+
<td><a href="#A-f-037">A::f</a></td>
199199
</tr>
200200
<tr>
201-
<td>f</td>
201+
<td><a href="#A-f-039">A::f</a></td>
202202
</tr>
203203
<tr>
204-
<td>f</td>
204+
<td><a href="#A-f-01">A::f</a></td>
205205
</tr>
206206
</tbody>
207207
</table>

0 commit comments

Comments
 (0)