Print self types

Author: nicolasstucki

compiler/test/dotty/tools/dotc/FromTastyTests.scala

@@ -193,7 +193,6 @@ class FromTastyTests extends ParallelTesting {
         "i2300",
         "i2378",
         "i239-packageObj",
-        "i2390",
         "i2397",
         "i2468",
         "i2554",
@@ -313,9 +312,6 @@ class FromTastyTests extends ParallelTesting {
         "sammy_single",
         "sams",
         "scala-singleton",
-        "scoping1",
-        "scoping3",
-        "selftypes",
         "seq-ordering",
         "SI-4012-a",
         "SI-4012-b",
@@ -354,11 +350,11 @@ class FromTastyTests extends ParallelTesting {
         "t1014",
         "t1027",
         "t1035",
+        "t1050",
         "t1053",
         "t1070",
         "t1085",
         "t1107a",
-        "t1131",
         "t1136",
         "t1147",
         "t116",
@@ -401,7 +397,6 @@ class FromTastyTests extends ParallelTesting {
         "t2454",
         "t2484",
         "t2503",
-        "t2545",
         "t2610",
         "t2613",
         "t2660",
@@ -411,8 +406,6 @@ class FromTastyTests extends ParallelTesting {
         "t2712-3",
         "t2712-5",
         "t2712-7",
-        "t2795-new",
-        "t2795-old",
         "t287",
         "t2910",
         "t2945",
@@ -426,14 +419,12 @@ class FromTastyTests extends ParallelTesting {
         "t3274",
         "t3312",
         "t3343",
-        "t3371",
         "t3374",
         "t3384",
         "t3430",
         "t3528",
         "t3560",
         "t3570",
-        "t360",
         "t361",
         "t3672",
         "t3777",
@@ -459,7 +450,6 @@ class FromTastyTests extends ParallelTesting {
         "t4911",
         "t5031_2",
         "t5033",
-        "t5071",
         "t5178",
         "t5240",
         "t530",
@@ -525,8 +515,8 @@ class FromTastyTests extends ParallelTesting {
         "t7694",
         "t7753",
         "t7785",
-        "t780",
         "t7815",
+        "t7853",
         "t7864",
         "t789",
         "t7902",
@@ -569,7 +559,6 @@ class FromTastyTests extends ParallelTesting {
         "typeinferNull",
         "unapply",
         "unapplyComplex",
-        "unapplyContexts2",
         "unapplyGeneric",
         "unicode-decode",
         "vararg-pattern",

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

@@ -146,14 +146,30 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
           case stat@Import(_, _) => stat
           case stat@Term() => stat
         }
-        if (stats1.nonEmpty) {
+
+        def printBody(printSelf: Boolean) = {
           this += " {"
           indented {
+            if (printSelf) {
+              val Some(ValDef(name, tpt, _)) = self
+              indented {
+                val name1 = if (name == "_") "this" else name
+                this += " " += name1 += ": "
+                printTypeTree(tpt)
+                this += " =>"
+              }
+            }
             this += lineBreak()
             printTrees(stats1, lineBreak())
           }
           this += lineBreak() += "}"
         }
+        self match {
+          case Some(ValDef(_, TypeTree.Singleton(_), _)) =>
+            if (stats1.nonEmpty) printBody(printSelf = false)
+          case Some(ValDef(_, _, _)) => printBody(printSelf = true)
+          case _ => if (stats1.nonEmpty) printBody(printSelf = false)
+        }
         this
 
       case tdef @ TypeDef(name, rhs) =>

tests/pos/selftypes.decompiled

@@ -0,0 +1,12 @@
+/** Decompiled from out/posTestFromTasty/pos/selftypes/selftypes.class */
+object selftypes {
+  trait A() extends java.lang.Object { self: selftypes.AB =>
+    type AA = scala.List[this.BX]
+    class AX()
+  }
+  trait B() extends java.lang.Object { self: selftypes.AB =>
+    type BB = B.this.AA
+    class BX()
+  }
+  class AB() extends selftypes.A with selftypes.B
+}