Fix #1947: allow arbitrary nesting in yml file

Author: felixmulder

doc-tool/resources/_includes/sidebar.html

@@ -6,6 +6,25 @@
         {% endfor %}
     </ul>
 
+    <script>
+        function clickToc(elem, currentPage) {
+            var sibling = elem.parentElement.children[1];
+            if (sibling.style.display === "" || sibling.style.display === "none")
+                sibling.style.display = "block";
+            else
+                sibling.style.display = "";
+        }
+
+        (function() {
+            var activeEntry = document.querySelector("#active-toc-entry")
+
+            while (activeEntry != null && activeEntry.tagName.toLowerCase() === "ul") {
+                activeEntry.style.display = "block";
+                activeEntry = activeEntry.parentElement.parentElement;
+            }
+        })();
+    </script>
+
     <ul class="index-entities">
     {% if docs.size > 0 %}
     <li class="index-title">

doc-tool/resources/css/sidebar.css

@@ -39,6 +39,15 @@ ul.toc {
     padding-left: 0;
 }
 
+ul.toc ul {
+    padding-left: 0;
+}
+
+ul.toc > li,
+ul.toc ul > li {
+    padding-left: 24px;
+}
+
 ul.toc > li:hover {
     background-color: transparent;
 }
@@ -72,10 +81,11 @@ ul.toc > li.logo-li > a {
     float: none;
 }
 
-ul.toc > li > a {
+ul.toc > li > a,
+ul.toc li > a.toggle-children {
     font-size: 13px;
     display: block;
-    padding: 0 0 0 24px;
+    padding: 0;
     width: 100%;
     color: rgba(0, 0, 0, 0.87);
     background: transparent;
@@ -84,13 +94,9 @@ ul.toc > li > a {
     text-transform: uppercase;
 }
 
-ul.toc > li > ul.show {
-    display: block;
+ul.toc > li ul {
     list-style-type: none;
     font-size: 13px;
-}
-
-ul.toc > li > ul.hide {
     display: none;
 }
 

doc-tool/src/dotty/tools/dottydoc/staticsite/tags.scala

@@ -9,7 +9,7 @@ import liqp.tags.Tag
 import liqp.TemplateContext
 import liqp.nodes.LNode
 
-import java.util.{ Map => JMap }
+import java.util.{ Map => JMap, List => JList }
 import model._
 import util.syntax._
 
@@ -163,22 +163,23 @@ object tags {
   case class RenderTitle(params: Map[String, AnyRef])(implicit ctx: Context)
   extends Tag("renderTitle") with ParamConverter {
     private def renderTitle(t: Title, parent: String): String = {
-        if (!t.url.isDefined && t.subsection.nonEmpty) {
-          val onclickFunction =
-            s"""(function(){var child=document.getElementById("${t.title}");child.classList.toggle("show");child.classList.toggle("hide");})();"""
-          s"""|<a class="toggle-children" onclick='$onclickFunction'>${t.title}</a>
-              |<ul id="${t.title}" class="${if (parent.toLowerCase == t.title.toLowerCase) "show" else "hide"}">
-              |    ${t.subsection.map(renderTitle(_, parent)).mkString("<li>", "</li><li>", "</li>")}
-              |</ul>""".stripMargin
-        }
-        else if (t.url.isDefined) {
-          val url = t.url.get
-          s"""<a href="$baseurl/$url">${t.title}</a>"""
-        }
-        else /*if (t.subsection.nonEmpty)*/ {
-          ctx.docbase.error(s"url was defined for subsection with title: ${t.title}, remove url to get toggleable entries")
-          t.title
-        }
+      if (!t.url.isDefined && t.subsection.nonEmpty) {
+        s"""|<a class="toggle-children" onclick='clickToc(this, "$parent");'>${t.title}</a>
+            |<ul id="${ if(parent == t.title.toLowerCase.split(" ").mkString("-")) "active-toc-entry" else "" }">
+            |    ${ t.subsection.map(renderTitle(_, parent)).mkString("<li>","\n</li>\n<li>", "</li>") }
+            |</ul>
+            |""".stripMargin
+      }
+      else if (t.url.isDefined) {
+        val url = t.url.get
+        s"""<a href="$baseurl/$url">${t.title}</a>"""
+      }
+      else {
+        ctx.docbase.error(
+          s"url was defined for subsection with title: ${t.title}, remove url to get toggleable entries"
+        )
+        t.title
+      }
     }
 
     override def render(ctx: TemplateContext, nodes: LNode*): AnyRef =