wip

Author: nicolasstucki

compiler/src/dotty/tools/dotc/printing/DecompilerPrinter.scala

@@ -50,7 +50,11 @@ class DecompilerPrinter(_ctx: Context) extends RefinedPrinter(_ctx) {
   }
 
   override protected def toTextTemplate(impl: Template, ofNew: Boolean = false): Text = {
-    val impl1 = impl.copy(parents = impl.parents.filterNot(_.symbol.maybeOwner == defn.ObjectClass))
+    def filter(sym: Symbol): Boolean = {
+      sym.maybeOwner == defn.ObjectClass ||
+      (sym == defn.ProductClass && impl.symbol.owner.is(Case))
+    }
+    val impl1 = impl.copy(parents = impl.parents.filterNot(p => filter(p.symbol)))
     super.toTextTemplate(impl1, ofNew)
   }
 

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -628,7 +628,8 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
     val tparamsTxt = withEnclosingDef(constr) { tparamsText(tparams) }
     val primaryConstrs = if (constr.rhs.isEmpty) Nil else constr :: Nil
     val prefix: Text =
-      if (vparamss.isEmpty || primaryConstrs.nonEmpty) tparamsTxt
+      if (constr.symbol.owner.is(Module)) " "
+      else if (vparamss.isEmpty || primaryConstrs.nonEmpty) tparamsTxt
       else {
         var modsText = modText(constr.mods, "")
         if (!modsText.isEmpty) modsText = " " ~ modsText

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

@@ -26,7 +26,7 @@ class FromTastyTests extends ParallelTesting {
     // > dotc -Ythrough-tasty -Ycheck:all <source>
 
     implicit val testGroup: TestGroup = TestGroup("posTestFromTasty")
-    val (step1, step2, step3, step4) = compileTastyInDir("tests/pos2", defaultOptions,
+    val (step1, step2, step3, step4) = compileTastyInDir("tests/pos", defaultOptions,
       blacklist = Set(
         "macro-deprecate-dont-touch-backquotedidents.scala",
         "t247.scala",

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

@@ -1288,6 +1288,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     val generateClassFiles = compileFilesInDir(f, flags0, blacklist)
 
     val decompilationDir = outDir + sourceDir.getName + "_decompiled"
+    new JFile(decompilationDir).mkdirs()
     val recompileDecompiled = compileFilesInDir(decompilationDir, flags0, blacklist)
 
     (

tests/pos/simpleCaseObject.decompiled

@@ -1,6 +1,6 @@
 /** Decompiled from out/posTestFromTasty/pos/simpleCaseObject/foo/Foo.class */
 package foo {
-  case object Foo() extends _root_.scala.Product { this: foo.Foo.type =>
+  case object Foo  { this: foo.Foo.type =>
     override def hashCode(): Int = 1045991777
     override def toString(): String = "Foo"
     override def canEqual(that: Any): Boolean =

tests/run/puzzle.decompiled

@@ -1,5 +1,5 @@
 /** Decompiled from out/runTestFromTasty/run/puzzle/Test.class */
-object Test() { this: Test.type =>
+object Test  { this: Test.type =>
   def main(args: Array[String]): Unit =
     {
       println(if false then 5.0 else 53.0)