Merge pull request #4689 from dotty-staging/add-colon-to-statement

Print double breaks after statements to avoid ambiguity

Author: nicolasstucki

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

@@ -38,6 +38,7 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
     def result(): String = sb.result()
 
     def lineBreak(): String = "\n" + ("  " * indent)
+    def doubleLineBreak(): String = "\n\n" + ("  " * indent)
 
     def printTree(tree: Tree): Buffer = tree match {
       case tree @ PackageClause(Term.Ident(name), stats) =>
@@ -191,8 +192,7 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
           case stats =>
             this += "{"
             indented {
-              this += lineBreak()
-              printTrees(stats, lineBreak())
+              printStats(stats.init, stats.last)
             }
             this += lineBreak() += "}"
         }
@@ -205,8 +205,7 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
           case stats =>
             this += "{"
             indented {
-              this += lineBreak()
-              printTrees(stats, lineBreak())
+              printStats(stats.init, stats.last)
             }
             this += lineBreak() += "}"
         }
@@ -333,28 +332,19 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
             this += ")"
           case _ =>
             this += "{"
+            val (stats1, expr1) =
+              if (isLoopEntryPoint(expr)) (stats.init, stats.last)
+              else (stats, expr)
             indented {
-              if (!stats.isEmpty) {
-                this += lineBreak()
-                printTrees(stats, lineBreak())
-              }
-              if (!isLoopEntryPoint(expr)) {
-                this += lineBreak()
-                printTree(expr)
-              }
+              printStats(stats1, expr1)
             }
             this += lineBreak() += "}"
         }
 
       case Term.Inlined(call, bindings, expansion) =>
-        sb.append("{ // inlined")
+        this += "{ // inlined"
         indented {
-          if (!bindings.isEmpty) {
-            this += lineBreak()
-            printTrees(bindings, lineBreak())
-          }
-          this += lineBreak()
-          printTree(expansion)
+          printStats(bindings, expansion)
         }
         this += lineBreak() += "}"
 
@@ -406,6 +396,30 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
 
     }
 
+    def printStats(stats: List[Tree], expr: Tree): Unit = {
+      def printSeparator(nextStats: List[Tree]) = {
+        // Avoid accidental application of opening `{` on next line with a double break
+        val next = if (nextStats.isEmpty) expr else nextStats.head
+        next match {
+          case Term.Block(DefDef("while$" | "doWhile$", _, _, _, _) :: Nil, _) => this += lineBreak()
+          case Term.Block(_, _) => this += doubleLineBreak()
+          case Term.Inlined(_, _, _) => this += doubleLineBreak()
+          case _ => this += lineBreak()
+        }
+      }
+      def printSeparated(list: List[Tree]): Unit = list match {
+        case Nil =>
+          printTree(expr)
+        case x :: xs =>
+          printTree(x)
+          printSeparator(xs)
+          printSeparated(xs)
+      }
+
+      this += lineBreak()
+      printSeparated(stats)
+    }
+
     def printTrees(trees: List[Tree], sep: String): Buffer = {
       def printSeparated(list: List[Tree]): Unit = list match {
         case Nil =>
@@ -609,14 +623,11 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
       }
       this += " =>"
       indented {
-        this += lineBreak()
         body match {
           case Term.Block(stats, expr) =>
-            printTrees(stats, lineBreak())
-            if (stats.nonEmpty)
-              this += lineBreak()
-            printTree(expr)
+            printStats(stats, expr)
           case body =>
+            this += lineBreak()
             printTree(body)
         }
       }

tests/pos/simpleDoWhile.decompiled

@@ -6,4 +6,4 @@ class Foo() {
       i = 0
     } while (i.!=(0))
   }
-}
+}

tests/run-with-compiler/i3876-d.check

@@ -1,6 +1,7 @@
 6
 {
   val x$1: scala.Int = 3
+
   { // inlined
     x$1.+(x$1)
   }

tests/run-with-compiler/quote-show-blocks-raw.check

@@ -1,11 +1,15 @@
 {
   scala.Predef.println(1)
+
   {
     scala.Predef.println(2)
+
     {
       scala.Predef.println(3)
+
       {
         scala.Predef.println(4)
+
         {
           scala.Predef.println(5)
           ()