Merge pull request #10181 from pikinier20/infinite-loop-doctool

Fix infinite loop bug in scaladoc after dotty version bump

Author: abgruszecki

scala3doc-testcases/src/tests/inheritanceLoop.scala

@@ -0,0 +1,18 @@
+package tests
+package inheritanceLoop
+
+class A
+{
+  type I = Int
+  object X
+  class B extends C
+  {
+    class D extends C
+    {
+      class E extends C
+    }
+  }
+}
+
+
+class C extends A

scala3doc-testcases/src/tests/inheritedMembers1.scala

@@ -0,0 +1,17 @@
+package tests
+package inheritedMembers1
+
+
+class A
+{
+    def A: String
+      = ???
+    val B: Int
+      = ???
+    object X
+    trait Z
+    given B
+    type I = Int
+    /*<-*/extension (a: A) /*->*/def extension: String
+      = ???
+}

scala3doc-testcases/src/tests/inheritedMembers2.scala

@@ -0,0 +1,7 @@
+package tests
+package inheritedMembers2
+
+import tests.inheritedMembers1.A
+
+class F extends A
+

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

@@ -130,6 +130,11 @@ trait ClassLikeSupport:
       case _ => None
   )
 
+  private def parseInheritedMember(s: Tree): Option[Member] = processTreeOpt(s)(s match
+    case c: ClassDef if c.symbol.shouldDocumentClasslike && !c.symbol.isGiven => Some(parseClasslike(c, signatureOnly = true))
+    case other => parseMember(other)
+  ).map(_.withOrigin(Origin.InheritedFrom(s.symbol.owner.name, s.symbol.owner.dri)))
+
   extension (c: ClassDef):
     def membersToDocument = c.body.filterNot(_.symbol.isHiddenByVisibility)
 
@@ -139,14 +144,13 @@ trait ClassLikeSupport:
         .map(_.tree)
 
     def extractMembers: Seq[Member] = {
-      // val inherited = c.getNonTrivialInheritedMemberTrees.collect {
-      //     case dd: DefDef if !dd.symbol.isClassConstructor && !(dd.symbol.isSuperBridgeMethod || dd.symbol.isDefaultHelperMethod) => dd
-      //     case other => other
-      //   }
-
-      c.membersToDocument.flatMap(parseMember)
-      // ++
-      //   inherited.flatMap(s => parseMember(s).map(_.withOrigin(Origin.InheritedFrom(s.symbol.owner.name, s.symbol.owner.dri))))
+      val inherited = c.getNonTrivialInheritedMemberTrees.collect {
+        case dd: DefDef if !dd.symbol.isClassConstructor && !(dd.symbol.isSuperBridgeMethod || dd.symbol.isDefaultHelperMethod) => dd
+        case other => other
+      }
+
+      c.membersToDocument.flatMap(parseMember) ++
+        inherited.flatMap(s => parseInheritedMember(s))
     }
 
     def getParents: List[Tree] =

scala3doc/test/dotty/dokka/SignatureTests.scala

@@ -50,3 +50,8 @@ class OpaqueTypes extends SingleFileTest("opaqueTypes", SingleFileTest.all)
 // class GivenSignatures extends SingleFileTest("givenSignatures", SingleFileTest.all)
 
 class Annotations extends SingleFileTest("annotations", SingleFileTest.all)
+
+class InheritanceLoop extends SingleFileTest("inheritanceLoop", SingleFileTest.all)
+
+class InheritedMembers extends MultipleFileTest(List("inheritedMembers1", "inheritedMembers2"), List("inheritedMembers2"), MultipleFileTest.all.filter(_ != "class"))
+