Remove API entry

Author: pikinier20

scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala

@@ -105,14 +105,14 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
       case _ => Nil
     }
 
-    def renderNested(nav: Page, apiNav: Boolean, nestLevel: Int): (Boolean, AppliedTag) =
+    def renderNested(nav: Page, nestLevel: Int): (Boolean, AppliedTag) =
       val isSelected = nav.link.dri == pageLink.dri
 
       def linkHtml(expanded: Boolean = false, withArrow: Boolean = false) =
         val attrs: Seq[String] = Seq(
           Option.when(isSelected)("selected h100"),
           Option.when(expanded)("expanded cs"),
-          Option.when(!apiNav)("de")
+          Option.when(!nav.content.isInstanceOf[Member])("de")
         ).flatten
         val icon = nav.content match {
           case m: Member => navigationIcon(m)
@@ -125,10 +125,10 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
           )
         )
 
-      nav.children.filter(_.content.isInstanceOf[Member] == apiNav).filterNot(_.hidden) match
+      nav.children.filterNot(_.hidden) match
         case Nil => isSelected -> div(cls := s"ni n$nestLevel ${if isSelected || nestLevel == 0 then "expanded" else ""}")(linkHtml())
         case children =>
-          val nested = children.map(renderNested(_, apiNav, nestLevel + 1))
+          val nested = children.map(renderNested(_, nestLevel + 1))
           val expanded = nested.exists(_._1) || isSelected
           val attr =
             if expanded || isSelected || nestLevel == 0 then Seq(cls := s"ni n$nestLevel expanded") else Seq(cls := s"ni n$nestLevel")
@@ -137,9 +137,9 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
             nested.map(_._2)
           )
 
-
-    val apiNav = renderNested(navigablePage, true, 0)
-    val docsNav = renderNested(navigablePage, false, 0)
+    // TODO: The apiNav and docsNav should be optional and based on their existence, the buttons on UI should be active or not.
+    val apiNav = rootApiPage.fold((false, span(cls := "ni")))(renderNested(_, 0))
+    val docsNav = rootDocsPage.fold((false, span(cls := "ni")))(renderNested(_, 0))
 
     (apiNav, docsNav)
 

scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala

@@ -35,10 +35,10 @@ abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], prot
     val childrenPages = member.members.filter(_.needsOwnPage)
     Page(Link(member.name, member.dri), member, childrenPages.map(memberPage))
 
-  val navigablePage: Page =
-    val rootPckPage = memberPage(rootPackage)
-    staticSite match
-      case None => rootPckPage.withTitle(args.name)
+  val rootApiPage: Option[Page] = Some(memberPage(rootPackage)).filter(_.children.nonEmpty).map(_.withTitle(ctx.args.name))
+
+  val rootDocsPage: Option[Page] = staticSite match
+      case None => None
       case Some(siteContext) =>
         val rootTemplate = siteContext.staticSiteRoot.rootTemplate
 
@@ -79,12 +79,8 @@ abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], prot
 
         val newRoot = newTemplates.head
 
-        if newRoot.children.isEmpty && newRoot.templateFile.rawCode.isEmpty
-        then rootPckPage.withTitle(args.name)
-        else {
-          val newRootPage = templateToPage(newRoot, siteContext)
-          newRootPage.withNewChildren(Seq(rootPckPage.withTitle("API")))
-        }
+        Some(newRoot).filter(r => r.children.nonEmpty || r.templateFile.rawCode.nonEmpty)
+          .map(templateToPage(_, siteContext))
 
   val redirectPages: Seq[Page] = staticSite.fold(Seq.empty)(siteContext => siteContext.redirectTemplates.map {
     case (template, driFrom, driTo) =>
@@ -96,7 +92,7 @@ abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], prot
    * Here we have to retrive index pages from hidden pages and replace fake index pages in navigable page tree.
    */
   val allPages: Seq[Page] =
-    val all = navigablePage +: redirectPages
+    val all = rootApiPage ++ rootDocsPage ++ redirectPages
     // We need to check for conflicts only if we have top-level member called docs
     val hasPotentialConflict =
       rootPackage.members.exists(m => m.name.startsWith("_docs"))
@@ -111,7 +107,7 @@ abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], prot
 
       all.foreach(walk)
 
-    all
+    all.toSeq
 
   def renderContent(page: Page) = page.content match
     case m: Member =>