diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2016-06-22 11:09:49 +0200 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2016-08-19 15:37:27 +0200 |
commit | cedbb785ebe615c26d60b3660a6b098be8f78e16 (patch) | |
tree | 0b5e2407c8cdc2ed0b9424de2f8d6a2343725ca9 /dottydoc/js | |
parent | c6a744681dc729009e8081f51ed0c62d9bcfc18c (diff) | |
download | dotty-cedbb785ebe615c26d60b3660a6b098be8f78e16.tar.gz dotty-cedbb785ebe615c26d60b3660a6b098be8f78e16.tar.bz2 dotty-cedbb785ebe615c26d60b3660a6b098be8f78e16.zip |
Complete proper structure for return types
Return types now consist of:
- TypeReference (containing all type information)
- OrTypeReference/AndTypeReference
- ConstantReference
Instead of being simply a TypeReference
Diffstat (limited to 'dottydoc/js')
-rw-r--r-- | dottydoc/js/src/html/Member.scala | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/dottydoc/js/src/html/Member.scala b/dottydoc/js/src/html/Member.scala index 92c758caf..4ab214fdb 100644 --- a/dottydoc/js/src/html/Member.scala +++ b/dottydoc/js/src/html/Member.scala @@ -122,15 +122,30 @@ trait MemberLayout { if (rv.paramLinks.nonEmpty) span( returnValue, - "[", rv.paramLinks.map(decodeTpeLink), "]" //FIXME: does not get spacing and commas + "[", + rv.paramLinks + .map(decodeTpeLink) + .flatMap { sp => + Seq(sp, span(cls := "type-separator no-left-margin", ",").render) + } + .dropRight(1), + "]" ).render else returnValue - case _ => ??? /** TODO: should not happen currently, but when - * `returnValue` in factories is changes - this will get - * triggered - */ - } + case OrTypeReference(left, right) => span( + cls := "member-return-value or-type", + link(left), + span(cls := "type-separator", "|"), + link(right) + ).render + case AndTypeReference(left, right) => span( + cls := "member-return-value and-type", + link(left), + span(cls := "type-separator", "&"), + link(right) + ).render + } } m match { |