Skip to content

[clang-doc] Fix enum partial indentation #170196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evelez7 merged 3 commits into from
Dec 4, 2025
Merged

[clang-doc] Fix enum partial indentation #170196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41503c8
eof
evelez7 Nov 21, 2025
fdf9479
[clang-doc] Fix enum partial indentation
evelez7 Nov 22, 2025
798a5df
Merge branch 'main' into users/evelez7/clang-doc-fix-enum-indentation
evelez7 Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions clang-tools-extra/clang-doc/assets/enum-template.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,18 @@
}}
<div id="{{ID}}" class="delimiter-container">
<div>
<pre>
<code class="language-cpp code-clang-doc">
enum {{Name}}
</code>
</pre>
<pre><code class="language-cpp code-clang-doc">enum {{Name}}</code></pre>
</div>
{{! Enum Values }}
<table class="table-wrapper">
<tbody>
<tr>
<th>Name</th>
<th>Value</th>
{{#HasComment}}
<tr>
<th>Name</th>
<th>Value</th>
{{#HasComment}}
<th>Comment</th>
{{/HasComment}}
</tr>
{{/HasComment}}
</tr>
{{#Members}}
<tr>
<td>{{Name}}</td>
Expand All @@ -34,7 +30,7 @@ enum {{Name}}
<td>{{ValueExpr}}</td>
{{/Value}}
{{#EnumValueComments}}
<td>{{>Comments}}</td>
<td>{{>Comments}}</td>
{{/EnumValueComments}}
</tr>
{{/Members}}
Expand Down
128 changes: 56 additions & 72 deletions clang-tools-extra/test/clang-doc/enum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,30 +55,26 @@ enum Color {
// HTML-INDEX: <p> Comment 3</p>

// MUSTACHE-INDEX: <div>
// MUSTACHE-INDEX: <pre>
// MUSTACHE-INDEX: <code class="language-cpp code-clang-doc">
// MUSTACHE-INDEX: enum Color
// MUSTACHE-INDEX: </code>
// MUSTACHE-INDEX: </pre>
// MUSTACHE-INDEX: <pre><code class="language-cpp code-clang-doc">enum Color</code></pre>
// MUSTACHE-INDEX: </div>
// MUSTACHE-INDEX: <table class="table-wrapper">
// MUSTACHE-INDEX: <tbody>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <th>Name</th>
// MUSTACHE-INDEX: <th>Value</th>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>Red</td>
// MUSTACHE-INDEX: <td>0</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>Green</td>
// MUSTACHE-INDEX: <td>1</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>Blue</td>
// MUSTACHE-INDEX: <td>2</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>Red</td>
// MUSTACHE-INDEX: <td>0</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>Green</td>
// MUSTACHE-INDEX: <td>1</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>Blue</td>
// MUSTACHE-INDEX: <td>2</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: </tbody>
// MUSTACHE-INDEX: </table>

Expand Down Expand Up @@ -117,30 +113,26 @@ enum class Shapes {

// COM: FIXME: Serialize "enum class" in template
// MUSTACHE-INDEX: <div>
// MUSTACHE-INDEX: <pre>
// MUSTACHE-INDEX: <code class="language-cpp code-clang-doc">
// MUSTACHE-INDEX: enum Shapes
// MUSTACHE-INDEX: </code>
// MUSTACHE-INDEX: </pre>
// MUSTACHE-INDEX: <pre><code class="language-cpp code-clang-doc">enum Shapes</code></pre>
// MUSTACHE-INDEX: </div>
// MUSTACHE-INDEX: <table class="table-wrapper">
// MUSTACHE-INDEX: <tbody>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <th>Name</th>
// MUSTACHE-INDEX: <th>Value</th>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>Circle</td>
// MUSTACHE-INDEX: <td>0</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>Rectangle</td>
// MUSTACHE-INDEX: <td>1</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>Triangle</td>
// MUSTACHE-INDEX: <td>2</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>Circle</td>
// MUSTACHE-INDEX: <td>0</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>Rectangle</td>
// MUSTACHE-INDEX: <td>1</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>Triangle</td>
// MUSTACHE-INDEX: <td>2</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: </tbody>
// MUSTACHE-INDEX: </table>

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

// MUSTACHE-VEHICLES: <div>
// MUSTACHE-VEHICLES: <pre>
// MUSTACHE-VEHICLES: <code class="language-cpp code-clang-doc">
// MUSTACHE-VEHICLES: enum Car
// MUSTACHE-VEHICLES: </code>
// MUSTACHE-VEHICLES: </pre>
// MUSTACHE-VEHICLES: <pre><code class="language-cpp code-clang-doc">enum Car</code></pre>
// MUSTACHE-VEHICLES: </div>
// MUSTACHE-VEHICLES: <table class="table-wrapper">
// MUSTACHE-VEHICLES: <tbody>
// MUSTACHE-VEHICLES: <tr>
// MUSTACHE-VEHICLES: <th>Name</th>
// MUSTACHE-VEHICLES: <th>Value</th>
// MUSTACHE-VEHICLES: </tr>
// MUSTACHE-VEHICLES: <tr>
// MUSTACHE-VEHICLES: <td>Sedan</td>
// MUSTACHE-VEHICLES: <td>0</td>
// MUSTACHE-VEHICLES: </tr>
// MUSTACHE-VEHICLES: <tr>
// MUSTACHE-VEHICLES: <td>SUV</td>
// MUSTACHE-VEHICLES: <td>1</td>
// MUSTACHE-VEHICLES: </tr>
// MUSTACHE-VEHICLES: <tr>
// MUSTACHE-VEHICLES: <td>Pickup</td>
// MUSTACHE-VEHICLES: <td>2</td>
// MUSTACHE-VEHICLES: </tr>
// MUSTACHE-VEHICLES: <tr>
// MUSTACHE-VEHICLES: <td>Hatchback</td>
// MUSTACHE-VEHICLES: <td>3</td>
// MUSTACHE-VEHICLES: </tr>
// MUSTACHE-VEHICLES: <tr>
// MUSTACHE-VEHICLES: <td>Sedan</td>
// MUSTACHE-VEHICLES: <td>0</td>
// MUSTACHE-VEHICLES: </tr>
// MUSTACHE-VEHICLES: <tr>
// MUSTACHE-VEHICLES: <td>SUV</td>
// MUSTACHE-VEHICLES: <td>1</td>
// MUSTACHE-VEHICLES: </tr>
// MUSTACHE-VEHICLES: <tr>
// MUSTACHE-VEHICLES: <td>Pickup</td>
// MUSTACHE-VEHICLES: <td>2</td>
// MUSTACHE-VEHICLES: </tr>
// MUSTACHE-VEHICLES: <tr>
// MUSTACHE-VEHICLES: <td>Hatchback</td>
// MUSTACHE-VEHICLES: <td>3</td>
// MUSTACHE-VEHICLES: </tr>
// MUSTACHE-VEHICLES: </tbody>
// MUSTACHE-VEHICLES: </table>

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

// MUSTACHE-INDEX: <div>
// MUSTACHE-INDEX: <pre>
// MUSTACHE-INDEX: <code class="language-cpp code-clang-doc">
// MUSTACHE-INDEX: enum ColorUserSpecified
// MUSTACHE-INDEX: </code>
// MUSTACHE-INDEX: </pre>
// MUSTACHE-INDEX: <pre><code class="language-cpp code-clang-doc">enum ColorUserSpecified</code></pre>
// MUSTACHE-INDEX: </div>
// MUSTACHE-INDEX: <table class="table-wrapper">
// MUSTACHE-INDEX: <tbody>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <th>Name</th>
// MUSTACHE-INDEX: <th>Value</th>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>RedUserSpecified</td>
// MUSTACHE-INDEX: <td>&#39;A&#39;</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>GreenUserSpecified</td>
// MUSTACHE-INDEX: <td>2</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>BlueUserSpecified</td>
// MUSTACHE-INDEX: <td>&#39;C&#39;</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>RedUserSpecified</td>
// MUSTACHE-INDEX: <td>&#39;A&#39;</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>GreenUserSpecified</td>
// MUSTACHE-INDEX: <td>2</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: <tr>
// MUSTACHE-INDEX: <td>BlueUserSpecified</td>
// MUSTACHE-INDEX: <td>&#39;C&#39;</td>
// MUSTACHE-INDEX: </tr>
// MUSTACHE-INDEX: </tbody>
// MUSTACHE-INDEX: </table>
20 changes: 8 additions & 12 deletions clang-tools-extra/test/clang-doc/mustache-index.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,30 +34,26 @@ class Foo;
// CHECK-NEXT: <div>
// CHECK-NEXT: <div id="{{[0-9A-F]*}}" class="delimiter-container">
// CHECK-NEXT: <div>
// CHECK-NEXT: <pre>
// CHECK-NEXT: <code class="language-cpp code-clang-doc">
// CHECK-NEXT: enum Color
// CHECK-NEXT: </code>
// CHECK-NEXT: </pre>
// CHECK-NEXT: <pre><code class="language-cpp code-clang-doc">enum Color</code></pre>
// CHECK-NEXT: </div>
// CHECK-NEXT: <table class="table-wrapper">
// CHECK-NEXT: <tbody>
// CHECK-NEXT: <tr>
// CHECK-NEXT: <th>Name</th>
// CHECK-NEXT: <th>Value</th>
// CHECK: </tr>
// CHECK-NEXT: <tr>
// CHECK-NEXT: <th>Name</th>
// CHECK-NEXT: <th>Value</th>
// CHECK-NEXT: </tr>
// CHECK-NEXT: <tr>
// CHECK-NEXT: <td>RED</td>
// CHECK-NEXT: <td>0</td>
// CHECK: </tr>
// CHECK-NEXT: </tr>
// CHECK-NEXT: <tr>
// CHECK-NEXT: <td>BLUE</td>
// CHECK-NEXT: <td>1</td>
// CHECK: </tr>
// CHECK-NEXT: </tr>
// CHECK-NEXT: <tr>
// CHECK-NEXT: <td>GREEN</td>
// CHECK-NEXT: <td>2</td>
// CHECK: </tr>
// CHECK-NEXT: </tr>
// CHECK-NEXT: </tbody>
// CHECK-NEXT: </table>
// CHECK-NEXT: <div>
Expand Down
Loading