Merge pull request #13574 from dotty-staging/gensig-alias

Fix Java generic signatures for aliases
scala · Sep 21, 2021 · fa40f4e · fa40f4e
2 parents 87546c3 + 0f78102
commit fa40f4e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala b/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala
@@ -455,7 +455,7 @@ object GenericSignatures {
   private class NeedsSigCollector(using Context) extends TypeAccumulator[Boolean] {
     override def apply(x: Boolean, tp: Type): Boolean =
       if (!x)
-        tp match {
+        tp.dealias match {
           case RefinedType(parent, refinedName, refinedInfo) =>
             val sym = parent.typeSymbol
             if (sym == defn.ArrayClass) foldOver(x, refinedInfo)
@@ -471,9 +471,7 @@ object GenericSignatures {
             foldOver(tp.typeParams.nonEmpty, parents)
           case AnnotatedType(tpe, _) =>
             foldOver(x, tpe)
-          case proxy: TypeProxy =>
-            foldOver(x, proxy)
-          case _ =>
+          case tp =>
             foldOver(x, tp)
         }
       else x

diff --git a/tests/generic-java-signatures/aliases.check b/tests/generic-java-signatures/aliases.check
@@ -0,0 +1 @@
+scala.collection.immutable.List<java.lang.String>
diff --git a/tests/generic-java-signatures/aliases.scala b/tests/generic-java-signatures/aliases.scala
@@ -0,0 +1,10 @@
+class Foo {
+  type A = List[String]
+  def foo(): A = Nil
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    println(classOf[Foo].getDeclaredMethod("foo").getGenericReturnType)
+  }
+}