From 821b3faa52dff3850016c4620ee0cef6f7b3897f Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Wed, 18 Jan 2017 18:12:17 +0100
Subject: Fix removal of trailing ordered list and toc children instead of
 members

---
 doc-tool/resources/_layouts/doc.html                    |  2 +-
 .../dotty/tools/dottydoc/core/MiniPhaseTransform.scala  |  2 +-
 .../dottydoc/model/comment/MarkdownShortener.scala      | 17 ++++++++++++++---
 doc-tool/src/dotty/tools/dottydoc/model/java.scala      |  1 +
 4 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'doc-tool')

diff --git a/doc-tool/resources/_layouts/doc.html b/doc-tool/resources/_layouts/doc.html
index 4fd615d23..c9dc8da39 100644
--- a/doc-tool/resources/_layouts/doc.html
+++ b/doc-tool/resources/_layouts/doc.html
@@ -15,7 +15,7 @@ layout: main
             <li class="index-entity entity-package">
                 <a href="{{ site.baseurl }}/api/{{ pkg.path | join: "/" }}/index.html">{{ pkg.name }}</a>
             </li>
-            {% for member in pkg.members %}
+            {% for member in pkg.children %}
                 {% if member.kind != "package" %}
                 <li class="index-entity">
                     <a href="{{ site.baseurl }}/api/{{ member.path | join: "/" }}.html">{{ member.kind }} {{ member.name }}</a>
diff --git a/doc-tool/src/dotty/tools/dottydoc/core/MiniPhaseTransform.scala b/doc-tool/src/dotty/tools/dottydoc/core/MiniPhaseTransform.scala
index c65e254f6..a35da579e 100644
--- a/doc-tool/src/dotty/tools/dottydoc/core/MiniPhaseTransform.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/core/MiniPhaseTransform.scala
@@ -42,7 +42,7 @@ object transform {
    *
    * Deleting nodes in the AST
    * -------------------------
-   * To delete a node in the AST, simply return NonEntity from transforming method
+   * To delete a node in the AST, simply return `NonEntity` from transforming method
    */
   abstract class DocMiniTransformations(transformations: List[DocMiniPhase]) extends Phase {
 
diff --git a/doc-tool/src/dotty/tools/dottydoc/model/comment/MarkdownShortener.scala b/doc-tool/src/dotty/tools/dottydoc/model/comment/MarkdownShortener.scala
index 8ad8024ae..f7d970959 100644
--- a/doc-tool/src/dotty/tools/dottydoc/model/comment/MarkdownShortener.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/model/comment/MarkdownShortener.scala
@@ -14,7 +14,7 @@ class MarkdownShortener {
 
   def shorten(node: Node, maxLen: Int = 150): Node = {
     var len = 0
-    var didUnlinkBullets = false
+    var didUnlinkListItem = false
 
     def count(node: Node, length: => Int, shortenOrUnlink: Int => Unit) = {
       val remaining = math.max(maxLen - len, 0)
@@ -53,11 +53,22 @@ class MarkdownShortener {
       new VisitHandler(classOf[BulletListItem], new Visitor[BulletListItem] {
         override def visit(node: BulletListItem) = count(
           node,
-          if (didUnlinkBullets) maxLen
+          if (didUnlinkListItem) maxLen
           else node.getSegments.map(_.length).reduceLeft(_ + _),
           _ => {
             node.unlink()
-            didUnlinkBullets = true // unlink all following bullets
+            didUnlinkListItem = true // unlink all following bullets
+          }
+        )
+      }),
+      new VisitHandler(classOf[OrderedListItem], new Visitor[OrderedListItem] {
+        override def visit(node: OrderedListItem) = count(
+          node,
+          if (didUnlinkListItem) maxLen
+          else node.getSegments.map(_.length).reduceLeft(_ + _),
+          _ => {
+            node.unlink()
+            didUnlinkListItem = true // unlink all following bullets
           }
         )
       })
diff --git a/doc-tool/src/dotty/tools/dottydoc/model/java.scala b/doc-tool/src/dotty/tools/dottydoc/model/java.scala
index 189012e18..a9ae0dbee 100644
--- a/doc-tool/src/dotty/tools/dottydoc/model/java.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/model/java.scala
@@ -51,6 +51,7 @@ object java {
       "name"     -> ent.name,
       "path"     -> ent.path.asJava,
       "members"  -> ent.members.map(_.asJava()).asJava,
+      "children"  -> ent.children.map(_.asJava()).asJava,
       "comment"  -> ent.comment.map(_.asJava).asJava,
       "superTypes" -> ent.superTypes,
       "hasVisibleMembers" -> ent.hasVisibleMembers
-- 
cgit v1.2.3