Merge pull request #257 from Atry/keep-blocks

Don't eliminate blocks after CPS transformation
ThoughtWorksInc · Jun 3, 2019 · 90969cf · 90969cf
2 parents 2201775 + e90adff
commit 90969cf
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...ugins-BangNotation/src/main/scala/com/thoughtworks/dsl/compilerplugins/BangNotation.scala b/...ugins-BangNotation/src/main/scala/com/thoughtworks/dsl/compilerplugins/BangNotation.scala
@@ -307,7 +307,12 @@ final class BangNotation(override val global: Global) extends Plugin {
             def loop(stats: List[Tree]): Tree = {
               stats match {
                 case Nil =>
-                  cpsAttachment(expr)(continue)
+                  cpsAttachment(expr) {
+                    case block: Block =>
+                      continue(block)
+                    case notBlock =>
+                      continue(treeCopy.Block(tree, Nil, notBlock))
+                  }
                 case (valDef @ ValDef(mods, name, tpt, rhs)) :: tail =>
                   // TODO: lazy val
                   cpsAttachment(rhs) { rhsValue =>