Fix reflect SuperType.supertpe and printing super types and type lambdas

Author: pweisenburger

compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala

@@ -1861,7 +1861,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
     given SuperTypeMethods: SuperTypeMethods with
       extension (self: SuperType)
         def thistpe: TypeRepr = self.thistpe
-        def supertpe: TypeRepr = self.thistpe
+        def supertpe: TypeRepr = self.supertpe
       end extension
     end SuperTypeMethods
 

compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala

@@ -1189,12 +1189,12 @@ object SourceCode {
         }
 
       case SuperType(thistpe, supertpe) =>
-        printType(supertpe)
+        printType(thistpe)
         this += highlightTypeDef(".super")
 
       case TypeLambda(paramNames, tparams, body) =>
         inSquare(printMethodicTypeParams(paramNames, tparams))
-        this += highlightTypeDef(" => ")
+        this += highlightTypeDef(" =>> ")
         printType(body)
 
       case ParamRef(lambda, idx) =>

tests/pos-macros/hk-quoted-type-patterns/Macro_1.scala

@@ -5,9 +5,9 @@ private def impl(x: Expr[Any])(using Quotes): Expr[Unit] = {
     case '{ foo[x] } =>
       assert(Type.show[x] == "scala.Int", Type.show[x])
     case '{ type f[X]; foo[`f`] } =>
-      assert(Type.show[f] == "[A >: scala.Nothing <: scala.Any] => scala.collection.immutable.List[A]", Type.show[f])
+      assert(Type.show[f] == "[A >: scala.Nothing <: scala.Any] =>> scala.collection.immutable.List[A]", Type.show[f])
     case '{ type f <: AnyKind; foo[`f`] } =>
-      assert(Type.show[f] == "[K >: scala.Nothing <: scala.Any, V >: scala.Nothing <: scala.Any] => scala.collection.immutable.Map[K, V]", Type.show[f])
+      assert(Type.show[f] == "[K >: scala.Nothing <: scala.Any, V >: scala.Nothing <: scala.Any] =>> scala.collection.immutable.Map[K, V]", Type.show[f])
     case x => throw MatchError(x.show)
   '{}
 }

tests/run-macros/i10863.check

@@ -1 +1 @@
-[A >: scala.Nothing <: scala.Any] => scala.collection.immutable.List[A]
+[A >: scala.Nothing <: scala.Any] =>> scala.collection.immutable.List[A]

tests/run-macros/i8514b.check

@@ -1,5 +1,5 @@
 B
-A[[T >: scala.Nothing <: scala.Any] => P[T], scala.Predef.String]
+A[[T >: scala.Nothing <: scala.Any] =>> P[T], scala.Predef.String]
 java.lang.Object
 scala.Matchable
 scala.Any

tests/run-macros/tasty-simplified.check

@@ -1,4 +1,4 @@
 Functor[scala.collection.immutable.List]
-Unapply[[F >: scala.Nothing <: [_$9 >: scala.Nothing <: scala.Any] => scala.Any] => Functor[F], Wrap[scala.Int]]
-Unapply[[F >: scala.Nothing <: [_$9 >: scala.Nothing <: scala.Any] => scala.Any] => Functor[F], Wrap[Dummy]]
+Unapply[[F >: scala.Nothing <: [_$9 >: scala.Nothing <: scala.Any] =>> scala.Any] =>> Functor[F], Wrap[scala.Int]]
+Unapply[[F >: scala.Nothing <: [_$9 >: scala.Nothing <: scala.Any] =>> scala.Any] =>> Functor[F], Wrap[Dummy]]
 Functor[scala.Option]

tests/run-macros/type-show/Test_2.scala

@@ -9,7 +9,7 @@ object Test {
     assert(show[Int => Int] == "scala.Function1[scala.Int, scala.Int]")
     assert(show[(Int, String)] == "scala.Tuple2[scala.Int, scala.Predef.String]")
     assert(show[[X] =>> X match { case Int => Int }] ==
-      """[X >: scala.Nothing <: scala.Any] => X match  {
+      """[X >: scala.Nothing <: scala.Any] =>> X match  {
         |  case scala.Int => scala.Int
         |}""".stripMargin)
     assert(showStructure[[X] =>> X match { case Int => Int }] == """TypeLambda(List(X), List(TypeBounds(TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Nothing"), TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Any"))), MatchType(TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Any"), ParamRef(binder, 0), List(MatchCase(TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Int"), TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Int")))))""")

tests/run-staging/i5965.check

@@ -11,7 +11,7 @@ List(1, 2, 3)
 }
 Some(4)
 {
-  val y: [V >: scala.Nothing <: scala.Any] => scala.collection.immutable.Map[scala.Int, V][scala.Int] = scala.Predef.Map.apply[scala.Int, scala.Int](scala.Predef.ArrowAssoc[scala.Int](4).->[scala.Int](1))
+  val y: [V >: scala.Nothing <: scala.Any] =>> scala.collection.immutable.Map[scala.Int, V][scala.Int] = scala.Predef.Map.apply[scala.Int, scala.Int](scala.Predef.ArrowAssoc[scala.Int](4).->[scala.Int](1))
 
   (y: scala.collection.immutable.Map[scala.Int, scala.Int])
 }