Fix #7, "immutable" package mistaken for "Immutable" trait

felixmulder · felixmulder · commit 0bfdc911b7f0 · 2016-08-19T15:37:24.000+02:00
diff --git a/dottydoc/js/src/html/EntityLayout.scala b/dottydoc/js/src/html/EntityLayout.scala
@@ -12,7 +12,7 @@ case class EntityLayout(entity: Entity) extends MemberLayout {
     cls := "page-content",
     div(raw(entity.comment.fold("")(_.body))),
     entity match {
-      case e: Entity with Members =>
+      case e: Entity with Members if e.members.nonEmpty =>
         Seq(
           h5("Members"),
           div(
diff --git a/dottydoc/jvm/src/dotty/tools/dottydoc/html/EntityPage.scala b/dottydoc/jvm/src/dotty/tools/dottydoc/html/EntityPage.scala
@@ -11,8 +11,14 @@ case class EntityPage(entity: Entity, packages: Map[String, Package]) {
   import prickle._
   import util.internal.setters._
 
-  private def relPath(to: String, from: Entity) =
-    "../" * from.path.length + to
+  private def relPath(to: String, from: Entity) = {
+    val len = from.path.length + (from match {
+      case _: Package => 1
+      case _ => 0
+    })
+
+    "../" * len + to
+  }
 
   def render = "<!DOCTYPE html>" + html(
     head(
@@ -76,8 +82,13 @@ case class EntityPage(entity: Entity, packages: Map[String, Package]) {
     )
   )
 
-  private def relativePath(to: Entity) =
-    util.traversing.relativePath(entity, to)
+  private def relativePath(to: Entity) = {
+    val prefix = entity match {
+      case _: Package => "../"
+      case _ => ""
+    }
+    prefix + util.traversing.relativePath(entity, to)
+  }
 
   def packageView = ul(
     cls := "mdl-list packages",
diff --git a/dottydoc/jvm/src/dotty/tools/dottydoc/util/IndexWriters.scala b/dottydoc/jvm/src/dotty/tools/dottydoc/util/IndexWriters.scala
@@ -12,8 +12,8 @@ object IndexWriters {
       println(s"""Writing '${pack.path.mkString(".")}'""")
       writeFile(
         EntityPage(pack, packs).render,
-        outPath + pack.path.dropRight(1).mkString("/", "/", "/"),
-        s"${pack.name.split("\\.").last}.html")
+        outPath + pack.path.mkString("/", "/", "/"),
+        "index.html")
 
       for {
         child <- pack.children
