Merge pull request #4533 from fschueler/4526_class_w_compObj

nicolasstucki · web-flow · commit df00a6710ed6 · 2018-05-15T22:26:31.000+02:00
Fix printing of classes with companion objects in the decompiler (#4526)
diff --git a/compiler/src/dotty/tools/dotc/printing/DecompilerPrinter.scala b/compiler/src/dotty/tools/dotc/printing/DecompilerPrinter.scala
@@ -38,7 +38,7 @@ class DecompilerPrinter(_ctx: Context) extends RefinedPrinter(_ctx) {
     }
     val statsText = stats match {
       case (pdef: PackageDef) :: Nil => toText(pdef)
-      case _ => toTextGlobal(stats, "\n")
+      case _ => Fluid(toTextGlobal(stats, "\n") :: Nil)
     }
     val bodyText =
       if (tree.pid.symbol.isEmptyPackage) statsText
diff --git a/tests/pos/classWithCompObj.decompiled b/tests/pos/classWithCompObj.decompiled
@@ -0,0 +1,3 @@
+/** Decompiled from out/posTestFromTasty/pos/classWithCompObj/Foo.class */
+class Foo() {}
+object Foo {}
diff --git a/tests/pos/classWithCompObj.scala b/tests/pos/classWithCompObj.scala
@@ -0,0 +1,2 @@
+class Foo
+object Foo

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class DecompilerPrinter(_ctx: Context) extends RefinedPrinter(_ctx) {`
`38`	`38`	`}`
`39`	`39`	`val statsText = stats match {`
`40`	`40`	`case (pdef: PackageDef) :: Nil => toText(pdef)`
`41`		`- case _ => toTextGlobal(stats, "\n")`
	`41`	`+ case _ => Fluid(toTextGlobal(stats, "\n") :: Nil)`
`42`	`42`	`}`
`43`	`43`	`val bodyText =`
`44`	`44`	`if (tree.pid.symbol.isEmptyPackage) statsText`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/** Decompiled from out/posTestFromTasty/pos/classWithCompObj/Foo.class */`
	`2`	`+class Foo() {}`
	`3`	`+object Foo {}`