diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2017-01-13 17:55:30 +0100 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2017-01-31 14:31:08 +0100 |
| commit | 248f469ddcf57067d02e8b1bea41237766a75cfb (patch) | |
| tree | 44d2d1aa995376977fb63d42dd471a4a9b4fee26 /doc-tool/src | |
| parent | 3313ce1985a9ddbad37c28baeef838266d8ed47a (diff) | |
| download | dotty-248f469ddcf57067d02e8b1bea41237766a75cfb.tar.gz dotty-248f469ddcf57067d02e8b1bea41237766a75cfb.tar.bz2 dotty-248f469ddcf57067d02e8b1bea41237766a75cfb.zip | |
Add proper materialization of references
Diffstat (limited to 'doc-tool/src')
3 files changed, 6 insertions, 8 deletions
diff --git a/doc-tool/src/dotty/tools/dottydoc/model/java.scala b/doc-tool/src/dotty/tools/dottydoc/model/java.scala index 6ec35875f..c20206ced 100644 --- a/doc-tool/src/dotty/tools/dottydoc/model/java.scala +++ b/doc-tool/src/dotty/tools/dottydoc/model/java.scala @@ -169,7 +169,7 @@ object java { case FunctionReference(args, returnValue) => Map( "kind" -> "FunctionReference", "args" -> args.map(_.asJava).asJava, - "returnValue" -> returnValue + "returnValue" -> returnValue.asJava ).asJava case TupleReference(args) => Map( diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/LiquidTemplate.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/LiquidTemplate.scala index 6d1ee146a..99ee54b74 100644 --- a/doc-tool/src/dotty/tools/dottydoc/staticsite/LiquidTemplate.scala +++ b/doc-tool/src/dotty/tools/dottydoc/staticsite/LiquidTemplate.scala @@ -47,12 +47,8 @@ case class LiquidTemplate(contents: String) extends ResourceFinder { includes .get(incResource) .map { template => - val additionalParams = - // include has `with` clause: - if (nodes.length > 1) params + (origInclude -> nodes(1).render(ctx)) - else params - - LiquidTemplate(template).render(additionalParams, includes) + if (nodes.length > 1) ctx.put(origInclude, nodes(1).render(ctx)) + LiquidTemplate(template).render(Map.empty ++ ctx.getVariables.asScala, includes) } .getOrElse { /*dottydoc.*/println(s"couldn't find include file '$origInclude'") diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala index 946de97c3..03e78024c 100644 --- a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala +++ b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala @@ -311,7 +311,9 @@ case class Site(val root: JFile, val documentation: Map[String, Package]) extend val defaultIncludes: Map[String, String] = Map( "header.html" -> "/_includes/header.html", "scala-logo.html" -> "/_includes/scala-logo.html", - "toc.html" -> "/_includes/toc.html" + "toc.html" -> "/_includes/toc.html", + "reference.html" -> "/_includes/reference.html", + "link.html" -> "/_includes/link.html" ).mapValues(getResource) |