From 5995dd30a50fe46cf6a17a84107bb0b1f1d7edf7 Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Fri, 3 Feb 2017 17:12:32 +0100
Subject: Add constructors to docs

---
 doc-tool/resources/_layouts/api-page.html          | 34 +++++++++++++++++++++-
 doc-tool/resources/css/api-page.css                | 32 ++++++++++----------
 .../tools/dottydoc/model/JavaConverters.scala      |  2 ++
 3 files changed, 51 insertions(+), 17 deletions(-)

(limited to 'doc-tool')

diff --git a/doc-tool/resources/_layouts/api-page.html b/doc-tool/resources/_layouts/api-page.html
index f73d29ae7..26a4290da 100644
--- a/doc-tool/resources/_layouts/api-page.html
+++ b/doc-tool/resources/_layouts/api-page.html
@@ -57,7 +57,39 @@ extraCSS:
     </div>
     {% endif %}
 
-    <h1 class="section {% if entity.hasVisibleMembers == false %}empty{% endif %}">Members</h1>
+    <h1 class="section {% if entity.constructors == null or entity.constructors.size == 0 %}empty{% endif %}">
+        Constructors
+    </h1>
+
+    <div id="entity-constructors" class="entity-section {% if entity.constructors == null or entity.constructors.size == 0 %}empty{% endif %}">
+        {% for constructor in entity.constructors %}
+            {% for plist in constructor %}
+            <div class="member">
+                <div class="member-title">
+                    <span class="member-name">{{ entity.name }}</span>
+                    <span class="no-left">(</span>
+                        {% if plist.isImplicit %}
+                        <span class="no-left keyword">implicit</span>
+                        {% endif %}
+                        {% for namedRef in plist.list %}
+                            <span class="{% if forloop.first %}no-left{% endif %}">
+                                {{ namedRef.title }}:{% if namedRef.isByName %} =&gt;{% endif %}
+                            </span>
+                            {% renderRef namedRef.ref %}
+                            {% if forloop.last != true %}
+                                <span class="no-left">, </span>
+                            {% endif %}
+                        {% endfor %}
+                    <span class="no-left">)</span>
+                </div>
+            </div>
+            {% endfor %}
+        {% endfor %}
+    </div>
+
+    <h1 class="section {% if entity.hasVisibleMembers == false %}empty{% endif %}">
+        Members
+    </h1>
 
     <div id="entity-members" class="entity-section {% if entity.hasVisibleMembers == false %}empty{% endif %}">
         {% for member in entity.members %}
diff --git a/doc-tool/resources/css/api-page.css b/doc-tool/resources/css/api-page.css
index a64317545..380efb834 100644
--- a/doc-tool/resources/css/api-page.css
+++ b/doc-tool/resources/css/api-page.css
@@ -70,70 +70,70 @@ h1.section {
     display: none;
 }
 
-div#entity-members > div.member.protected {
+div.entity-section > div.member.protected {
     display: none;
 }
 
-div#entity-members > div.member.private {
+div.entity-section > div.member.private {
     display: none;
 }
 
-div#entity-members > div.member {
+div.entity-section > div.member {
     margin-bottom: 30px;
 }
 
-div#entity-members > div.member:last-child {
+div.entity-section > div.member:last-child {
     margin-bottom: 0px;
 }
 
-div#entity-members > div.member > div.member-title {
+div.entity-section > div.member > div.member-title {
     font-family: "Source Code Pro", sans-serif;
 }
 
-div#entity-members > div.member > div.member-title > span.member-name {
+div.entity-section > div.member > div.member-title > span.member-name {
     color: #458;
     font-weight: 600;
 }
 
-div#entity-members > div.member > div.member-title > span.member-name.implicitly-added {
+div.entity-section > div.member > div.member-title > span.member-name.implicitly-added {
     color: #019875;
 }
 
-div#entity-members > div.member > div.member-title span.keyword {
+div.entity-section > div.member > div.member-title span.keyword {
     font-weight: 600;
     margin-right: 11px;
 }
 
-div#entity-members > div.member > div.member-title span.no-left {
+div.entity-section > div.member > div.member-title span.no-left {
     margin-left: -11px;
 }
 
-div#entity-members > div.member > div.member-title span.no-right {
+div.entity-section > div.member > div.member-title span.no-right {
     margin-right: -11px;
 }
 
-div#entity-members > div.member > div.member-title > span.expand-button {
+div.entity-section > div.member > div.member-title > span.expand-button {
     color: rgba(167, 161, 161, 0.5);
 }
 
-div#entity-members > div.member > div.member-title > span.expand-button:hover {
+div.entity-section > div.member > div.member-title > span.expand-button:hover {
     color: rgb(167, 161, 161);
     cursor: pointer;
     user-select: none;
 }
 
-div#entity-members > div.member > div.member-body {
+div.entity-section > div.member > div.member-body {
     margin: 5px 0 0 39px;
 }
 
-div#entity-members > div.member > div.member-body > div.member-body-short.toggled {
+div.entity-section > div.member > div.member-body > div.member-body-short.toggled {
     display: none;
 }
 
-div#entity-members > div.member > div.member-body > div.member-body-long {
+div.entity-section > div.member > div.member-body > div.member-body-long {
     display: none;
 }
 
-div#entity-members > div.member > div.member-body > div.member-body-long.toggled {
+div.entity-section > div.member > div.member-body > div.member-body-long.toggled {
     display: block;
 }
diff --git a/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala b/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala
index 9c423c3ea..e7cf54a03 100644
--- a/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala
@@ -70,6 +70,7 @@ object JavaConverters {
       "typeParams" -> ent.typeParams.asJava,
       "superTypes" -> ent.superTypes.map(_.asJava).asJava,
       "comment" -> ent.comment.map(_.asJava).asJava,
+      "constructors" -> ent.constructors.map(_.map(_.asJava).asJava).asJava,
       "isPrivate" -> ent.isPrivate,
       "isProtected" -> ent.isProtected,
       "hasVisibleMembers" -> ent.hasVisibleMembers,
@@ -90,6 +91,7 @@ object JavaConverters {
       "typeParams" -> ent.typeParams.asJava,
       "superTypes" -> ent.superTypes.map(_.asJava).asJava,
       "comment"    -> ent.comment.map(_.asJava).asJava,
+      "constructors" -> ent.constructors.map(_.map(_.asJava).asJava).asJava,
       "isPrivate" -> ent.isPrivate,
       "isProtected" -> ent.isProtected,
       "hasVisibleMembers" -> ent.hasVisibleMembers,
-- 
cgit v1.2.3