Skip to content

Commit 9effbe4

Browse files
committed
Move definition classes to documentation
1 parent d742110 commit 9effbe4

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

scala3doc/resources/dotty_res/styles/scalastyle.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ dl.attributes > dt.implicit {
367367
}
368368
dl.attributes > dd {
369369
display: block;
370-
padding-left: 5em;
370+
padding-left: 6em;
371371
margin-bottom: 5px;
372372
min-height: 15px;
373373
}
@@ -462,7 +462,7 @@ footer .pull-right {
462462

463463
.expand .modifiers {
464464
display: inline-table;
465-
min-width: 4em;
465+
min-width: 7em;
466466
}
467467

468468
.signature {
@@ -519,6 +519,10 @@ footer .pull-right {
519519
margin-left: 6.5em;
520520
}
521521

522+
.doc code {
523+
padding: 0;
524+
}
525+
522526
.documentableElement:hover {
523527
cursor: pointer;
524528
border-left: 0.25em solid var(--leftbar-bg);

scala3doc/src/dotty/dokka/translators/ScalaContentBuilder.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,10 +494,6 @@ class ScalaPageContentBuilder(
494494
case Some(dri: DRI) => SLink(name, dri)
495495
case None => name
496496
Signature("Exported from ", signatureName)
497-
case Origin.Overrides(overridenMembers) =>
498-
def intersperse(xs: Seq[SLink]): Seq[(String | SLink)] =
499-
xs.flatMap(Seq(_, " -> ")).dropRight(1).asInstanceOf[Seq[(String | SLink)]] // dropRight returns `Seq[Object]`
500-
Signature("Definition classes: ").join(Signature(intersperse(overridenMembers.map(SLink(_, _))):_*))
501497
case _ => Nil
502498
}
503499
val styles: Set[Style] = if documentable.deprecated.isDefined then Set(TextStyle.Strikethrough) else Set.empty

scala3doc/src/dotty/dokka/translators/ScalaPageCreator.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class ScalaPageCreator(
205205

206206
def contentForConstructors(c: DClass) =
207207
b.documentableTab("Constructors")(
208-
DocumentableGroup(None, c.membersBy(_.kind.isInstanceOf[Kind.Constructor])._1)
208+
DocumentableGroup(None, c.membersBy(_.kind.isInstanceOf[Kind.Constructor]))
209209
)
210210

211211

scala3doc/src/dotty/renderers/MemberRenderer.scala

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,15 @@ class MemberRenderer(signatureRenderer: SignatureRenderer, buildNode: ContentNod
2929

3030
def tableRow(name: String, content: AppliedTag) = Seq(dt(name), dd(content))
3131

32+
def defintionClasses(m: Member) = m.origin match
33+
case Origin.Overrides(defs) =>
34+
def renderDef(d: Overriden): Seq[TagArg] =
35+
Seq(signatureRenderer.renderLink(d.name, d.dri), " -> ")
36+
37+
val nodes: Seq[TagArg] = defs.flatMap(renderDef).dropRight(1) // drop trailing arrow
38+
tableRow("Definition Classes", div(nodes:_*))
39+
40+
case _ => Nil
3241

3342
def docAttributes(m: Member): Seq[AppliedTag] =
3443

@@ -102,6 +111,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer, buildNode: ContentNod
102111
docAttributes(m),
103112
companion(m),
104113
deprecation(m),
114+
defintionClasses(m),
105115
source(m),
106116
)
107117
)

0 commit comments

Comments
 (0)