Handle exports of object properties

Author: BarkingBad

scala3doc-testcases/src/tests/exports.scala

@@ -2,13 +2,22 @@ package tests
 package exports 
 
 class A:
-  def defInt: Int = 1
-  def def1: 1 = 1
-  val valInt: Int = 1
-  val val1: 1 = 1
-  var varInt: Int = 1
-  var var1: 1 = 1
+  def aDefInt: Int = 1
+  def aDef1: 1 = 1
+  val aValInt: Int = 1
+  val aVal1: 1 = 1
+  var aVarInt: Int = 1
+  var aVar1: 1 = 1
+
+object X:
+  def xDefInt: Int = 1
+  def xDef1: 1 = 1
+  val xValInt: Int = 1
+  val xVal1: 1 = 1
+  var xVarInt: Int = 1
+  var xVar1: 1 = 1
 
 class B:
   val a = new A
   export a._
+  export X._

scala3doc/src/dotty/dokka/site/PartiallyRenderedContent.scala

@@ -50,7 +50,13 @@ class A:
   var varInt: Int = 1
   var var1: 1 = 1
 
+object X:
+  def x: Int = 1
+  val x2: 1 = 1
+  var x3: Int = 1
+
 class B:
   val a = new A
   export a._
+  export X._
 

scala3doc/src/dotty/dokka/tasty/ClassLikeSupport.scala

@@ -125,22 +125,17 @@ trait ClassLikeSupport:
           }
 
       case dd: DefDef if !dd.symbol.isHiddenByVisibility && dd.symbol.isExported =>
-        val exportedTarget = dd.rhs.flatMap { 
-          case a: Apply => Some(a.fun)
-          case s: Select => Some(s)
-          case _ => None
-        }.map { 
+        val exportedTarget = dd.rhs.collect { 
+          case a: Apply => a.fun.asInstanceOf[Select]
           case s: Select => s
-        } 
-        val functionName = exportedTarget.fold("instance")(_.name)
-        val instanceName = exportedTarget.fold("function")(_.qualifier.asInstanceOf[Select].name)
-        val dri = dd.rhs.flatMap {
-          case a: Apply => None
-          case s: Select => 
-            val dri = s.symbol.dri 
-            dri.getCallable match
-              case null => None
-              case _ => Some(dri)
+        }
+        val functionName = exportedTarget.fold("function")(_.name)
+        val instanceName = exportedTarget.collect {
+          case Select(qualifier: Select, _) => qualifier.name
+          case Select(qualifier: Ident, _) => qualifier.tpe.typeSymbol.name
+        }.getOrElse("instance")
+        val dri = dd.rhs.collect {
+          case s: Select if s.symbol.isDefDef => s.symbol.dri 
         }.orElse(exportedTarget.map(_.qualifier.tpe.typeSymbol.dri))
         Some(parseMethod(dd.symbol, kind = Kind.Exported).withOrigin(Origin.ExportedFrom(s"$instanceName.$functionName", dri)))