Skip to content

Commit e144d9b

Browse files
committed
Fix rebase breakage
Because of the trailing blanks issue in the docs it's basically impossible to do a reliable rebase.
1 parent 72e6b04 commit e144d9b

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

scala3doc/src/dotty/dokka/model/api/internalExtensions.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ extension (member: Member):
6060
val memberWithExtra = member.asInstanceOf[WithExtraProperties[Member]]
6161
memberWithExtra.withNewExtras(memberWithExtra.getExtra plus ext).asInstanceOf[Member]
6262

63-
def copy(modifiers: Seq[Modifier]) =
63+
def copy(modifiers: Seq[Modifier]): Member =
6464
val ext = MemberExtension.getFrom(member).getOrElse(MemberExtension.empty).copy(modifiers = modifiers)
6565
putInMember(ext)
6666

67-
def withOrigin(origin: Origin) =
67+
def withOrigin(origin: Origin): Member =
6868
val ext = MemberExtension.getFrom(member).getOrElse(MemberExtension.empty).copy(origin = origin)
6969
putInMember(ext)
7070

71-
def withKind(kind: Kind) =
71+
def withKind(kind: Kind): Member =
7272
val ext = MemberExtension.getFrom(member).getOrElse(MemberExtension.empty).copy(kind = kind)
7373
putInMember(ext)
7474

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ class ScalaPageCreator(
3636
override def pageForModule(m: DModule): ModulePageNode = super.pageForModule(m)
3737

3838
private def updatePageNameForMember(page: PageNode, p: Member) =
39-
val name = p.kind match
40-
case Kind.Extension(_) => s"extension_${page.getName}"
41-
case _ => page.getName
39+
val name = page.getName
4240

4341
page.modified(name, page.getChildren)
4442

@@ -164,7 +162,7 @@ class ScalaPageCreator(
164162

165163
extension (b: DocBuilder):
166164
def descriptionIfNotEmpty(d: Documentable): DocBuilder = {
167-
val desc = contentForDescription(d).asScala.toSeq
165+
val desc = this.contentForDescription(d).asScala.toSeq
168166
val res = if desc.isEmpty then b else b
169167
.sourceSetDependentHint(
170168
Set(d.getDri),

0 commit comments

Comments
 (0)