Merge pull request swiftlang#498 from stackotter/issue-494

Fix pretty printing of multi-statement closures (issue swiftlang#494)

Author: allevato

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -1083,7 +1083,7 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
 
   override func visit(_ node: ClosureExprSyntax) -> SyntaxVisitorContinueKind {
     let newlineBehavior: NewlineBehavior
-    if forcedBreakingClosures.remove(node.id) != nil {
+    if forcedBreakingClosures.remove(node.id) != nil || node.statements.count > 1 {
       newlineBehavior = .soft
     } else {
       newlineBehavior = .elective

Tests/SwiftFormatPrettyPrintTests/ClosureExprTests.swift

@@ -516,4 +516,24 @@ final class ClosureExprTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 40)
   }
+
+  func testClosureWithSignatureAndMultipleStatements() {
+    let input =
+      """
+      { a in a + 1
+        a + 2
+      }
+      """
+
+    let expected =
+      """
+      { a in
+        a + 1
+        a + 2
+      }
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 40)
+  }
 }