Don't display private and make modifiers accessible from class members

Author: BryanAbate

tastydoc/src/dotty/tastydoc/DocPrinter.scala

@@ -221,27 +221,29 @@ class DocPrinter(mutablePackagesMap: scala.collection.mutable.HashMap[String, Em
 
     def formatMembers(): String = {
 
-      val typeMembers = representation.members.flatMap {
+      val nonPrivateMembers = representation.members.filter(!_.isPrivate)
+
+      val typeMembers = nonPrivateMembers.flatMap {
         case r: TypeRepresentation => Some(r)
         case _ => None
       }
-      val objectMembers = representation.members.flatMap {
+      val objectMembers = nonPrivateMembers.flatMap {
         case r: ClassRepresentation if r.isObject => Some(r)
         case _ => None
       }
-      val classMembers = representation.members.flatMap {
+      val classMembers = nonPrivateMembers.flatMap {
         case r:  ClassRepresentation if !r.isObject && !r.isTrait => Some(r)
         case _ => None
       }
-      val traitMembers = representation.members.flatMap {
+      val traitMembers = nonPrivateMembers.flatMap {
         case r: ClassRepresentation if r.isTrait => Some(r)
         case _ => None
       }
-      val defMembers = representation.members.flatMap {
+      val defMembers = nonPrivateMembers.flatMap {
         case r: DefRepresentation => Some(r)
         case _ => None
       }
-      val valMembers = representation.members.flatMap {
+      val valMembers = nonPrivateMembers.flatMap {
         case r: ValRepresentation => Some(r)
         case _ => None
       }

tastydoc/src/dotty/tastydoc/TastyExtractor.scala

@@ -58,7 +58,7 @@ trait TastyExtractor extends TastyTypeConverter with CommentParser with CommentC
     }
   }
 
-  def extractClassMembers(reflect: Reflection)(body: List[reflect.Statement], symbol: reflect.ClassDefSymbol, parentRepresentation: Some[Representation]) given (mutablePackagesMap: scala.collection.mutable.HashMap[String, EmulatedPackageRepresentation]) : List[Representation] = {
+  def extractClassMembers(reflect: Reflection)(body: List[reflect.Statement], symbol: reflect.ClassDefSymbol, parentRepresentation: Some[Representation]) given (mutablePackagesMap: scala.collection.mutable.HashMap[String, EmulatedPackageRepresentation]) : List[Representation with Modifiers] = {
     import reflect._
 
     /** Filter fields which shouldn't be displayed in the doc
@@ -81,6 +81,10 @@ trait TastyExtractor extends TastyTypeConverter with CommentParser with CommentC
         case x => Some(x)
       }.filter(x => filterSymbol(x.symbol)).map(convertToRepresentation(reflect)(_, parentRepresentation)) ++
     symbol.methods.filter(x => filterSymbol(x)).map{x => convertToRepresentation(reflect)(x.tree, parentRepresentation)})
+    .flatMap{
+      case r: Representation with Modifiers => Some(r)
+      case _ => None
+    }
     .sortBy(_.name)
   }
 

tastydoc/src/dotty/tastydoc/representations.scala

@@ -22,7 +22,7 @@ object representations extends TastyExtractor {
   }
 
   trait Members {
-    def members : List[Representation] //Is a def because so we can override with either a var or a val (Needed for EmulatedPackage)
+    def members : List[Representation] //Is a def so we can override with either a var or a val (Needed for EmulatedPackage)
   }
 
   trait Modifiers {
@@ -134,7 +134,7 @@ object representations extends TastyExtractor {
     override val name = internal.name
 
     override val companion = extractCompanion(reflect)(internal.symbol.companionModule, internal.symbol.companionClass, !isObject)
-    override val members = extractClassMembers(reflect)(internal.body, internal.symbol, Some(this))
+    override val members: List[Representation with Modifiers] = extractClassMembers(reflect)(internal.body, internal.symbol, Some(this))
 
     //Add itself to parents subclasses:
     parentRepresentation match {

tastydoc/zzz/example/level2/Documentation.md

@@ -397,9 +397,6 @@ Test methods with params
 ### prefixLength
 <pre><code class="language-scala" >def prefixLength(p: (A) => Boolean): Int</pre></code>
 
-### privateMethod
-<pre><code class="language-scala" >private def privateMethod: Nothing</pre></code>
-
 ### product
 <pre><code class="language-scala" >def product[B](num: Numeric[B]): B</pre></code>
 
@@ -625,9 +622,6 @@ Test methods with params
 ### iAmAVar
 <pre><code class="language-scala" >var iAmAVar: Nothing</pre></code>
 
-### privateVal
-<pre><code class="language-scala" >private val privateVal: Nothing</pre></code>
-
 ### protectedVal
 <pre><code class="language-scala" >protected val protectedVal: Nothing</pre></code>
 

tastydoc/zzz/scala/collection/immutable/List$.md

@@ -8,9 +8,6 @@ $factoryInfo
 
 ## Known subclasses:
 <a href="./List$/SerializationProxy.md">SerializationProxy</a>
-## Concrete Type Members:
-### SerializationProxy
-<pre><code class="language-scala" >@<a href="../../SerialVersionUID.md">SerialVersionUID</a> private class <a href="./List$/SerializationProxy.md">SerializationProxy</a></pre></code>
 ## Concrete Value Members:
 ### ReusableCBF
 <pre><code class="language-scala" >def ReusableCBF: GenericCanBuildFrom[<a href="../../Nothing.md">Nothing</a>]</pre></code>