Merge pull request swiftlang#157 from dabelknap/assorted-fixes

Add Arrow Expressions

Author: allevato

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -14,23 +14,6 @@ import SwiftFormatConfiguration
 import SwiftFormatCore
 import SwiftSyntax
 
-private class FindChildScope: SyntaxVisitor {
-  var found = false
-  override func visit(_ node: CodeBlockSyntax) {
-    found = true
-  }
-  override func visit(_ node: SwitchStmtSyntax) {
-    found = true
-  }
-  func findChildScope(in items: CodeBlockItemListSyntax) -> Bool {
-    for child in items {
-      visit(child)
-      if found { return true }
-    }
-    return false
-  }
-}
-
 private let rangeOperators: Set = ["...", "..<"]
 
 private final class TokenStreamCreator: SyntaxVisitor {
@@ -412,15 +395,6 @@ private final class TokenStreamCreator: SyntaxVisitor {
     super.visit(node)
   }
 
-  func shouldAddOpenCloseNewlines(_ node: Syntax) -> Bool {
-    if node is AccessorListSyntax { return true }
-    guard let list = node as? CodeBlockItemListSyntax else {
-      return false
-    }
-    if list.count > 1 { return true }
-    return FindChildScope().findChildScope(in: list)
-  }
-
   override func visit(_ node: CodeBlockSyntax) {
     insertToken(.newline, betweenChildrenOf: node.statements)
     super.visit(node)
@@ -585,6 +559,9 @@ private final class TokenStreamCreator: SyntaxVisitor {
   }
 
   override func visit(_ node: ArrowExprSyntax) {
+    before(node.throwsToken, tokens: .break)
+    before(node.arrowToken, tokens: .break)
+    after(node.arrowToken, tokens: .break)
     super.visit(node)
   }
 
@@ -1400,14 +1377,6 @@ private final class TokenStreamCreator: SyntaxVisitor {
     }
     tokens.append(token)
   }
-
-  private func shouldAddNewlineBefore(_ token: TokenSyntax?) -> Bool {
-    guard let token = token, let before = beforeMap[token] else { return false }
-    for item in before {
-      if case .newlines = item { return false }
-    }
-    return true
-  }
 }
 
 extension Syntax {

Tests/SwiftFormatPrettyPrintTests/ArrayDeclTests.swift

@@ -39,4 +39,21 @@ public class ArrayDeclTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 45)
   }
+
+  public func testArrayOfFunctions() {
+    let input =
+      """
+      let A = [(Int, Double) -> Bool]()
+      let A = [(Int, Double) throws -> Bool]()
+      """
+
+    let expected =
+      """
+      let A = [(Int, Double) -> Bool]()
+      let A = [(Int, Double) throws -> Bool]()
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 45)
+  }
 }