Skip to content

Commit 9279620

Browse files
committed
Hide private & protected members by default
1 parent abb54e7 commit 9279620

File tree

4 files changed

+35
-12
lines changed

4 files changed

+35
-12
lines changed

doc-tool/resources/_layouts/api-page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h1 class="section">Members</h1>
2727

2828
<div id="entity-members" class="entity-section">
2929
{% for member in entity.members %}
30-
<div class="member">
30+
<div class="member {% if member.isPrivate %}private{% elsif member.isProtected %}protected{% endif %}">
3131
<div class="member-title">
3232
<span class="member-annotations">
3333
{% for annot in member.annotations %}@{{ annot | split: '.' | last }} {% endfor %}

doc-tool/resources/css/api-page.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ h1.section {
3838
margin: 30px 0;
3939
}
4040

41+
div#entity-members > div.member.protected {
42+
display: none;
43+
}
44+
45+
div#entity-members > div.member.private {
46+
display: none;
47+
}
48+
4149
div#entity-members > div.member {
4250
margin-bottom: 30px;
4351
}

doc-tool/src/dotty/tools/dottydoc/model/entities.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ trait Modifiers {
5353

5454
val isPrivate: Boolean =
5555
modifiers.contains("private")
56+
57+
val isProtected: Boolean =
58+
modifiers.contains("protected")
5659
}
5760

5861
trait TypeParams {

doc-tool/src/dotty/tools/dottydoc/model/java.scala

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,17 @@ object java {
5757

5858
implicit class JavaCaseClass(val ent: CaseClass) extends AnyVal {
5959
def asJava(extras: Map[String, _] = Map.empty): JMap[String, _] = (Map(
60-
"kind" -> ent.kind,
60+
"kind" -> ent.kind,
6161
"annotations" -> ent.annotations.asJava,
62-
"name" -> ent.name,
63-
"members" -> ent.members.map(_.asJava()).asJava,
64-
"modifiers" -> ent.modifiers.asJava,
65-
"path" -> ent.path.asJava,
62+
"name" -> ent.name,
63+
"members" -> ent.members.map(_.asJava()).asJava,
64+
"modifiers" -> ent.modifiers.asJava,
65+
"path" -> ent.path.asJava,
6666
"typeParams" -> ent.typeParams.asJava,
6767
"superTypes" -> ent.superTypes.map(_.asJava).asJava,
68-
"comment" -> ent.comment.map(_.asJava).asJava
68+
"comment" -> ent.comment.map(_.asJava).asJava,
69+
"isPrivate" -> ent.isPrivate,
70+
"isProtected" -> ent.isProtected
6971
) ++ extras).asJava
7072
}
7173

@@ -79,7 +81,9 @@ object java {
7981
"path" -> ent.path.asJava,
8082
"typeParams" -> ent.typeParams.asJava,
8183
"superTypes" -> ent.superTypes.map(_.asJava).asJava,
82-
"comment" -> ent.comment.map(_.asJava).asJava
84+
"comment" -> ent.comment.map(_.asJava).asJava,
85+
"isPrivate" -> ent.isPrivate,
86+
"isProtected" -> ent.isProtected
8387
) ++ extras).asJava
8488
}
8589

@@ -93,7 +97,9 @@ object java {
9397
"path" -> ent.path.asJava,
9498
"typeParams" -> ent.typeParams.asJava,
9599
"superTypes" -> ent.superTypes.map(_.asJava).asJava,
96-
"comment" -> ent.comment.map(_.asJava).asJava
100+
"comment" -> ent.comment.map(_.asJava).asJava,
101+
"isPrivate" -> ent.isPrivate,
102+
"isProtected" -> ent.isProtected
97103
) ++ extras).asJava
98104
}
99105

@@ -106,7 +112,9 @@ object java {
106112
"modifiers" -> ent.modifiers.asJava,
107113
"path" -> ent.path.asJava,
108114
"superTypes" -> ent.superTypes.map(_.asJava).asJava,
109-
"comment" -> ent.comment.map(_.asJava).asJava
115+
"comment" -> ent.comment.map(_.asJava).asJava,
116+
"isPrivate" -> ent.isPrivate,
117+
"isProtected" -> ent.isProtected
110118
) ++ extras).asJava
111119
}
112120

@@ -121,7 +129,9 @@ object java {
121129
"typeParams" -> ent.typeParams.asJava,
122130
"paramLists" -> ent.paramLists.map(_.asJava).asJava,
123131
"comment" -> ent.comment.map(_.asJava).asJava,
124-
"implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).asJava
132+
"implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).asJava,
133+
"isPrivate" -> ent.isPrivate,
134+
"isProtected" -> ent.isProtected
125135
).asJava
126136
}
127137

@@ -134,7 +144,9 @@ object java {
134144
"path" -> ent.path.asJava,
135145
"returnValue" -> ent.returnValue.asJava,
136146
"comment" -> ent.comment.map(_.asJava).asJava,
137-
"implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).asJava
147+
"implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).asJava,
148+
"isPrivate" -> ent.isPrivate,
149+
"isProtected" -> ent.isProtected
138150
).asJava
139151
}
140152

0 commit comments

Comments
 (0)