From cedbb785ebe615c26d60b3660a6b098be8f78e16 Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Wed, 22 Jun 2016 11:09:49 +0200
Subject: 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
---
 dottydoc/js/src/html/Member.scala | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'dottydoc/js')

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 {
-- 
cgit v1.2.3