Add currentEntity to templating API

Author: felixmulder

dottydoc/src/dotty/tools/dottydoc/util/OutputWriter.scala

@@ -62,16 +62,18 @@ class OutputWriter {
   }
 
   def expandTemplate(templatePath: String, entity: Entity, outPath: String): String = try {
+    import model.json._
     import model.java._
-    import scala.collection.JavaConverters._
+
     val writer = new _root_.java.io.StringWriter()
     val mf     = new DefaultMustacheFactory()
 
     def toRoot = "../" * (entity.path.length - 1)
 
     val entityWithExtras = entity.asJava(Map(
       "assets" -> s"${toRoot}docassets",
-      "index"  -> s"${toRoot}docassets/index.js"
+      "index"  -> s"${toRoot}docassets/index.js",
+      "currentEntity" -> entity.json
     ))
 
     mf.compile(new JFileReader(templatePath), "template")

dottydoc/test/WhitelistedStdLibMain.scala

@@ -21,27 +21,27 @@ object WhitelistedStandardLib extends dottydoc.java.Dottydoc {
   }
 
   private val resources = List(
-    "../js-dottydoc/resources/MaterialIcons-Regular.eot",
-    "../js-dottydoc/resources/MaterialIcons-Regular.ijmap",
-    "../js-dottydoc/resources/MaterialIcons-Regular.svg",
-    "../js-dottydoc/resources/MaterialIcons-Regular.ttf",
-    "../js-dottydoc/resources/MaterialIcons-Regular.woff",
-    "../js-dottydoc/resources/MaterialIcons-Regular.woff2",
-    "../js-dottydoc/resources/codepoints",
-    "../js-dottydoc/resources/github.css",
-    "../js-dottydoc/resources/highlight.pack.js",
-    "../js-dottydoc/resources/index.css",
-    "../js-dottydoc/resources/material-icons.css",
-    "../js-dottydoc/resources/material.min.css",
-    "../js-dottydoc/resources/material.min.js"/*,
-    "resources/dottydoc-fastopt.js"*/
+    "../../dottydoc-client/resources/MaterialIcons-Regular.eot",
+    "../../dottydoc-client/resources/MaterialIcons-Regular.ijmap",
+    "../../dottydoc-client/resources/MaterialIcons-Regular.svg",
+    "../../dottydoc-client/resources/MaterialIcons-Regular.ttf",
+    "../../dottydoc-client/resources/MaterialIcons-Regular.woff",
+    "../../dottydoc-client/resources/MaterialIcons-Regular.woff2",
+    "../../dottydoc-client/resources/codepoints",
+    "../../dottydoc-client/resources/github.css",
+    "../../dottydoc-client/resources/highlight.pack.js",
+    "../../dottydoc-client/resources/index.css",
+    "../../dottydoc-client/resources/material-icons.css",
+    "../../dottydoc-client/resources/material.min.css",
+    "../../dottydoc-client/resources/material.min.js",
+    "../../dottydoc-client/target/scala-2.11/dottydoc-client-fastopt.js"
   )
 
   override def main(args: Array[String]) = {
     val compilerArgs =
       "-language:Scala2" +: "-Ydoc-output" +: "../build/dottydoc" +: files.toArray
 
     val index = createIndex(compilerArgs)
-    buildDocs("../build/dottydoc", "../js-dottydoc/template.html", resources.asJava, index)
+    buildDocs("../build/dottydoc", "../../dottydoc-client/resources/template.html", resources.asJava, index)
   }
 }

project/Build.scala

@@ -200,7 +200,7 @@ object DottyBuild extends Build {
       addCommandAlias("partest",                   ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test;runPartestRunner") ++
       addCommandAlias("partest-only",              ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test-only dotc.tests;runPartestRunner") ++
       addCommandAlias("partest-only-no-bootstrap", ";test:package;package;                        lockPartestFile;test:test-only dotc.tests;runPartestRunner") ++
-      addCommandAlias("dottydoc", ";dottydocJVM/run")
+      addCommandAlias("dottydoc", ";dottydoc/run")
     ).
     settings(publishing)