Fix breadcrumbs and add tests

Author: romanowski

scala3doc-testcases/src/tests/docString.scala

@@ -31,7 +31,6 @@ package wikilinks:
 
   /**
    * [[tests.commonlinks.SomeOtherPackage!method]]
-   * [[tests.commonlinks.SomeOtherPackage#]]
    * [[tests.commonlinks.SomeOtherEnum!A]]
    * @syntax wiki
    */
@@ -66,7 +65,6 @@ package mdlinks:
 
   /**
    * [[tests.commonlinks.SomeOtherPackage!method]]
-   * [[tests.commonlinks.SomeOtherPackage#]]
    * [[tests.commonlinks.SomeOtherEnum!A]]
    * @syntax wiki
    */

scala3doc/src/dotty/dokka/site/StaticSiteContext.scala

@@ -38,7 +38,8 @@ class StaticSiteContext(
     if (!Files.exists(sidebarFile)) None
     else Some(Sidebar.load(Files.readAllLines(sidebarFile).asScala.mkString("\n")))
 
-  lazy val templates: Seq[LoadedTemplate] = sideBarConfig.fold(loadAllFiles())(_.map(loadSidebarContent))
+  lazy val templates: Seq[LoadedTemplate] =
+    sideBarConfig.fold(loadAllFiles().sortBy(_.templateFile.title))(_.map(loadSidebarContent))
 
   lazy val orphanedTemplates: Seq[LoadedTemplate] = {
     def doFlatten(t: LoadedTemplate): Seq[Path] =
@@ -88,7 +89,7 @@ class StaticSiteContext(
 
         val templateFile = if (from.isDirectory) loadIndexPage() else loadTemplateFile(from)
 
-        val processedChildren = if !isBlog then children else
+        val processedChildren = if !isBlog then children.sortBy(_.templateFile.title) else
           def dateFrom(p: LoadedTemplate): String =
             val pageSettings = p.templateFile.settings.get("page").collect{ case m: Map[String @unchecked, _] => m }
             pageSettings.flatMap(_.get("date").collect{ case s: String => s}).getOrElse("1900-01-01") // blogs without date are last
@@ -128,7 +129,7 @@ class StaticSiteContext(
   private def loadAllFiles() =
     def dir(name: String)= List(new File(root, name)).filter(_.isDirectory)
     dir("docs").flatMap(_.listFiles()).flatMap(loadTemplate(_, isBlog = false))
-      ++ dir("blog").flatMap(loadTemplate(_, isBlog = true)).sortBy(_.templateFile.title)
+      ++ dir("blog").flatMap(loadTemplate(_, isBlog = true))
 
   def driForLink(template: TemplateFile, link: String): Seq[DRI] =
     val pathsDri: Option[Seq[DRI]] = Try {

scala3doc/src/dotty/renderers/HtmlRenderer.scala

@@ -163,7 +163,7 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx
 
     val parentsHtml =
       val innerTags = parents.flatMap[TagArg](b => Seq(
-          a(href := pathToPage(b.dri, link.dri))(b.name),
+          a(href := pathToPage(link.dri, b.dri))(b.name),
           "/"
         )).dropRight(1)
       div(cls := "breadcrumbs")(innerTags:_*)

scala3doc/test/dotty/dokka/site/NavitationTest.scala renamed to scala3doc/test/dotty/dokka/site/NavigationTest.scala

@@ -3,7 +3,7 @@ package site
 
 import org.junit.Test
 
-class NavitationTest extends BaseHtmlTest:
+class NavigationTest extends BaseHtmlTest:
 
   case class NavMenuTestEntry( name: String, link: String, nested: Seq[NavMenuTestEntry])
 
@@ -25,10 +25,10 @@ class NavitationTest extends BaseHtmlTest:
   @Test
   def testBasicNavigation() = withGeneratedSite(testDocPath.resolve("basic")){
     val topLevelNav = NavMenuTestEntry(projectName, "index.html", Seq(
-      NavMenuTestEntry("Adoc", "Adoc.html", Seq()),
       NavMenuTestEntry("A directory", "dir/index.html", Seq(
         NavMenuTestEntry("Nested in a directory", "dir/nested.html", Nil)
       )),
+      NavMenuTestEntry("Adoc", "Adoc.html", Seq()),
       NavMenuTestEntry("Basic test", "../index.html", Seq()),
       NavMenuTestEntry("API", "../api/index.html", Seq(
         NavMenuTestEntry("tests.site", "../api/tests/site.html", Seq(

scala3doc/test/dotty/dokka/site/SiteGeneratationTest.scala

@@ -72,6 +72,12 @@ class SiteGeneratationTest extends BaseHtmlTest:
     withHtmlFile("docs/Adoc.html"){ content  =>
         content.assertAttr("p a","href", "../api/tests/site/SomeClass.html")
     }
+
+    withHtmlFile("api/tests/site/SomeClass.html"){ content  =>
+      content.assertAttr(".breadcrumbs a","href",
+        "../../../docs/index.html", "../../index.html", "../site.html", "SomeClass.html"
+      )
+    }
   }
 
   @Test