diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2016-05-10 11:59:44 +0200 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2016-08-19 15:37:24 +0200 |
| commit | 0bfdc911b7f0c505d470f31091e7efb066849ff5 (patch) | |
| tree | 6d6029504f24150abbb2d8fcb225acc5fd632236 /dottydoc/jvm/src | |
| parent | f084357c79d9c1ee9783ca07b9cfb84fb725328a (diff) | |
| download | dotty-0bfdc911b7f0c505d470f31091e7efb066849ff5.tar.gz dotty-0bfdc911b7f0c505d470f31091e7efb066849ff5.tar.bz2 dotty-0bfdc911b7f0c505d470f31091e7efb066849ff5.zip | |
Fix #7, "immutable" package mistaken for "Immutable" trait
Diffstat (limited to 'dottydoc/jvm/src')
| -rw-r--r-- | dottydoc/jvm/src/dotty/tools/dottydoc/html/EntityPage.scala | 19 | ||||
| -rw-r--r-- | dottydoc/jvm/src/dotty/tools/dottydoc/util/IndexWriters.scala | 4 |
2 files changed, 17 insertions, 6 deletions
diff --git a/dottydoc/jvm/src/dotty/tools/dottydoc/html/EntityPage.scala b/dottydoc/jvm/src/dotty/tools/dottydoc/html/EntityPage.scala index f74e904ea..cfac8333d 100644 --- 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 index 1d9631e75..65ed70773 100644 --- 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 |