Merge pull request swiftlang#151 from dabelknap/fix-if-closures

Fix indentation of `if` blocks in closures

Author: allevato

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -427,10 +427,8 @@ private final class TokenStreamCreator: SyntaxVisitor {
   }
 
   override func visit(_ node: CodeBlockItemListSyntax) {
-    if node.parent is AccessorBlockSyntax, node.count > 0 {
-      for i in 0..<(node.count - 1) {
-        after(node[i].lastToken, tokens: .newline)
-      }
+    if node.parent is AccessorBlockSyntax || node.parent is ClosureExprSyntax, node.count > 0 {
+      insertToken(.newline, betweenChildrenOf: node)
     }
     super.visit(node)
   }

Tests/SwiftFormatPrettyPrintTests/FunctionCallTests.swift

@@ -47,7 +47,8 @@ public class FunctionCallTests: PrettyPrintTestCase {
   public func testBasicFunctionClosures() {
     let input =
       """
-      funcCall(closure: { < })
+      funcCall(closure: <)
+      funcCall(closure: { 4 })
       funcCall(closure: { $0 < $1 })
       funcCall(closure: { s1, s2 in s1 < s2 })
       funcCall(closure: { s1, s2 in return s1 < s2})
@@ -59,7 +60,8 @@ public class FunctionCallTests: PrettyPrintTestCase {
 
     let expected =
       """
-      funcCall(closure: { < })
+      funcCall(closure: <)
+      funcCall(closure: { 4 })
       funcCall(closure: { $0 < $1 })
       funcCall(closure: { s1, s2 in
         s1 < s2
@@ -117,4 +119,49 @@ public class FunctionCallTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 40)
   }
+
+  public func testClosuresWithIfs() {
+    let input =
+    """
+      let a = afunc() {
+        if condition1 {
+          return true
+        }
+        return false
+      }
+
+      let a = afunc() {
+        if condition1 {
+          return true
+        }
+        if condition2 {
+          return true
+        }
+        return false
+      }
+      """
+
+    let expected =
+    """
+      let a = afunc() {
+        if condition1 {
+          return true
+        }
+        return false
+      }
+
+      let a = afunc() {
+        if condition1 {
+          return true
+        }
+        if condition2 {
+          return true
+        }
+        return false
+      }
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 40)
+  }
 }