Merge pull request #5263 from dotty-staging/avoid-printing-blocks

Normalize blocks with no statements in quotes

Author: nicolasstucki

compiler/src/dotty/tools/dotc/quoted/TreeCleaner.scala

@@ -38,8 +38,8 @@ class TreeCleaner extends tpd.TreeMap {
           case stat => stat :: Nil
         }
         expr1 match {
-          case Block(stats3, expr3) => Block(flatStats ::: stats3, expr3)
-          case expr3 => Block(flatStats, expr3)
+          case Block(stats3, expr3) => seq(flatStats ::: stats3, expr3)
+          case expr3 => seq(flatStats, expr3)
         }
       case tree1: TypeTree => TypeTree(tree1.tpe.subst(aliasesSyms, aliasesTypes))
       case tree1: Ident => aliases.get(tree1.symbol).getOrElse(tree1)

tests/run-with-compiler/i3847-b.check

@@ -1,3 +1 @@
-{
-  new scala.Array[scala.List[scala.Int]](1)
-}
+new scala.Array[scala.List[scala.Int]](1)

tests/run-with-compiler/i4350.check

@@ -1,6 +1,2 @@
-{
-  null.asInstanceOf[lang.Object]
-}
-{
-  null.asInstanceOf[scala.Predef.String]
-}
+null.asInstanceOf[lang.Object]
+null.asInstanceOf[scala.Predef.String]

tests/run-with-compiler/shonan-hmm.check

@@ -45,9 +45,7 @@ List(25, 30, 20, 43, 44)
 
 {
   val arr: scala.Array[scala.Array[scala.Int]] = {
-    val array: scala.Array[scala.Array[scala.Int]] = dotty.runtime.Arrays.newGenericArray[scala.Array[scala.Int]](5)({
-      scala.reflect.ClassTag.apply[scala.Array[scala.Int]](scala.Predef.classOf[scala.Array[scala.Int]])
-    })
+    val array: scala.Array[scala.Array[scala.Int]] = dotty.runtime.Arrays.newGenericArray[scala.Array[scala.Int]](5)(scala.reflect.ClassTag.apply[scala.Array[scala.Int]](scala.Predef.classOf[scala.Array[scala.Int]]))
     array.update(0, {
       val array$2: scala.Array[scala.Int] = new scala.Array[scala.Int](5)
       array$2.update(0, 5)
@@ -111,9 +109,7 @@ List(25, 30, 20, 43, 44)
 
 {
   val arr: scala.Array[scala.Array[scala.Int]] = {
-    val array: scala.Array[scala.Array[scala.Int]] = dotty.runtime.Arrays.newGenericArray[scala.Array[scala.Int]](5)({
-      scala.reflect.ClassTag.apply[scala.Array[scala.Int]](scala.Predef.classOf[scala.Array[scala.Int]])
-    })
+    val array: scala.Array[scala.Array[scala.Int]] = dotty.runtime.Arrays.newGenericArray[scala.Array[scala.Int]](5)(scala.reflect.ClassTag.apply[scala.Array[scala.Int]](scala.Predef.classOf[scala.Array[scala.Int]]))
     array.update(0, {
       val array$2: scala.Array[scala.Int] = new scala.Array[scala.Int](5)
       array$2.update(0, 5)
@@ -177,9 +173,7 @@ List(25, 30, 20, 43, 44)
 
 {
   val arr: scala.Array[scala.Array[scala.Int]] = {
-    val array: scala.Array[scala.Array[scala.Int]] = dotty.runtime.Arrays.newGenericArray[scala.Array[scala.Int]](5)({
-      scala.reflect.ClassTag.apply[scala.Array[scala.Int]](scala.Predef.classOf[scala.Array[scala.Int]])
-    })
+    val array: scala.Array[scala.Array[scala.Int]] = dotty.runtime.Arrays.newGenericArray[scala.Array[scala.Int]](5)(scala.reflect.ClassTag.apply[scala.Array[scala.Int]](scala.Predef.classOf[scala.Array[scala.Int]]))
     array.update(0, {
       val array$2: scala.Array[scala.Int] = new scala.Array[scala.Int](5)
       array$2.update(0, 5)