Fix pinting of secondary constructors

Author: nicolasstucki

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

@@ -139,7 +139,6 @@ class FromTastyTests extends ParallelTesting {
         "erased-asInstanceOf",
         "erased-extension-method",
         "erased-lub",
-        "erasure",
         "ErasureAnd",
         "explicitOuter",
         "extmethods",
@@ -155,7 +154,6 @@ class FromTastyTests extends ParallelTesting {
         "hklower",
         "hkrange",
         "ho-implicits",
-        "homonym",
         "i0239",
         "i1044",
         "i1216",
@@ -212,7 +210,6 @@ class FromTastyTests extends ParallelTesting {
         "i3083",
         "i3139",
         "i3149",
-        "i3171",
         "i3207",
         "i3246",
         "i3248",
@@ -276,7 +273,6 @@ class FromTastyTests extends ParallelTesting {
         "javaConversions-2.10-ambiguity",
         "javaConversions-2.10-regression",
         "Labels",
-        "lambdalift-1",
         "lazyValsSepComp",
         "macro-deprecate-dont-touch-backquotedidents",
         "Meter",
@@ -290,7 +286,6 @@ class FromTastyTests extends ParallelTesting {
         "Orderings",
         "overloaddefault",
         "overloaded_ho_fun",
-        "override-via-self",
         "package-case",
         "packageobject",
         "packageobjs",
@@ -357,7 +352,6 @@ class FromTastyTests extends ParallelTesting {
         "t1107a",
         "t1136",
         "t1147",
-        "t116",
         "t1164",
         "t1168",
         "t1208",
@@ -369,11 +363,8 @@ class FromTastyTests extends ParallelTesting {
         "t1318",
         "t1391",
         "t1438",
-        "t160",
-        "t175",
         "t1756",
         "t1789",
-        "t1798",
         "t1858",
         "t1957",
         "t1974",
@@ -416,7 +407,6 @@ class FromTastyTests extends ParallelTesting {
         "t3174b",
         "t3177",
         "t319",
-        "t3274",
         "t3312",
         "t3343",
         "t3374",
@@ -488,7 +478,6 @@ class FromTastyTests extends ParallelTesting {
         "t6575b",
         "t6600",
         "t661",
-        "t6745",
         "t6797",
         "t690",
         "t6921",
@@ -516,7 +505,6 @@ class FromTastyTests extends ParallelTesting {
         "t7753",
         "t7785",
         "t7815",
-        "t7853",
         "t7864",
         "t789",
         "t7902",
@@ -672,7 +660,6 @@ class FromTastyTests extends ParallelTesting {
         "concat-two-strings",
         "concurrent-map-conversions",
         "config",
-        "constructors",
         "contrib674",
         "correct-bind",
         "Course-2002-03",
@@ -839,7 +826,6 @@ class FromTastyTests extends ParallelTesting {
         "t1505",
         "t1591",
         "t1672",
-        "t1909b",
         "t1939",
         "t1987",
         "t1994",
@@ -869,7 +855,6 @@ class FromTastyTests extends ParallelTesting {
         "t3613",
         "t3651",
         "t3763",
-        "t3832",
         "t3855",
         "t3935",
         "t4013",

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

@@ -239,13 +239,17 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
         if (flags.isInline) this += "inline "
         if (flags.isOverride) this += "override "
 
-        this += "def " += name
+        val isConstructor = name == "<init>"
+
+        this += "def " += (if (isConstructor) "this" else name)
         printTargsDefs(targs)
         val it = argss.iterator
         while (it.hasNext)
           printArgsDefs(it.next())
-        this += ": "
-        printTypeTree(tpt)
+        if (!isConstructor) {
+          this += ": "
+          printTypeTree(tpt)
+        }
         rhs match {
           case Some(tree) =>
             this += " = "
@@ -288,7 +292,10 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
         printTree(expr)
 
       case Term.Apply(fn, args) =>
-        printTree(fn)
+        fn match {
+          case Term.Select(Term.This(_), "<init>", _) => this += "this" // call to constructor inside a constructor
+          case _ => printTree(fn)
+        }
         this += "("
         printTrees(args, ", ")
         this += ")"

tests/pos/t116.decompiled

@@ -0,0 +1,8 @@
+/** Decompiled from out/posTestFromTasty/pos/t116/C.class */
+class C() {
+  def this(x: scala.Int) = {
+    this();
+    class D() extends C();
+    ()
+  }
+}