wip

Author: nicolasstucki

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

@@ -488,7 +488,8 @@ object TastyImpl extends scala.tasty.Tasty {
 
     object Unapply extends UnapplyExtractor {
       def unapply(x: Pattern)(implicit ctx: Context): Option[(Term, List[Term], List[Pattern])] = x match {
-        case x: tpd.UnApply @unchecked => Some(x.fun, x.implicits, x.patterns)
+        case Trees.UnApply(fun, implicits, patterns) => Some((fun, implicits, patterns))
+        case Trees.Typed(Trees.UnApply(fun, implicits, patterns), _) => Some((fun, implicits, patterns))
         case _ => None
       }
     }
@@ -502,7 +503,8 @@ object TastyImpl extends scala.tasty.Tasty {
 
     object TypeTest extends TypeTestExtractor {
       def unapply(x: Pattern)(implicit ctx: Context): Option[TypeTree] = x match {
-        case x: tpd.Typed @unchecked => Some(x.tpt)
+        case Trees.Typed(Trees.UnApply(_, _, _), _) => None
+        case Trees.Typed(_, tpt) => Some(tpt)
         case _ => None
       }
     }

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

@@ -535,6 +535,8 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
         body match {
           case Term.Block(stats, expr) =>
             printTrees(stats, lineBreak())
+            if (stats.nonEmpty)
+              this += lineBreak()
             printTree(expr)
           case body =>
             printTree(body)
@@ -580,7 +582,6 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
 
       case _ =>
         throw new MatchError(pattern.show)
-
     }
 
     def printConstant(const: Constant): Buffer = const match {

tests/pos/i2104.decompiled

@@ -3,11 +3,9 @@ class Cons[H, T]() extends java.lang.Object
 object Cons {
   def apply[H, T](h: H, t: T): Cons[H, T] = scala.Predef.???
   def unapply[H, T](t: Cons[H, T]): scala.Option[Pair[H, T]] = scala.Predef.???
-}/** Decompiled from out/posTestFromTasty/pos/i2104/Pair.class */
+}
+/** Decompiled from out/posTestFromTasty/pos/i2104/Pair.class */
 case class Pair[A, B](_1: A, _2: B) {
-  def copy[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any](_1: A, _2: B): Pair[A, B] = new Pair[A, B](_1, _2)
-  def copy$default$1[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any]: A = (_1: _1)
-  def copy$default$2[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any]: B = (_2: _2)
   override def hashCode(): scala.Int = {
     var acc: scala.Int = 2479866
     acc = scala.runtime.Statics.mix(acc, scala.runtime.Statics.anyHash(_1))
@@ -33,18 +31,14 @@ case class Pair[A, B](_1: A, _2: B) {
       throw new java.lang.IndexOutOfBoundsException(n.toString())
   }
 }
-object Pair extends scala.AnyRef {
-  def apply[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any](_1: A, _2: B): Pair[A, B] = new Pair[A, B](_1, _2)
-  def unapply[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any](x$1: Pair[A, B]): Pair[A, B] = x$1
-}/** Decompiled from out/posTestFromTasty/pos/i2104/Test.class */
+object Pair extends scala.AnyRef
+/** Decompiled from out/posTestFromTasty/pos/i2104/Test.class */
 object Test {
   def main(args: scala.Array[scala.Predef.String]): scala.Unit = {
     Cons.apply[scala.Option[scala.Int], scala.None.type](scala.Option.apply[scala.Int](1), scala.None) match {
-      case Cons(_: scala.Some[scala.Int], scala.None) =>
-        {
-          (i: scala.Int)
-          dotty.DottyPredef.assert(i.==(1))
-        }
+      case Cons(scala.Some(i), scala.None) =>
+        (i: scala.Int)
+        dotty.DottyPredef.assert(i.==(1))
     }
   }
 }

tests/pos/simpleCaseClass-2.decompiled

@@ -2,7 +2,7 @@
 case class A(x: scala.Int) {
   override def hashCode(): scala.Int = {
     var acc: scala.Int = 65
-    acc = scala.runtime.Statics.mix(acc, A.this.x)
+    acc = scala.runtime.Statics.mix(acc, x)
     scala.runtime.Statics.finalizeHash(acc, 1)
   }
   override def equals(x$0: scala.Any): scala.Boolean = this.eq(x$0.asInstanceOf[java.lang.Object]).||(x$0 match {
@@ -22,4 +22,4 @@ case class A(x: scala.Int) {
       throw new java.lang.IndexOutOfBoundsException(n.toString())
   }
 }
-object A extends scala.Function1[scala.Int, A]
+object A extends scala.Function1[scala.Int, A]

tests/pos/simpleCaseClass-3.decompiled

@@ -2,17 +2,17 @@
 case class A[T](x: T) {
   override def hashCode(): scala.Int = {
     var acc: scala.Int = 65
-    acc = scala.runtime.Statics.mix(acc, scala.runtime.Statics.anyHash(A.this.x))
+    acc = scala.runtime.Statics.mix(acc, scala.runtime.Statics.anyHash(x))
     scala.runtime.Statics.finalizeHash(acc, 1)
   }
   override def equals(x$0: scala.Any): scala.Boolean = this.eq(x$0.asInstanceOf[java.lang.Object]).||(x$0 match {
-    case x$0: A[A.this.T] =>
+    case x$0: A[T] =>
       this.x.==(x$0.x)
     case _ =>
       false
   })
   override def toString(): java.lang.String = scala.runtime.ScalaRunTime._toString(this)
-  override def canEqual(that: scala.Any): scala.Boolean = that.isInstanceOf[A[A.this.T]]
+  override def canEqual(that: scala.Any): scala.Boolean = that.isInstanceOf[A[T]]
   override def productArity: scala.Int = 1
   override def productPrefix: java.lang.String = "A"
   override def productElement(n: scala.Int): scala.Any = n match {