Remove empty packages from AST

Author: felixmulder

doc-tool/src/dotty/tools/dottydoc/DocCompiler.scala

@@ -33,6 +33,7 @@ class DocCompiler extends Compiler {
                                 new LinkCompanions,
                                 new AlternateConstructors,
                                 new SortMembers)),
+    List(DocMiniTransformations(new RemoveEmptyPackages)),
     List(new StatisticsPhase)
   )
 }

doc-tool/src/dotty/tools/dottydoc/core/RemoveEmptyPackagesPhase.scala

@@ -0,0 +1,15 @@
+package dotty.tools
+package dottydoc
+package core
+
+import dotc.core.Contexts.Context
+
+import transform.DocMiniPhase
+import model._
+
+class RemoveEmptyPackages extends DocMiniPhase {
+  override def transformPackage(implicit ctx: Context) = { case p: Package =>
+    if (p.members.exists(_.kind != "package")) p
+    else NonEntity
+  }
+}

doc-tool/src/dotty/tools/dottydoc/core/transform.scala

@@ -53,6 +53,11 @@ object transform {
         pack <- rootPackages(ctx.docbase.packages)
         transformed =  performPackageTransform(pack)
       } yield ctx.docbase.packagesMutable(pack.name) = transformed
+
+      ctx.docbase.packagesMutable.foreach { case (key, value) =>
+        if (value eq NonEntity) ctx.docbase.packagesMutable -= key
+      }
+
       units
     }