Do not print empty package when decompiling

Author: nicolasstucki

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

@@ -36,8 +36,10 @@ class DecompilerPrinter(_ctx: Context) extends RefinedPrinter(_ctx) {
       case _ => toTextGlobal(stats, "\n")
     }
     val bodyText =
-      if (currentPrecedence == TopLevelPrec) "\n" ~ statsText else " {" ~ statsText ~ "}"
-    keywordStr("package ") ~ toTextPackageId(tree.pid) ~ bodyText
+      if (tree.pid.symbol.isEmptyPackage) statsText
+      else if (currentPrecedence == TopLevelPrec) "\n" ~ statsText
+      else " {" ~ statsText ~ "}"
+    (keywordStr("package ") ~ toTextPackageId(tree.pid)).provided(!tree.pid.symbol.isEmptyPackage) ~ bodyText
   }
 
   override protected def templateText(tree: TypeDef, impl: Template): Text = {

tests/pos/methodTypes.decompiled

@@ -1,11 +1,9 @@
 ================================================================================
 out/posTestFromTasty/pos/methodTypes/Foo.class
 --------------------------------------------------------------------------------
-package <empty> {
-  class Foo() extends Object() {
-    val x: Int = 1
-    def y: Int = 2
-    def z(): Int = 3
-  }
+class Foo() extends Object() {
+  val x: Int = 1
+  def y: Int = 2
+  def z(): Int = 3
 }
 --------------------------------------------------------------------------------

tests/pos/simpleDoWhile.decompiled

@@ -1,17 +1,15 @@
 ================================================================================
 out/posTestFromTasty/pos/simpleDoWhile/Foo.class
 --------------------------------------------------------------------------------
-package <empty> {
-  class Foo() extends Object() {
-    def foo: Unit =
-      {
-        var i: Int = 1
-        do
-          {
-            i = 0
-          }
-        while (i.!=(0))
-      }
-  }
+class Foo() extends Object() {
+  def foo: Unit =
+    {
+      var i: Int = 1
+      do
+        {
+          i = 0
+        }
+      while (i.!=(0))
+    }
 }
 --------------------------------------------------------------------------------

tests/pos/simpleWhile.decompiled

@@ -1,16 +1,14 @@
 ================================================================================
 out/posTestFromTasty/pos/simpleWhile/Foo.class
 --------------------------------------------------------------------------------
-package <empty> {
-  class Foo() extends Object() {
-    def foo: Unit =
-      {
-        var i: Int = 1
-        while (i.!=(0))
-          {
-            i = 0
-          }
-      }
-  }
+class Foo() extends Object() {
+  def foo: Unit =
+    {
+      var i: Int = 1
+      while (i.!=(0))
+        {
+          i = 0
+        }
+    }
 }
 --------------------------------------------------------------------------------

tests/run/puzzle.decompiled

@@ -1,17 +1,15 @@
 ================================================================================
 out/runTestFromTasty/run/puzzle/Test.class
 --------------------------------------------------------------------------------
-package <empty> {
-  object Test() extends Object() { this: Test.type =>
-    def main(args: Array[String]): Unit =
-      {
-        println(if false then 5.0 else 53.0)
-        val x: Double = if false then 5.0 else 53.0
-        println(x)
-        val z: Long = 1L
-        val y: Float = Long.long2float(z)
-        ()
-      }
-  }
+object Test() extends Object() { this: Test.type =>
+  def main(args: Array[String]): Unit =
+    {
+      println(if false then 5.0 else 53.0)
+      val x: Double = if false then 5.0 else 53.0
+      println(x)
+      val z: Long = 1L
+      val y: Float = Long.long2float(z)
+      ()
+    }
 }
 --------------------------------------------------------------------------------