Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion clang-tools-extra/clang-doc/JSONGenerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ static void serializeInfo(const RecordInfo &I, json::Object &Obj,
if (!PubMembersArrayRef.empty())
insertArray(Obj, PublicMembersArray, "PublicMembers");
if (!ProtMembersArrayRef.empty())
Obj["ProtectedMembers"] = ProtectedMembersArray;
insertArray(Obj, ProtectedMembersArray, "ProtectedMembers");
if (!PrivateMembersArrayRef.empty())
insertArray(Obj, PrivateMembersArray, "PrivateMembers");
}
Expand Down
23 changes: 9 additions & 14 deletions clang-tools-extra/clang-doc/assets/class-template.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@
</details>
</li>
{{/HasPublicMembers}}
{{#ProtectedMembers}}
{{#HasProtectedMembers}}
<li>
<details open>
<summary class="sidebar-section">
<a class="sidebar-item" href="#PublicMethods">Protected Members</a>
<a class="sidebar-item" href="#ProtectedMembers">Protected Members</a>
</summary>
<ul>
{{#Obj}}
{{#ProtectedMembers}}
<li class="sidebar-item-container">
<a class="sidebar-item" href="#{{Name}}">{{Name}}</a>
</li>
{{/Obj}}
{{/ProtectedMembers}}
</ul>
</details>
</li>
{{/ProtectedMembers}}
{{/HasProtectedMembers}}
{{#HasPublicFunctions}}
<li>
<details open>
Expand Down Expand Up @@ -178,23 +178,18 @@
</div>
</section>
{{/HasPublicMembers}}
{{#ProtectedMembers}}
{{#HasProtectedMembers}}
<section id="ProtectedMembers" class="section-container">
<h2>Protected Members</h2>
<div>
{{#Obj}}
{{#ProtectedMembers}}
<div id="{{Name}}" class="delimiter-container">
<pre><code class="language-cpp code-clang-doc" >{{#IsStatic}}static {{/IsStatic}}{{Type}} {{Name}}</code></pre>
{{#MemberComments}}
<div>
{{>Comments}}
</div>
{{/MemberComments}}
</div>
{{/Obj}}
{{/ProtectedMembers}}
</div>
</section>
{{/ProtectedMembers}}
{{/HasProtectedMembers}}
{{#HasPublicFunctions}}
<section id="PublicMethods" class="section-container">
<h2>Public Methods</h2>
Expand Down
9 changes: 9 additions & 0 deletions clang-tools-extra/test/clang-doc/json/class.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ struct MyClass {
// CHECK-NEXT: "HasEnums": true,
// CHECK-NEXT: "HasFriends": true,
// CHECK-NEXT: "HasPrivateMembers": true,
// CHECK-NEXT: "HasProtectedMembers": true,
// CHECK-NEXT: "HasPublicFunctions": true,
// CHECK-NEXT: "HasPublicMembers": true,
// CHECK-NEXT: "HasRecords": true,
Expand Down Expand Up @@ -320,6 +321,14 @@ struct MyClass {
// HTML-NEXT: </li>
// HTML-NEXT: </ul>
// HTML-NEXT: </details>
// HTML: <section id="ProtectedMembers" class="section-container">
// HTML-NEXT: <h2>Protected Members</h2>
// HTML-NEXT: <div>
// HTML-NEXT: <div id="ProtectedField" class="delimiter-container">
// HTML-NEXT: <pre><code class="language-cpp code-clang-doc" >int ProtectedField</code></pre>
// HTML-NEXT: </div>
// HTML-NEXT: </div>
// HTML-NEXT: </section>
// HTML: <section id="Classes" class="section-container">
// HTML-NEXT: <h2>Inner Classes</h2>
// HTML-NEXT: <ul class="class-container">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ TEST_F(JSONGeneratorTest, emitRecordJSON) {
],
"HasEnums": true,
"HasParents": true,
"HasProtectedMembers": true,
"HasPublicFunctions": true,
"HasRecords": true,
"HasVirtualParents": true,
Expand Down