Allow type bounds in TypeTree.Applied for wildcard types

Author: nicolasstucki

compiler/src/dotty/tools/dotc/tastyreflect/TastyImpl.scala

@@ -572,7 +572,7 @@ object TastyImpl extends scala.tasty.Tasty {
     }
 
     object Applied extends AppliedExtractor {
-      def unapply(x: TypeTree)(implicit ctx: Context): Option[(TypeTree, List[TypeTree])] = x match {
+      def unapply(x: TypeTree)(implicit ctx: Context): Option[(TypeTree, List[TypeOrBoundsTree])] = x match {
         case x: tpd.AppliedTypeTree @unchecked => Some(x.tpt, x.args)
         case _ => None
       }

library/src/scala/tasty/Tasty.scala

@@ -417,7 +417,7 @@ abstract class Tasty { tasty =>
 
     val Applied: AppliedExtractor
     abstract class AppliedExtractor {
-      def unapply(x: TypeTree)(implicit ctx: Context): Option[(TypeTree, List[TypeTree])]
+      def unapply(x: TypeTree)(implicit ctx: Context): Option[(TypeTree, List[TypeOrBoundsTree])]
     }
 
     val Annotated: AnnotatedExtractor

library/src/scala/tasty/util/ShowExtractors.scala

@@ -253,8 +253,8 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
 
     private implicit class TypeTreeOps(buff: Buffer) {
       def +=(x: TypeOrBoundsTree): Buffer = { visitTypeTree(x); buff }
-      def +=(x: Option[TypeTree]): Buffer = { visitOption(x, visitTypeTree); buff }
-      def ++=(x: List[TypeTree]): Buffer = { visitList(x, visitTypeTree); buff }
+      def +=(x: Option[TypeOrBoundsTree]): Buffer = { visitOption(x, visitTypeTree); buff }
+      def ++=(x: List[TypeOrBoundsTree]): Buffer = { visitList(x, visitTypeTree); buff }
     }
 
     private implicit class TypeOps(buff: Buffer) {

library/src/scala/tasty/util/ShowSourceCode.scala

@@ -92,7 +92,7 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
               this += " "
               printTypeTree(tpt)
               this += "["
-              printTypeTrees(targs, ", ")
+              printTypeOrBoundsTrees(targs, ", ")
               this += "]"
               if (args.nonEmpty) {
                 this += "("
@@ -259,7 +259,7 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
       case Term.TypeApply(fn, args) =>
         printTree(fn)
         this += "["
-        printTypeTrees(args, ", ")
+        printTypeOrBoundsTrees(args, ", ")
         this += "]"
 
       case Term.Super(qual, tptOpt) =>
@@ -429,12 +429,12 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
       this
     }
 
-    def printTypeTrees(typesTrees: List[TypeTree], sep: String): Buffer = {
-      def printSeparated(list: List[TypeTree]): Unit = list match {
+    def printTypeOrBoundsTrees(typesTrees: List[TypeOrBoundsTree], sep: String): Buffer = {
+      def printSeparated(list: List[TypeOrBoundsTree]): Unit = list match {
         case Nil =>
-        case x :: Nil => printTypeTree(x)
+        case x :: Nil => printTypeOrBoundsTree(x)
         case x :: xs =>
-          printTypeTree(x)
+          printTypeOrBoundsTree(x)
           this += sep
           printSeparated(xs)
       }
@@ -629,7 +629,7 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
 
     def printTypeOrBoundsTree(tpt: TypeOrBoundsTree): Buffer = tpt match {
       case TypeBoundsTree(lo, hi) =>
-        this += " >: "
+        this += "_ >: "
         printTypeTree(lo)
         this += " <: "
         printTypeTree(hi)
@@ -676,7 +676,7 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
       case TypeTree.Applied(tpt, args) =>
         printTypeTree(tpt)
         this += "["
-        printTypeTrees(args, ", ")
+        printTypeOrBoundsTrees(args, ", ")
         this += "]"
 
       case TypeTree.Annotated(tpt, annots) =>

tests/pos/t0905.decompiled

@@ -0,0 +1,7 @@
+/** Decompiled from out/posTestFromTasty/pos/t0905/Test.class */
+object Test {
+  class A[T]() extends java.lang.Object
+  def f(implicit p: Test.A[_ >: scala.Nothing <: scala.Any]): scala.Null = null
+  implicit val x: Test.A[_ >: scala.Nothing <: scala.Any] = null
+  scala.Predef.println(Test.f(Test.x))
+}