From 688dc0bd667aa2ee816d5ce6fcc1391afde9f3cb Mon Sep 17 00:00:00 2001
From: Varunram <vrg2009@ymail.com>
Date: Sat, 20 May 2017 23:50:17 +0530
Subject: [PATCH 1/3] Prelimary Fix for #2211:add expand/collapse all to
 sections of dottydoc

---
 doc-tool/resources/_layouts/api-page.html     | 22 +++++++++++++------
 doc-tool/resources/css/api-page.css           | 21 ++++++++++++++++++
 .../dotty/tools/dottydoc/model/entities.scala |  2 +-
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/doc-tool/resources/_layouts/api-page.html b/doc-tool/resources/_layouts/api-page.html
index fb2d466b43b1..d52dec11e3fa 100644
--- a/doc-tool/resources/_layouts/api-page.html
+++ b/doc-tool/resources/_layouts/api-page.html
@@ -67,6 +67,7 @@
             {% endif %}
 
             <h1 class="section {% if entity.constructors == null or entity.constructors.size == 0 %}empty{% endif %}">
+                <span class="expand-button" onclick="toggleConstructorsBody(this, '{{ member.signature }}');">[-]</span>
                 Constructors
             </h1>
 
@@ -97,6 +98,7 @@ <h1 class="section {% if entity.constructors == null or entity.constructors.size
             </div>
 
             <h1 class="section {% if entity.hasVisibleMembers == false %}empty{% endif %}">
+              <span class="expand-button" onclick="toggleMembersBody(this, '{{ member.signature }}');">[-]</span>
                 Members
             </h1>
 
@@ -169,21 +171,27 @@ <h1 class="section {% if entity.hasVisibleMembers == false %}empty{% endif %}">
                     </div><!-- end member-title -->
 
                     <div class="member-body">
-                        <div class="member-body-short" id="short-body-{{ member.signature }}">
-                            {{ member.comment.short }}
-                        </div>
                         <div class="member-body-long" id ="long-body-{{ member.signature }}">
                             {{ member.comment.body }}
                         </div>
                     </div>
                     <script>
+
+                        function toggleConstructorsBody(span, sig){
+                            var members = document.getElementById("entity-constructors");
+                            members.classList.toggle("toggled");
+                            span.innerHTML = (span.innerHTML == "[-]") ?  "[+]" : "[-]";
+                        }
+
+                        function toggleMembersBody(span, sig){
+                            var members = document.getElementById("entity-members");
+                            members.classList.toggle("toggled");
+                            span.innerHTML = (span.innerHTML == "[-]") ?  "[+]" : "[-]";
+                        }
+
                         function toggleMemberBody(span, sig) {
-                            var shortBody = document.getElementById("short-body-" + sig);
                             var longBody = document.getElementById("long-body-" + sig);
-
-                            shortBody.classList.toggle("toggled")
                             longBody.classList.toggle("toggled")
-
                             span.innerHTML = (span.innerHTML == "[+]") ?  "[-]" : "[+]";
                         }
                     </script>
diff --git a/doc-tool/resources/css/api-page.css b/doc-tool/resources/css/api-page.css
index 48a3162bbcc1..16def6b5978d 100644
--- a/doc-tool/resources/css/api-page.css
+++ b/doc-tool/resources/css/api-page.css
@@ -66,6 +66,23 @@ h1.section {
     margin: 30px 0;
 }
 
+h1.section > span.expand-button {
+    color: rgba(167, 161, 161, 0.5);
+    font-family: "Source Code Pro", sans-serif;
+    font-size: 25px;
+}
+
+h1.section > span.expand-button:hover {
+    color: rgb(167, 161, 161);
+    cursor: pointer;
+    user-select: none;
+}
+
+h1.section > span.expand-button.invisible,
+h1.section > span.expand-button.invisible:hover {
+    color: transparent;
+}
+
 .empty {
     display: none;
 }
@@ -142,3 +159,7 @@ div.entity-section > div.member > div.member-body > div.member-body-long {
 div.entity-section > div.member > div.member-body > div.member-body-long.toggled {
     display: block;
 }
+
+div.entity-section.toggled{
+    display: none;
+}
diff --git a/doc-tool/src/dotty/tools/dottydoc/model/entities.scala b/doc-tool/src/dotty/tools/dottydoc/model/entities.scala
index d0f1a82c7cab..384870e53e49 100644
--- a/doc-tool/src/dotty/tools/dottydoc/model/entities.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/model/entities.scala
@@ -22,7 +22,7 @@ trait Entity { entity =>
   def annotations: List[String]
 
   def hasShortenedDocstring: Boolean =
-    comment.map(d => d.body.length > d.short.length).getOrElse(false)
+    comment.map(d => d.body.length > 0).getOrElse(false)
 
   def signature: String =
     entity.name + (entity match {

From b364502618466c81a5c0645f751ad2367743e184 Mon Sep 17 00:00:00 2001
From: Varunram <vrg2009@ymail.com>
Date: Sun, 21 May 2017 12:58:52 +0530
Subject: [PATCH 2/3] Remove all instances of comment.short from dottydoc
 codebase

---
 doc-tool/resources/_layouts/api-page.html     | 16 ++--
 .../resources/_layouts/main.html.original     | 75 +++++++++++++++++++
 doc-tool/resources/_layouts/rand.sh           |  4 +
 doc-tool/resources/css/api-page.css           | 18 ++---
 .../tools/dottydoc/model/JavaConverters.scala |  1 -
 .../dotty/tools/dottydoc/model/entities.scala |  3 -
 doc-tool/test/JavaConverterTest.scala         |  1 -
 7 files changed, 93 insertions(+), 25 deletions(-)
 create mode 100644 doc-tool/resources/_layouts/main.html.original
 create mode 100644 doc-tool/resources/_layouts/rand.sh

diff --git a/doc-tool/resources/_layouts/api-page.html b/doc-tool/resources/_layouts/api-page.html
index d52dec11e3fa..484f7ae58b8b 100644
--- a/doc-tool/resources/_layouts/api-page.html
+++ b/doc-tool/resources/_layouts/api-page.html
@@ -67,7 +67,7 @@
             {% endif %}
 
             <h1 class="section {% if entity.constructors == null or entity.constructors.size == 0 %}empty{% endif %}">
-                <span class="expand-button" onclick="toggleConstructorsBody(this, '{{ member.signature }}');">[-]</span>
+                <span class="expand-button visible{% if entity.constructors == null or entity.constructors.size == 0 %}invisible{% endif %}" onclick="toggleMembersBody(this, 'constructors');">[-]</span>
                 Constructors
             </h1>
 
@@ -98,7 +98,7 @@ <h1 class="section {% if entity.constructors == null or entity.constructors.size
             </div>
 
             <h1 class="section {% if entity.hasVisibleMembers == false %}empty{% endif %}">
-              <span class="expand-button" onclick="toggleMembersBody(this, '{{ member.signature }}');">[-]</span>
+              <span class="expand-button visible" onclick="toggleMembersBody(this, 'members');">[-]</span>
                 Members
             </h1>
 
@@ -106,7 +106,7 @@ <h1 class="section {% if entity.hasVisibleMembers == false %}empty{% endif %}">
                 {% for member in entity.members %}
                 <div id="{{ member.signature }}" class="member {% if member.isPrivate %}private{% elsif member.isProtected %}protected{% endif %}">
                     <div class="member-title">
-                        <span class="expand-button {% if member.hasShortenedDocstring == false %}invisible{% endif %}" onclick="toggleMemberBody(this, '{{ member.signature }}');">[+]</span>
+                        <span class="expand-button {% if member.comment.body %}visible{% endif %}" onclick="toggleMemberBody(this, '{{ member.signature }}');">[+]</span>
                         <span class="member-annotations">
                             {% for annot in member.annotations %}@{{ annot | split: '.' | last }} {% endfor %}
                         </span>
@@ -177,14 +177,8 @@ <h1 class="section {% if entity.hasVisibleMembers == false %}empty{% endif %}">
                     </div>
                     <script>
 
-                        function toggleConstructorsBody(span, sig){
-                            var members = document.getElementById("entity-constructors");
-                            members.classList.toggle("toggled");
-                            span.innerHTML = (span.innerHTML == "[-]") ?  "[+]" : "[-]";
-                        }
-
-                        function toggleMembersBody(span, sig){
-                            var members = document.getElementById("entity-members");
+                        function toggleMembersBody(span, arg){
+                            var members = document.getElementById("entity-" + arg);
                             members.classList.toggle("toggled");
                             span.innerHTML = (span.innerHTML == "[-]") ?  "[+]" : "[-]";
                         }
diff --git a/doc-tool/resources/_layouts/main.html.original b/doc-tool/resources/_layouts/main.html.original
new file mode 100644
index 000000000000..85fe110f41b3
--- /dev/null
+++ b/doc-tool/resources/_layouts/main.html.original
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        <meta http-equiv="x-ua-compatible" content="ie=edge">
+
+        <title>{{ page.title }}</title>
+
+        <link
+            rel="stylesheet"
+            href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"
+            integrity="sha384-AysaV+vQoT3kOAXZkl02PThvDr8HYKPZhNT5h/CXfBThSRXQ6jW5DO2ekP5ViFdi"
+            crossorigin="anonymous"
+        >
+
+        <link
+            rel="stylesheet"
+            href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"
+        >
+
+        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+
+        <link
+            rel="stylesheet"
+            href="{{ site.baseurl }}/css/dottydoc.css"
+        >
+
+        <link
+            rel="stylesheet"
+            href="{{ site.baseurl }}/css/color-brewer.css"
+        >
+
+        {% for css in page.extraCSS %}
+        <link
+            rel="stylesheet"
+            href="{{ site.baseurl }}/{{ css }}"
+        >
+        {% endfor %}
+    </head>
+    <body>
+
+        {{ content }}
+
+        <script
+            src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"
+            integrity="sha384-3ceskX3iaEnIogmQchP8opvBy3Mi7Ce34nWjpBIwVTHfGYWQS9jwHDVRnpKKHJg7"
+            crossorigin="anonymous"
+        ></script>
+        <script
+            src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.3.7/js/tether.min.js"
+            integrity="sha384-XTs3FgkjiBgo8qjEjBk0tGmf3wPrWtA6coPfQDfFEY8AnYJwjalXCiosYRBIBZX8"
+            crossorigin="anonymous"
+        ></script>
+        <script
+            src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"
+            integrity="sha384-BLiI7JTZm+JWlgKa0M0kGRpJbF2J8q+qreVrKBC47e3K6BW78kGLrCkeRX6I9RoK"
+            crossorigin="anonymous"
+        ></script>
+        <script src="{{ site.baseurl }}/js/highlight.pack.js"></script>
+        {% for js in page.extraJS %}
+        <script src="{{ site.baseurl }}/{{ js }}"></script>
+        {% endfor %}
+        <script>
+            $(document).ready(function() {
+                $('pre code').each(function(i, block) {
+                    hljs.highlightBlock(block);
+                });
+            });
+        </script>
+    </body>
+</html>
+\n
+\n
+\n
diff --git a/doc-tool/resources/_layouts/rand.sh b/doc-tool/resources/_layouts/rand.sh
new file mode 100644
index 000000000000..378de257bbfa
--- /dev/null
+++ b/doc-tool/resources/_layouts/rand.sh
@@ -0,0 +1,4 @@
+currdate=$(date "+%Y-%m-%d\ %H:%M:%S")
+currDateComment="<!-- Docs Last Generated On "$currdate"-->"
+sed -i '.original' "1s/^/$currDateComment\\
+/" main.html
diff --git a/doc-tool/resources/css/api-page.css b/doc-tool/resources/css/api-page.css
index 16def6b5978d..3c24ef281049 100644
--- a/doc-tool/resources/css/api-page.css
+++ b/doc-tool/resources/css/api-page.css
@@ -66,20 +66,20 @@ h1.section {
     margin: 30px 0;
 }
 
-h1.section > span.expand-button {
+h1.section > span.expand-button.visible {
     color: rgba(167, 161, 161, 0.5);
     font-family: "Source Code Pro", sans-serif;
     font-size: 25px;
 }
 
-h1.section > span.expand-button:hover {
+h1.section > span.expand-button.visible:hover {
     color: rgb(167, 161, 161);
     cursor: pointer;
     user-select: none;
 }
 
-h1.section > span.expand-button.invisible,
-h1.section > span.expand-button.invisible:hover {
+h1.section > span.expand-button,
+h1.section > span.expand-button.hover {
     color: transparent;
 }
 
@@ -129,18 +129,18 @@ div.entity-section > div.member > div.member-title span.no-right {
     margin-right: -11px;
 }
 
-div.entity-section > div.member > div.member-title > span.expand-button {
+div.entity-section > div.member > div.member-title > span.expand-button.visible {
     color: rgba(167, 161, 161, 0.5);
 }
 
-div.entity-section > div.member > div.member-title > span.expand-button:hover {
+div.entity-section > div.member > div.member-title > span.expand-button.visible:hover {
     color: rgb(167, 161, 161);
     cursor: pointer;
     user-select: none;
 }
 
-div.entity-section > div.member > div.member-title > span.expand-button.invisible,
-div.entity-section > div.member > div.member-title > span.expand-button.invisible:hover {
+div.entity-section > div.member > div.member-title > span.expand-button,
+div.entity-section > div.member > div.member-title > span.expand-button:hover {
     color: transparent;
 }
 
@@ -160,6 +160,6 @@ div.entity-section > div.member > div.member-body > div.member-body-long.toggled
     display: block;
 }
 
-div.entity-section.toggled{
+div.entity-section.toggled {
     display: none;
 }
diff --git a/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala b/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala
index 91a964393738..dfb6e35df7b1 100644
--- a/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala
@@ -151,7 +151,6 @@ object JavaConverters {
       "path" -> ent.path.asJava,
       "children" -> ent.children.map(_.asJava()).asJava,
       "comment" -> ent.comment.map(_.asJava).asJava,
-      "hasShortenedDocstring" -> ent.hasShortenedDocstring,
       "signature" -> ent.signature
     )
     val members = ent match {
diff --git a/doc-tool/src/dotty/tools/dottydoc/model/entities.scala b/doc-tool/src/dotty/tools/dottydoc/model/entities.scala
index 384870e53e49..cede5f48f8cf 100644
--- a/doc-tool/src/dotty/tools/dottydoc/model/entities.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/model/entities.scala
@@ -21,9 +21,6 @@ trait Entity { entity =>
 
   def annotations: List[String]
 
-  def hasShortenedDocstring: Boolean =
-    comment.map(d => d.body.length > 0).getOrElse(false)
-
   def signature: String =
     entity.name + (entity match {
       case o: Object => "$"
diff --git a/doc-tool/test/JavaConverterTest.scala b/doc-tool/test/JavaConverterTest.scala
index f9046a8918d0..502488e32c72 100644
--- a/doc-tool/test/JavaConverterTest.scala
+++ b/doc-tool/test/JavaConverterTest.scala
@@ -230,7 +230,6 @@ class JavaConverterTest {
     assertEquals(expected.kind, actual.get("kind"))
     assertSameSeq(expected.annotations, actual.get("annotations"))
     assertSameSeq(expected.path, actual.get("path"))
-    assertEquals(expected.hasShortenedDocstring, actual.get("hasShortenedDocstring"))
     // Only test if a comment is present
     expected.comment match {
       case Some(c) => assertNotEquals(null, actual.get("comment"))

From a911201ecf49792df753207c70103c4ceaef8196 Mon Sep 17 00:00:00 2001
From: Varunram <vrg2009@ymail.com>
Date: Sun, 21 May 2017 13:02:58 +0530
Subject: [PATCH 3/3] Remove backup file

---
 .../resources/_layouts/main.html.original     | 75 -------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 doc-tool/resources/_layouts/main.html.original

diff --git a/doc-tool/resources/_layouts/main.html.original b/doc-tool/resources/_layouts/main.html.original
deleted file mode 100644
index 85fe110f41b3..000000000000
--- a/doc-tool/resources/_layouts/main.html.original
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-        <meta http-equiv="x-ua-compatible" content="ie=edge">
-
-        <title>{{ page.title }}</title>
-
-        <link
-            rel="stylesheet"
-            href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"
-            integrity="sha384-AysaV+vQoT3kOAXZkl02PThvDr8HYKPZhNT5h/CXfBThSRXQ6jW5DO2ekP5ViFdi"
-            crossorigin="anonymous"
-        >
-
-        <link
-            rel="stylesheet"
-            href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"
-        >
-
-        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-
-        <link
-            rel="stylesheet"
-            href="{{ site.baseurl }}/css/dottydoc.css"
-        >
-
-        <link
-            rel="stylesheet"
-            href="{{ site.baseurl }}/css/color-brewer.css"
-        >
-
-        {% for css in page.extraCSS %}
-        <link
-            rel="stylesheet"
-            href="{{ site.baseurl }}/{{ css }}"
-        >
-        {% endfor %}
-    </head>
-    <body>
-
-        {{ content }}
-
-        <script
-            src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"
-            integrity="sha384-3ceskX3iaEnIogmQchP8opvBy3Mi7Ce34nWjpBIwVTHfGYWQS9jwHDVRnpKKHJg7"
-            crossorigin="anonymous"
-        ></script>
-        <script
-            src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.3.7/js/tether.min.js"
-            integrity="sha384-XTs3FgkjiBgo8qjEjBk0tGmf3wPrWtA6coPfQDfFEY8AnYJwjalXCiosYRBIBZX8"
-            crossorigin="anonymous"
-        ></script>
-        <script
-            src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"
-            integrity="sha384-BLiI7JTZm+JWlgKa0M0kGRpJbF2J8q+qreVrKBC47e3K6BW78kGLrCkeRX6I9RoK"
-            crossorigin="anonymous"
-        ></script>
-        <script src="{{ site.baseurl }}/js/highlight.pack.js"></script>
-        {% for js in page.extraJS %}
-        <script src="{{ site.baseurl }}/{{ js }}"></script>
-        {% endfor %}
-        <script>
-            $(document).ready(function() {
-                $('pre code').each(function(i, block) {
-                    hljs.highlightBlock(block);
-                });
-            });
-        </script>
-    </body>
-</html>
-\n
-\n
-\n