scaladoc: fix crash when processing extends call

doofin · Apr 16, 2023 · 0d2ffb5 · 0d2ffb5
1 parent 2f4cc4c
commit 0d2ffb5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/scaladoc-testcases/src/tests/extendsCall.scala b/scaladoc-testcases/src/tests/extendsCall.scala
@@ -0,0 +1,6 @@
+package tests
+package extendsCall
+
+class Impl() extends Base(Seq.empty, c = "-") //expected: class Impl() extends Base
+
+class Base(val a: Seq[String], val b: String = "", val c: String = "") //expected: class Base(val a: Seq[String], val b: String, val c: String)
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala
@@ -64,14 +64,18 @@ trait ClassLikeSupport:
     signatureOnly: Boolean = false,
     modifiers: Seq[Modifier] = classDef.symbol.getExtraModifiers(),
   ): Member =
-    def unpackTreeToClassDef(tree: Tree): ClassDef = tree match
-      case tree: ClassDef => tree
-      case TypeDef(_, tbt: TypeBoundsTree) => unpackTreeToClassDef(tbt.tpe.typeSymbol.tree)
-      case TypeDef(_, tt: TypeTree) => unpackTreeToClassDef(tt.tpe.typeSymbol.tree)
-      case c: Apply =>
-        c.symbol.owner.tree.symbol.tree match
+    def unpackTreeToClassDef(tree: Tree): ClassDef =
+      def unpackApply(a: Apply) =
+        a.symbol.owner.tree.symbol.tree match
           case tree: ClassDef => tree
-      case tt: TypeTree => unpackTreeToClassDef(tt.tpe.typeSymbol.tree)
+
+      tree match
+        case tree: ClassDef => tree
+        case TypeDef(_, tbt: TypeBoundsTree) => unpackTreeToClassDef(tbt.tpe.typeSymbol.tree)
+        case TypeDef(_, tt: TypeTree) => unpackTreeToClassDef(tt.tpe.typeSymbol.tree)
+        case c: Apply => unpackApply(c)
+        case Block(_, c: Apply) => unpackApply(c)
+        case tt: TypeTree => unpackTreeToClassDef(tt.tpe.typeSymbol.tree)
 
     def signatureWithName(s: dotty.tools.scaladoc.Signature): dotty.tools.scaladoc.Signature =
       s match

diff --git a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala
@@ -108,3 +108,5 @@ class ImplicitMembers extends SignatureTest(
 )
 
 class NonScala3Parent extends SignatureTest("nonScala3Parent", SignatureTest.all)
+
+class ExtendsCall extends SignatureTest("extendsCall", SignatureTest.all)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -108,3 +108,5 @@ class ImplicitMembers extends SignatureTest(
		)

		class NonScala3Parent extends SignatureTest("nonScala3Parent", SignatureTest.all)

		class ExtendsCall extends SignatureTest("extendsCall", SignatureTest.all)