Fix type of Tasty.Type.TypeSelect.prefix

Previously we did not support type trees as prefixes

Author: nicolasstucki

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

@@ -555,7 +555,7 @@ object TastyImpl extends scala.tasty.Tasty {
     }
 
     object TypeSelect extends TypeSelectExtractor {
-      def unapply(x: TypeTree)(implicit ctx: Context): Option[(Term, String)] = x match {
+      def unapply(x: TypeTree)(implicit ctx: Context): Option[(Parent, String)] = x match {
         case x: tpd.Select @unchecked if x.isType => Some(x.qualifier, x.name.toString)
         case _ => None
       }

library/src/scala/tasty/Tasty.scala

@@ -435,7 +435,7 @@ abstract class Tasty { tasty =>
 
     val TypeSelect: TypeSelectExtractor
     abstract class TypeSelectExtractor {
-      def unapply(x: TypeTree)(implicit ctx: Context): Option[(Term, String)]
+      def unapply(x: TypeTree)(implicit ctx: Context): Option[(Parent, String)]
     }
 
     val Singleton: SingletonExtractor

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

@@ -95,7 +95,12 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
       case TypeTree.TypeIdent(name) =>
         this += "TypeTree.TypeIdent(\"" += name += "\")"
       case TypeTree.TypeSelect(qualifier, name) =>
-        this += "TypeTree.TypeSelect(" += qualifier += ", \"" += name += "\")"
+        this += "TypeTree.TypeSelect("
+        qualifier match {
+          case qualifier @ Term() => this += qualifier
+          case qualifier @ TypeTree() => this += qualifier
+        }
+        this += ", \"" += name += "\")"
       case TypeTree.Singleton(ref) =>
         this += "TypeTree.Singleton(" += ref += ")"
       case TypeTree.And(left, right) =>

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

@@ -702,11 +702,10 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
         printType(tree.tpe)
 
       case TypeTree.TypeSelect(qual, name) =>
-        (qual: Any) match {
-          case qual @ TypeTree.TypeIdent(_) => printTypeTree(qual) // FIXME: qual is of type Tree buy we are getting a TypeTree qualifier
-          case _ => printTree(qual)
+        qual match {
+          case qual @ Term() => printTree(qual) += "." += name
+          case qual @ TypeTree() => printTypeTree(qual) += "#" += name
         }
-        this += "." += name
 
       case TypeTree.Singleton(ref) =>
         printTree(ref)

library/src/scala/tasty/util/TreeAccumulator.scala

@@ -81,7 +81,8 @@ abstract class TreeAccumulator[X, T <: Tasty with Singleton](val tasty: T) {
   def foldOverTypeTree(x: X, tree: TypeOrBoundsTree)(implicit ctx: Context): X = tree match {
     case TypeTree.Synthetic() => x
     case TypeTree.TypeIdent(_) => x
-    case TypeTree.TypeSelect(qualifier, _) => foldTree(x, qualifier)
+    case TypeTree.TypeSelect(qualifier @ Term(), _) => foldTree(x, qualifier)
+    case TypeTree.TypeSelect(qualifier @ TypeTree(), _) => foldTypeTree(x, qualifier)
     case TypeTree.Singleton(ref) => foldTree(x, ref)
     case TypeTree.And(left, right) => foldTypeTree(foldTypeTree(x, left), right)
     case TypeTree.Or(left, right) => foldTypeTree(foldTypeTree(x, left), right)

tests/pos/simpleTypeSelect.decompiled

@@ -0,0 +1,8 @@
+/** Decompiled from out/posTestFromTasty/pos/simpleTypeSelect/Foo.class */
+trait Foo() extends java.lang.Object {
+  type Bar
+}
+/** Decompiled from out/posTestFromTasty/pos/simpleTypeSelect/Test.class */
+object Test {
+  val x: Foo#Bar = scala.Predef.???
+}

tests/pos/simpleTypeSelect.scala

@@ -0,0 +1,5 @@
+
+trait Foo { type Bar }
+object Test {
+  val x: Foo#Bar = ???
+}

tests/pos/tasty/definitions.scala

@@ -92,7 +92,7 @@ object definitions {
     def tpe: Type = ???
     case Synthetic()
     case Ident(name: String, override val tpe: Type)
-    case Select(prefix: Term, name: String)
+    case Select(prefix: Term | TypeTree, name: String)
     case Singleton(ref: Term)
     case Refined(underlying: TypeTree, refinements: List[Definition])
     case Applied(tycon: TypeTree, args: List[TypeTree | TypeBoundsTree])