Don't force empty blocks to be single line

scala-ide · Sep 9, 2010 · 578ceed · 578ceed
1 parent 3fa2f85
commit 578ceed
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 19 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,6 +4,7 @@
 * Bug fixes for if/for/while inside paren expressions
 * Handle Scala parsing exceptions in command-line tool
 * Parse and format a sequence of XML nodes correctly
+* No longer force empty blocks to be single line (class A {})
 
 0.0.4 (17/July/10)
 * Add Maven/Tycho build

diff --git a/scalariform/src/main/scala/scalariform/formatter/ExprFormatter.scala b/scalariform/src/main/scala/scalariform/formatter/ExprFormatter.scala
@@ -426,23 +426,25 @@ trait ExprFormatter { self: HasFormattingPreferences with AnnotationFormatter wi
           formatResult ++= format(caseClauses)(newFormatterState)
 
       case Right(statSeq) ⇒ {
-        if (!singleLineBlock && statSeq.firstTokenOption.isDefined) {
-          statSeq.firstStatOpt match {
-            case Some(Expr(List(AnonymousFunctionStart(params, _), subStatSeq))) ⇒ {
-              formatResult = formatResult.before(statSeq.firstToken, CompactEnsuringGap)
-              for (firstToken ← subStatSeq.firstTokenOption)
-                formatResult = formatResult.before(firstToken, newFormatterState.nextIndentLevelInstruction)
-              formatResult ++= format(params)
-              formatResult ++= format(subStatSeq)(newFormatterState.indent)
-            }
-            case _ ⇒ {
-              val instruction =
-                if (statSeq.selfReferenceOpt.isDefined)
-                  CompactEnsuringGap
-                else
-                  newFormatterState.nextIndentLevelInstruction
-              formatResult = formatResult.before(statSeq.firstToken, instruction)
-              formatResult ++= format(statSeq)(newFormatterState.indent)
+        if (!singleLineBlock) {
+          if (statSeq.firstTokenOption.isDefined) {
+            statSeq.firstStatOpt match {
+              case Some(Expr(List(AnonymousFunctionStart(params, _), subStatSeq))) ⇒ {
+                formatResult = formatResult.before(statSeq.firstToken, CompactEnsuringGap)
+                for (firstToken ← subStatSeq.firstTokenOption)
+                  formatResult = formatResult.before(firstToken, newFormatterState.nextIndentLevelInstruction)
+                formatResult ++= format(params)
+                formatResult ++= format(subStatSeq)(newFormatterState.indent)
+              }
+              case _ ⇒ {
+                val instruction =
+                  if (statSeq.selfReferenceOpt.isDefined)
+                    CompactEnsuringGap
+                  else
+                    newFormatterState.nextIndentLevelInstruction
+                formatResult = formatResult.before(statSeq.firstToken, instruction)
+                formatResult ++= format(statSeq)(newFormatterState.indent)
+              }
             }
           }
           formatResult = formatResult.before(rbrace, newFormatterState.currentIndentLevelInstruction)

diff --git a/scalariform/src/test/scala/scalariform/formatter/BlockExprFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/BlockExprFormatterTest.scala
@@ -97,4 +97,16 @@ class BlockExprFormatterTest extends AbstractExpressionFormatterTest {
     |  false
     |}"""
 
+  """{
+    |}""" ==>
+  """{
+    |}"""
+
+  """{
+    |
+    |}""" ==>
+  """{
+    |
+    |}"""
+
 }
diff --git a/scalariform/src/test/scala/scalariform/formatter/IfExprFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/IfExprFormatterTest.scala
@@ -142,7 +142,8 @@ class IfExprFormatterTest extends AbstractExpressionFormatterTest {
 
   """if (true){
     |}""" ==>
-  """if (true) {}"""
+  """if (true) {
+    |}"""
 
   "if (true){;}" ==> "if (true) { ; }"
 

diff --git a/scalariform/src/test/scala/scalariform/formatter/TemplateFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/TemplateFormatterTest.scala
@@ -459,6 +459,13 @@ class TemplateFormatterTest extends AbstractFormatterTest {
   "private [a] case class B" ==> "private[a] case class B"
   "private [a] object B" ==> "private[a] object B"
 
+  """class A {
+    |
+    |}""" ==>
+  """class A {
+    |
+    |}"""
+
   // format: ON
 
   override val debug = false

diff --git a/scalariform/src/test/scala/scalariform/formatter/TryExprFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/TryExprFormatterTest.scala
@@ -57,7 +57,8 @@ class TryExprFormatterTest extends AbstractExpressionFormatterTest {
     |} catch { case e => }finally 
     |{ 
     |println("foo") }""" ==>
-  """try {} catch { case e => }
+  """try {
+    |} catch { case e => }
     |finally {
     |  println("foo")
     |}"""