Skip to content

Commit 55397cc

Browse files
evelez7evelez7
authored
[clang-doc] Fix enum partial indentation (#170196)
1 parent f290bf9 commit 55397cc

File tree

3 files changed

+72
-96
lines changed

3 files changed

+72
-96
lines changed

‎clang-tools-extra/clang-doc/assets/enum-template.mustache‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,18 @@
77
}}
88
<div id="{{ID}}" class="delimiter-container">
99
<div>
10-
<pre>
11-
<code class="language-cpp code-clang-doc">
12-
enum {{Name}}
13-
</code>
14-
</pre>
10+
<pre><code class="language-cpp code-clang-doc">enum {{Name}}</code></pre>
1511
</div>
1612
{{! Enum Values }}
1713
<table class="table-wrapper">
1814
<tbody>
19-
<tr>
20-
<th>Name</th>
21-
<th>Value</th>
22-
{{#HasComment}}
15+
<tr>
16+
<th>Name</th>
17+
<th>Value</th>
18+
{{#HasComment}}
2319
<th>Comment</th>
24-
{{/HasComment}}
25-
</tr>
20+
{{/HasComment}}
21+
</tr>
2622
{{#Members}}
2723
<tr>
2824
<td>{{Name}}</td>
@@ -34,7 +30,7 @@ enum {{Name}}
3430
<td>{{ValueExpr}}</td>
3531
{{/Value}}
3632
{{#EnumValueComments}}
37-
<td>{{>Comments}}</td>
33+
<td>{{>Comments}}</td>
3834
{{/EnumValueComments}}
3935
</tr>
4036
{{/Members}}

‎clang-tools-extra/test/clang-doc/enum.cpp‎

Lines changed: 56 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -55,30 +55,26 @@ enum Color {
5555
// HTML-INDEX: <p> Comment 3</p>
5656

5757
// MUSTACHE-INDEX: <div>
58-
// MUSTACHE-INDEX: <pre>
59-
// MUSTACHE-INDEX: <code class="language-cpp code-clang-doc">
60-
// MUSTACHE-INDEX: enum Color
61-
// MUSTACHE-INDEX: </code>
62-
// MUSTACHE-INDEX: </pre>
58+
// MUSTACHE-INDEX: <pre><code class="language-cpp code-clang-doc">enum Color</code></pre>
6359
// MUSTACHE-INDEX: </div>
6460
// MUSTACHE-INDEX: <table class="table-wrapper">
6561
// MUSTACHE-INDEX: <tbody>
6662
// MUSTACHE-INDEX: <tr>
6763
// MUSTACHE-INDEX: <th>Name</th>
6864
// MUSTACHE-INDEX: <th>Value</th>
6965
// MUSTACHE-INDEX: </tr>
70-
// MUSTACHE-INDEX: <tr>
71-
// MUSTACHE-INDEX: <td>Red</td>
72-
// MUSTACHE-INDEX: <td>0</td>
73-
// MUSTACHE-INDEX: </tr>
74-
// MUSTACHE-INDEX: <tr>
75-
// MUSTACHE-INDEX: <td>Green</td>
76-
// MUSTACHE-INDEX: <td>1</td>
77-
// MUSTACHE-INDEX: </tr>
78-
// MUSTACHE-INDEX: <tr>
79-
// MUSTACHE-INDEX: <td>Blue</td>
80-
// MUSTACHE-INDEX: <td>2</td>
81-
// MUSTACHE-INDEX: </tr>
66+
// MUSTACHE-INDEX: <tr>
67+
// MUSTACHE-INDEX: <td>Red</td>
68+
// MUSTACHE-INDEX: <td>0</td>
69+
// MUSTACHE-INDEX: </tr>
70+
// MUSTACHE-INDEX: <tr>
71+
// MUSTACHE-INDEX: <td>Green</td>
72+
// MUSTACHE-INDEX: <td>1</td>
73+
// MUSTACHE-INDEX: </tr>
74+
// MUSTACHE-INDEX: <tr>
75+
// MUSTACHE-INDEX: <td>Blue</td>
76+
// MUSTACHE-INDEX: <td>2</td>
77+
// MUSTACHE-INDEX: </tr>
8278
// MUSTACHE-INDEX: </tbody>
8379
// MUSTACHE-INDEX: </table>
8480

@@ -117,30 +113,26 @@ enum class Shapes {
117113

118114
// COM: FIXME: Serialize "enum class" in template
119115
// MUSTACHE-INDEX: <div>
120-
// MUSTACHE-INDEX: <pre>
121-
// MUSTACHE-INDEX: <code class="language-cpp code-clang-doc">
122-
// MUSTACHE-INDEX: enum Shapes
123-
// MUSTACHE-INDEX: </code>
124-
// MUSTACHE-INDEX: </pre>
116+
// MUSTACHE-INDEX: <pre><code class="language-cpp code-clang-doc">enum Shapes</code></pre>
125117
// MUSTACHE-INDEX: </div>
126118
// MUSTACHE-INDEX: <table class="table-wrapper">
127119
// MUSTACHE-INDEX: <tbody>
128120
// MUSTACHE-INDEX: <tr>
129121
// MUSTACHE-INDEX: <th>Name</th>
130122
// MUSTACHE-INDEX: <th>Value</th>
131123
// MUSTACHE-INDEX: </tr>
132-
// MUSTACHE-INDEX: <tr>
133-
// MUSTACHE-INDEX: <td>Circle</td>
134-
// MUSTACHE-INDEX: <td>0</td>
135-
// MUSTACHE-INDEX: </tr>
136-
// MUSTACHE-INDEX: <tr>
137-
// MUSTACHE-INDEX: <td>Rectangle</td>
138-
// MUSTACHE-INDEX: <td>1</td>
139-
// MUSTACHE-INDEX: </tr>
140-
// MUSTACHE-INDEX: <tr>
141-
// MUSTACHE-INDEX: <td>Triangle</td>
142-
// MUSTACHE-INDEX: <td>2</td>
143-
// MUSTACHE-INDEX: </tr>
124+
// MUSTACHE-INDEX: <tr>
125+
// MUSTACHE-INDEX: <td>Circle</td>
126+
// MUSTACHE-INDEX: <td>0</td>
127+
// MUSTACHE-INDEX: </tr>
128+
// MUSTACHE-INDEX: <tr>
129+
// MUSTACHE-INDEX: <td>Rectangle</td>
130+
// MUSTACHE-INDEX: <td>1</td>
131+
// MUSTACHE-INDEX: </tr>
132+
// MUSTACHE-INDEX: <tr>
133+
// MUSTACHE-INDEX: <td>Triangle</td>
134+
// MUSTACHE-INDEX: <td>2</td>
135+
// MUSTACHE-INDEX: </tr>
144136
// MUSTACHE-INDEX: </tbody>
145137
// MUSTACHE-INDEX: </table>
146138

@@ -240,34 +232,30 @@ enum Car {
240232
// HTML-VEHICLES: <p> Comment 4</p>
241233

242234
// MUSTACHE-VEHICLES: <div>
243-
// MUSTACHE-VEHICLES: <pre>
244-
// MUSTACHE-VEHICLES: <code class="language-cpp code-clang-doc">
245-
// MUSTACHE-VEHICLES: enum Car
246-
// MUSTACHE-VEHICLES: </code>
247-
// MUSTACHE-VEHICLES: </pre>
235+
// MUSTACHE-VEHICLES: <pre><code class="language-cpp code-clang-doc">enum Car</code></pre>
248236
// MUSTACHE-VEHICLES: </div>
249237
// MUSTACHE-VEHICLES: <table class="table-wrapper">
250238
// MUSTACHE-VEHICLES: <tbody>
251239
// MUSTACHE-VEHICLES: <tr>
252240
// MUSTACHE-VEHICLES: <th>Name</th>
253241
// MUSTACHE-VEHICLES: <th>Value</th>
254242
// MUSTACHE-VEHICLES: </tr>
255-
// MUSTACHE-VEHICLES: <tr>
256-
// MUSTACHE-VEHICLES: <td>Sedan</td>
257-
// MUSTACHE-VEHICLES: <td>0</td>
258-
// MUSTACHE-VEHICLES: </tr>
259-
// MUSTACHE-VEHICLES: <tr>
260-
// MUSTACHE-VEHICLES: <td>SUV</td>
261-
// MUSTACHE-VEHICLES: <td>1</td>
262-
// MUSTACHE-VEHICLES: </tr>
263-
// MUSTACHE-VEHICLES: <tr>
264-
// MUSTACHE-VEHICLES: <td>Pickup</td>
265-
// MUSTACHE-VEHICLES: <td>2</td>
266-
// MUSTACHE-VEHICLES: </tr>
267-
// MUSTACHE-VEHICLES: <tr>
268-
// MUSTACHE-VEHICLES: <td>Hatchback</td>
269-
// MUSTACHE-VEHICLES: <td>3</td>
270-
// MUSTACHE-VEHICLES: </tr>
243+
// MUSTACHE-VEHICLES: <tr>
244+
// MUSTACHE-VEHICLES: <td>Sedan</td>
245+
// MUSTACHE-VEHICLES: <td>0</td>
246+
// MUSTACHE-VEHICLES: </tr>
247+
// MUSTACHE-VEHICLES: <tr>
248+
// MUSTACHE-VEHICLES: <td>SUV</td>
249+
// MUSTACHE-VEHICLES: <td>1</td>
250+
// MUSTACHE-VEHICLES: </tr>
251+
// MUSTACHE-VEHICLES: <tr>
252+
// MUSTACHE-VEHICLES: <td>Pickup</td>
253+
// MUSTACHE-VEHICLES: <td>2</td>
254+
// MUSTACHE-VEHICLES: </tr>
255+
// MUSTACHE-VEHICLES: <tr>
256+
// MUSTACHE-VEHICLES: <td>Hatchback</td>
257+
// MUSTACHE-VEHICLES: <td>3</td>
258+
// MUSTACHE-VEHICLES: </tr>
271259
// MUSTACHE-VEHICLES: </tbody>
272260
// MUSTACHE-VEHICLES: </table>
273261

@@ -292,29 +280,25 @@ enum ColorUserSpecified {
292280
// HTML-INDEX: <td>&apos;C&apos;</td>
293281

294282
// MUSTACHE-INDEX: <div>
295-
// MUSTACHE-INDEX: <pre>
296-
// MUSTACHE-INDEX: <code class="language-cpp code-clang-doc">
297-
// MUSTACHE-INDEX: enum ColorUserSpecified
298-
// MUSTACHE-INDEX: </code>
299-
// MUSTACHE-INDEX: </pre>
283+
// MUSTACHE-INDEX: <pre><code class="language-cpp code-clang-doc">enum ColorUserSpecified</code></pre>
300284
// MUSTACHE-INDEX: </div>
301285
// MUSTACHE-INDEX: <table class="table-wrapper">
302286
// MUSTACHE-INDEX: <tbody>
303287
// MUSTACHE-INDEX: <tr>
304288
// MUSTACHE-INDEX: <th>Name</th>
305289
// MUSTACHE-INDEX: <th>Value</th>
306290
// MUSTACHE-INDEX: </tr>
307-
// MUSTACHE-INDEX: <tr>
308-
// MUSTACHE-INDEX: <td>RedUserSpecified</td>
309-
// MUSTACHE-INDEX: <td>&#39;A&#39;</td>
310-
// MUSTACHE-INDEX: </tr>
311-
// MUSTACHE-INDEX: <tr>
312-
// MUSTACHE-INDEX: <td>GreenUserSpecified</td>
313-
// MUSTACHE-INDEX: <td>2</td>
314-
// MUSTACHE-INDEX: </tr>
315-
// MUSTACHE-INDEX: <tr>
316-
// MUSTACHE-INDEX: <td>BlueUserSpecified</td>
317-
// MUSTACHE-INDEX: <td>&#39;C&#39;</td>
318-
// MUSTACHE-INDEX: </tr>
291+
// MUSTACHE-INDEX: <tr>
292+
// MUSTACHE-INDEX: <td>RedUserSpecified</td>
293+
// MUSTACHE-INDEX: <td>&#39;A&#39;</td>
294+
// MUSTACHE-INDEX: </tr>
295+
// MUSTACHE-INDEX: <tr>
296+
// MUSTACHE-INDEX: <td>GreenUserSpecified</td>
297+
// MUSTACHE-INDEX: <td>2</td>
298+
// MUSTACHE-INDEX: </tr>
299+
// MUSTACHE-INDEX: <tr>
300+
// MUSTACHE-INDEX: <td>BlueUserSpecified</td>
301+
// MUSTACHE-INDEX: <td>&#39;C&#39;</td>
302+
// MUSTACHE-INDEX: </tr>
319303
// MUSTACHE-INDEX: </tbody>
320304
// MUSTACHE-INDEX: </table>

‎clang-tools-extra/test/clang-doc/mustache-index.cpp‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,26 @@ class Foo;
3434
// CHECK-NEXT: <div>
3535
// CHECK-NEXT: <div id="{{[0-9A-F]*}}" class="delimiter-container">
3636
// CHECK-NEXT: <div>
37-
// CHECK-NEXT: <pre>
38-
// CHECK-NEXT: <code class="language-cpp code-clang-doc">
39-
// CHECK-NEXT: enum Color
40-
// CHECK-NEXT: </code>
41-
// CHECK-NEXT: </pre>
37+
// CHECK-NEXT: <pre><code class="language-cpp code-clang-doc">enum Color</code></pre>
4238
// CHECK-NEXT: </div>
4339
// CHECK-NEXT: <table class="table-wrapper">
4440
// CHECK-NEXT: <tbody>
45-
// CHECK-NEXT: <tr>
46-
// CHECK-NEXT: <th>Name</th>
47-
// CHECK-NEXT: <th>Value</th>
48-
// CHECK: </tr>
41+
// CHECK-NEXT: <tr>
42+
// CHECK-NEXT: <th>Name</th>
43+
// CHECK-NEXT: <th>Value</th>
44+
// CHECK-NEXT: </tr>
4945
// CHECK-NEXT: <tr>
5046
// CHECK-NEXT: <td>RED</td>
5147
// CHECK-NEXT: <td>0</td>
52-
// CHECK: </tr>
48+
// CHECK-NEXT: </tr>
5349
// CHECK-NEXT: <tr>
5450
// CHECK-NEXT: <td>BLUE</td>
5551
// CHECK-NEXT: <td>1</td>
56-
// CHECK: </tr>
52+
// CHECK-NEXT: </tr>
5753
// CHECK-NEXT: <tr>
5854
// CHECK-NEXT: <td>GREEN</td>
5955
// CHECK-NEXT: <td>2</td>
60-
// CHECK: </tr>
56+
// CHECK-NEXT: </tr>
6157
// CHECK-NEXT: </tbody>
6258
// CHECK-NEXT: </table>
6359
// CHECK-NEXT: <div>

0 commit comments

Comments
 (0)