Flatten more recursively

Author: raboof

plugin/src/main/scala/com/typesafe/genjavadoc/Output.scala

@@ -104,7 +104,12 @@ trait Output { this: TransformCake ⇒
         Some(MethodInfo(x ⇒ x, "public static final", s"${obj.name}$$ MODULE$$ = null;",
           Seq("/**", " * Static reference to the singleton instance of this Scala object.", " */")))
       else None
-    val members = (moduleInstance ++: obj.members) filter (!pruneClasses || _.isInstanceOf[MethodInfo])
+
+    val members = moduleInstance ++: (
+      if (pruneClasses) obj.methodMembers
+      else flatten(obj.classMembers) ++ obj.methodMembers
+      )
+
     val (com: Seq[String], moduleMembers: Vector[Templ]) = ((obj.comment, Vector.empty[Templ]) /: members)((p, mem) ⇒ mem match {
       case x: MethodInfo if x.name == obj.name ⇒ (p._1 ++ x.comment, p._2 :+ x.copy(name = x.name + '$', comment = Seq()))
       case x                                   ⇒ (p._1, p._2 :+ x)

plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/CompressionProtocol$.java

@@ -0,0 +1,8 @@
+package akka.rk.buh.is.it;
+public  class CompressionProtocol$ {
+  /**
+   * Static reference to the singleton instance of this Scala object.
+   */
+  public static final CompressionProtocol$ MODULE$ = null;
+  public   CompressionProtocol$ ()  { throw new RuntimeException(); }
+}

plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/CompressionProtocol.java

@@ -0,0 +1,47 @@
+package akka.rk.buh.is.it;
+public  class CompressionProtocol {
+  static public  class Events$ {
+    /**
+     * Static reference to the singleton instance of this Scala object.
+     */
+    public static final Events$ MODULE$ = null;
+    public final class HeavyHitterDetected implements akka.rk.buh.is.it.CompressionProtocol.Events.Event, scala.Product, scala.Serializable {
+      static public  akka.rk.buh.is.it.CompressionProtocol.Events.HeavyHitterDetected apply (Object key, int id, long count)  { throw new RuntimeException(); }
+      static public  scala.Option<scala.Tuple3<java.lang.Object, java.lang.Object, java.lang.Object>> unapply (akka.rk.buh.is.it.CompressionProtocol.Events.HeavyHitterDetected x$0)  { throw new RuntimeException(); }
+      static private  java.lang.Object readResolve ()  { throw new RuntimeException(); }
+      public  Object key ()  { throw new RuntimeException(); }
+      public  int id ()  { throw new RuntimeException(); }
+      public  long count ()  { throw new RuntimeException(); }
+      // not preceding
+      public   HeavyHitterDetected (Object key, int id, long count)  { throw new RuntimeException(); }
+      public  akka.rk.buh.is.it.CompressionProtocol.Events.HeavyHitterDetected copy (Object key, int id, long count)  { throw new RuntimeException(); }
+      // not preceding
+      public  Object copy$default$1 ()  { throw new RuntimeException(); }
+      public  int copy$default$2 ()  { throw new RuntimeException(); }
+      public  long copy$default$3 ()  { throw new RuntimeException(); }
+      // not preceding
+      public  java.lang.String productPrefix ()  { throw new RuntimeException(); }
+      public  int productArity ()  { throw new RuntimeException(); }
+      public  Object productElement (int x$1)  { throw new RuntimeException(); }
+      public  scala.collection.Iterator<java.lang.Object> productIterator ()  { throw new RuntimeException(); }
+      public  boolean canEqual (Object x$1)  { throw new RuntimeException(); }
+      public  int hashCode ()  { throw new RuntimeException(); }
+      public  java.lang.String toString ()  { throw new RuntimeException(); }
+      public  boolean equals (Object x$1)  { throw new RuntimeException(); }
+    }
+    public  class HeavyHitterDetected$ extends scala.runtime.AbstractFunction3<java.lang.Object, java.lang.Object, java.lang.Object, akka.rk.buh.is.it.CompressionProtocol.Events.HeavyHitterDetected> implements scala.Serializable {
+      /**
+       * Static reference to the singleton instance of this Scala object.
+       */
+      public static final HeavyHitterDetected$ MODULE$ = null;
+      public   HeavyHitterDetected$ ()  { throw new RuntimeException(); }
+      public final  java.lang.String toString ()  { throw new RuntimeException(); }
+      public  akka.rk.buh.is.it.CompressionProtocol.Events.HeavyHitterDetected apply (Object key, int id, long count)  { throw new RuntimeException(); }
+      public  scala.Option<scala.Tuple3<java.lang.Object, java.lang.Object, java.lang.Object>> unapply (akka.rk.buh.is.it.CompressionProtocol.Events.HeavyHitterDetected x$0)  { throw new RuntimeException(); }
+      private  java.lang.Object readResolve ()  { throw new RuntimeException(); }
+    }
+    public  interface Event {
+    }
+    public   Events$ ()  { throw new RuntimeException(); }
+  }
+}

plugin/src/test/resources/input/basic/test.scala

@@ -389,4 +389,16 @@ class ClassWithInner {
     val companionObjectValue = 32
   }
 
+}
+
+private[buh] object CompressionProtocol {
+
+  private[buh] object Events {
+
+    private[buh] sealed trait Event
+
+    final case class HeavyHitterDetected(key: Any, id: Int, count: Long) extends Event
+
+  }
+
 }