diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2017-01-16 14:05:15 +0100 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2017-01-31 14:32:35 +0100 |
commit | 6f6dc9767badd4bcacd8f00ef0ed467bcabc6296 (patch) | |
tree | e381a1be3195be8c69abb84a3e59b0c5470e557c /doc-tool/src/dotty/tools/dottydoc/model/java.scala | |
parent | 248f469ddcf57067d02e8b1bea41237766a75cfb (diff) | |
download | dotty-6f6dc9767badd4bcacd8f00ef0ed467bcabc6296.tar.gz dotty-6f6dc9767badd4bcacd8f00ef0ed467bcabc6296.tar.bz2 dotty-6f6dc9767badd4bcacd8f00ef0ed467bcabc6296.zip |
Re-implement template expansion of references as filter
The original implementation used the template engine to recursively
expand references. This was very error-prone and with no typesafety and
proper stack traces it was very hard to diagnose. As such, these two
expansions (links and references) have been re-implemented as filters.
Diffstat (limited to 'doc-tool/src/dotty/tools/dottydoc/model/java.scala')
-rw-r--r-- | doc-tool/src/dotty/tools/dottydoc/model/java.scala | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/doc-tool/src/dotty/tools/dottydoc/model/java.scala b/doc-tool/src/dotty/tools/dottydoc/model/java.scala index c20206ced..c46414061 100644 --- a/doc-tool/src/dotty/tools/dottydoc/model/java.scala +++ b/doc-tool/src/dotty/tools/dottydoc/model/java.scala @@ -151,36 +151,42 @@ object java { "kind" -> "TypeReference", "title" -> title, "tpeLink" -> tpeLink.asJava, - "paramLinks" -> paramLinks.map(_.asJava).asJava + "paramLinks" -> paramLinks.map(_.asJava).asJava, + "scala" -> ref ).asJava case OrTypeReference(left, right) => Map( "kind" -> "OrTypeReference", "left" -> left.asJava, - "right" -> right.asJava + "right" -> right.asJava, + "scala" -> ref ).asJava case AndTypeReference(left, right) => Map( "kind" -> "AndTypeReference", "left" -> left.asJava, - "right" -> right.asJava + "right" -> right.asJava, + "scala" -> ref ).asJava case FunctionReference(args, returnValue) => Map( "kind" -> "FunctionReference", "args" -> args.map(_.asJava).asJava, - "returnValue" -> returnValue.asJava + "returnValue" -> returnValue.asJava, + "scala" -> ref ).asJava case TupleReference(args) => Map( "kind" -> "TupleReference", - "args" -> args.map(_.asJava).asJava + "args" -> args.map(_.asJava).asJava, + "scala" -> ref ).asJava case BoundsReference(low, high) => Map( "kind" -> "BoundsReference", "low" -> low.asJava, - "hight" -> high.asJava + "hight" -> high.asJava, + "scala" -> ref ).asJava case NamedReference(title, ref, isByName, isRepeated) => Map( @@ -188,12 +194,14 @@ object java { "title" -> title, "ref" -> ref.asJava, "isByName" -> isByName, - "isRepeated" -> isRepeated + "isRepeated" -> isRepeated, + "scala" -> ref ).asJava case ConstantReference(title) => Map( "kind" -> "ConstantReference", - "title" -> title + "title" -> title, + "scala" -> ref ).asJava } } @@ -203,19 +211,22 @@ object java { case UnsetLink(title, query) => Map( "kind" -> "UnsetLink", "title" -> title, - "query" -> query + "query" -> query, + "scala" -> link ).asJava case MaterializedLink(title, target) => Map( "kind" -> "MaterializedLink", "title" -> title, - "target" -> target + "target" -> target, + "scala" -> link ).asJava case NoLink(title, target) => Map( "kind" -> "NoLink", "title" -> title, - "target" -> target + "target" -> target, + "scala" -> link ).asJava } } |