Fix extractors printing

Author: nicolasstucki

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

@@ -508,7 +508,11 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
         printPattern(pattern)
 
       case Pattern.Unapply(fun, implicits, patterns) =>
-        printTree(fun)
+        fun match {
+          case Term.Select(extractor, "unapply" | "unapplySeq", _) => printTree(extractor)
+          case Term.TypeApply(Term.Select(extractor, "unapply" | "unapplySeq", _), _) => printTree(extractor)
+          case _ => throw new MatchError(fun.show)
+        }
         this += "("
         printPatterns(patterns, ", ")
         this += ")"
@@ -517,7 +521,8 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
         printPatterns(trees, " | ")
 
       case Pattern.TypeTest(tpt) =>
-        this
+        this += "_: "
+        printTypeOrBoundsTree(tpt)
 
     }
 

tests/pos/simpleExractors.decompiled

@@ -0,0 +1,43 @@
+/** Decompiled from out/posTestFromTasty/pos/simpleExractors/Bar.class */
+object Bar {
+  def unapply(arg: scala.Any): scala.Option[scala.Any] = scala.Some.apply[scala.Any](arg)
+}/** Decompiled from out/posTestFromTasty/pos/simpleExractors/BarSeq.class */
+object BarSeq {
+  def unapplySeq(arg: scala.Any): scala.Option[scala.Seq[scala.Any]] = scala.Some.apply[collection.immutable.List[scala.Any]](scala.List.apply[scala.Any](arg))
+}/** Decompiled from out/posTestFromTasty/pos/simpleExractors/Baz.class */
+object Baz {
+  def unapply[T](arg: T): scala.Option[T] = scala.Some.apply[T](arg)
+}/** Decompiled from out/posTestFromTasty/pos/simpleExractors/BazSeq.class */
+object BazSeq {
+  def unapplySeq[T](arg: T): scala.Option[scala.Seq[T]] = scala.Some.apply[collection.immutable.List[T]](scala.List.apply[T](arg))
+}/** Decompiled from out/posTestFromTasty/pos/simpleExractors/Foo.class */
+class Foo() {
+  def bar(x: scala.Any): scala.Unit = x match {
+    case Bar(a) =>
+      {
+        scala.Predef.println(a)
+      }
+    case BarSeq(a) =>
+      {
+        scala.Predef.println(a)
+      }
+    case BarSeq(a, b) =>
+      {
+        scala.Predef.println(a)
+      }
+  }
+  def baz(x: scala.Any): scala.Unit = x match {
+    case Baz(a) =>
+      {
+        scala.Predef.println(a)
+      }
+    case BazSeq(a) =>
+      {
+        scala.Predef.println(a)
+      }
+    case BazSeq(a, b) =>
+      {
+        scala.Predef.println(a)
+      }
+  }
+}

tests/pos/simpleExractors.scala

@@ -0,0 +1,28 @@
+class Foo {
+  def bar(x: Any): Unit = x match {
+    case Bar(a) => println(a)
+    case BarSeq(a) => println(a)
+    case BarSeq(a, b) => println(a)
+  }
+  def baz(x: Any): Unit = x match {
+    case Baz(a) => println(a)
+    case BazSeq(a) => println(a)
+    case BazSeq(a, b) => println(a)
+  }
+}
+
+object Bar {
+  def unapply(arg: Any): Option[Any] = Some(arg)
+}
+
+object BarSeq {
+  def unapplySeq(arg: Any): Option[Seq[Any]] = Some(List(arg))
+}
+
+object Baz {
+  def unapply[T](arg: T): Option[T] = Some(arg)
+}
+
+object BazSeq {
+  def unapplySeq[T](arg: T): Option[Seq[T]] = Some(List(arg))
+}

tests/run/tasty-custom-show/quoted_1.scala

@@ -48,6 +48,7 @@ object Macros {
 class DummyShow[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty0) {
   import tasty._
   def showTree(tree: Tree)(implicit ctx: Context): String = "Tree"
+  def showPattern(pattern: Pattern)(implicit ctx: Context): String = "Pattern"
   def showTypeOrBoundsTree(tpt: TypeOrBoundsTree)(implicit ctx: Context): String = "TypeOrBoundsTree"
   def showTypeOrBounds(tpe: TypeOrBounds)(implicit ctx: Context): String = "TypeOrBounds"
   def showConstant(const: Constant)(implicit ctx: Context): String = "Constant"