Staircase tweaks

scala-ide · Sep 13, 2010 · ebbdfc4 · ebbdfc4
1 parent 5deb429
commit ebbdfc4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/scalariform/src/main/scala/scalariform/formatter/ExprFormatter.scala b/scalariform/src/main/scala/scalariform/formatter/ExprFormatter.scala
@@ -28,7 +28,8 @@ trait ExprFormatter { self: HasFormattingPreferences with AnnotationFormatter wi
             case (InfixExprElement(_), _) | (_, InfixExprElement(_)) ⇒ CompactEnsuringGap
             case (_, _: ArgumentExprs) if formattingPreferences(PreserveSpaceBeforeArguments) ⇒ CompactPreservingGap
             case (_, _) if element.firstTokenOption exists { hiddenPredecessors(_).containsNewline } ⇒
-              nestedFormatterState = currentFormatterState.indent
+              if (!expressionBreakIndentHappened)
+                nestedFormatterState = currentFormatterState.indent
               nestedFormatterState.currentIndentLevelInstruction
           }
 

diff --git a/scalariform/src/test/scala/scalariform/formatter/MiscExpressionFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/MiscExpressionFormatterTest.scala
@@ -404,10 +404,21 @@ class MiscExpressionFormatterTest extends AbstractExpressionFormatterTest {
 
   """a(
     |    () => 
-    |    b)""" ==>
+    |    b)""" =/=>
   """a(
     |  () =>
-    |    b)"""
+    |    b)""" because "Need to fix this"
+
+ """foobar(
+    |(1,2),
+    |(3, 4), 
+    |(5, 6), 
+    |(7, 8))""" ==>
+  """foobar(
+    |  (1, 2),
+    |  (3, 4),
+    |  (5, 6),
+    |  (7, 8))"""
 
 
 }