diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2016-08-09 19:32:15 +0200 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2016-08-19 15:37:34 +0200 |
| commit | 0d89be8ad7078f51d3d7042c23cae2fe27319218 (patch) | |
| tree | d15a232ad23e8870a85404d6f774ae5b3d48616b /dottydoc | |
| parent | 5cd1d51c3cb44b2c9b2c1abd433da50a00e5219e (diff) | |
| download | dotty-0d89be8ad7078f51d3d7042c23cae2fe27319218.tar.gz dotty-0d89be8ad7078f51d3d7042c23cae2fe27319218.tar.bz2 dotty-0d89be8ad7078f51d3d7042c23cae2fe27319218.zip | |
Add `currentEntity` to templating API
Diffstat (limited to 'dottydoc')
| -rw-r--r-- | dottydoc/src/dotty/tools/dottydoc/util/OutputWriter.scala | 6 | ||||
| -rw-r--r-- | dottydoc/test/WhitelistedStdLibMain.scala | 30 |
2 files changed, 19 insertions, 17 deletions
diff --git a/dottydoc/src/dotty/tools/dottydoc/util/OutputWriter.scala b/dottydoc/src/dotty/tools/dottydoc/util/OutputWriter.scala index 2b4c49033..8e288ae7f 100644 --- a/dottydoc/src/dotty/tools/dottydoc/util/OutputWriter.scala +++ b/dottydoc/src/dotty/tools/dottydoc/util/OutputWriter.scala @@ -62,8 +62,9 @@ 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() @@ -71,7 +72,8 @@ class OutputWriter { 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") diff --git a/dottydoc/test/WhitelistedStdLibMain.scala b/dottydoc/test/WhitelistedStdLibMain.scala index b4ea34d2c..e32b8800c 100644 --- a/dottydoc/test/WhitelistedStdLibMain.scala +++ b/dottydoc/test/WhitelistedStdLibMain.scala @@ -21,20 +21,20 @@ 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]) = { @@ -42,6 +42,6 @@ object WhitelistedStandardLib extends dottydoc.java.Dottydoc { "-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) } } |