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

Assorted Fixes

Author: allevato

Diff for: Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -117,6 +117,7 @@ private final class TokenStreamCreator: SyntaxVisitor {
 
   override func visit(_ node: TupleElementSyntax) {
     before(node.firstToken, tokens: .open)
+    after(node.colon, tokens: .break)
     after(node.lastToken, tokens: .close)
     super.visit(node)
   }
@@ -834,7 +835,11 @@ private final class TokenStreamCreator: SyntaxVisitor {
       node.genericWhereClause?.firstToken,
       tokens: .break, .open(.inconsistent, 0), .break(size: 0), .open(.consistent, 0)
     )
-    after(node.genericWhereClause?.lastToken, tokens: .break, .close, .close)
+    if node.body != nil {
+      after(node.genericWhereClause?.lastToken, tokens: .break, .close, .close)
+    } else {
+      after(node.genericWhereClause?.lastToken, tokens: .close, .close)
+    }
 
     if let body = node.body {
       if node.genericWhereClause == nil {

Diff for: Sources/generate-pipeline/main.swift

@@ -22,7 +22,7 @@ let outputFile =  sourcesDir.appendingPathComponent("swift-format")
 let fm = FileManager.default
 
 // These rules will not be added to the pipeline
-let suppressRules = ["UseEarlyExits"]
+let suppressRules = ["UseEarlyExits", "UseWhereClausesInForLoops"]
 
 enum PassKind {
   case format, lint, file

Diff for: Sources/swift-format/PopulatePipeline.swift

@@ -234,12 +234,6 @@ func populate(_ pipeline: Pipeline) {
       VariableDeclSyntax.self
   )
 
-  pipeline.addFormatter(
-    UseWhereClausesInForLoops.self,
-    for:
-      ForInStmtSyntax.self
-  )
-
   /// MARK: Linting Passes
 
   pipeline.addLinter(

Diff for: Tests/SwiftFormatPrettyPrintTests/FunctionDeclTests.swift

@@ -301,6 +301,36 @@ public class FunctionDeclTests: PrettyPrintTestCase {
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 50)
   }
 
+  public func testBodilessFunctionDecl() {
+    let input =
+      """
+      func myFun()
+
+      func myFun(arg1: Int)
+
+      func myFun() -> Int
+
+      func myFun<T>(arg1: Int)
+
+      func myFun<T>(arg1: Int) where T: S
+      """
+
+    let expected =
+      """
+      func myFun()
+
+      func myFun(arg1: Int)
+
+      func myFun() -> Int
+
+      func myFun<T>(arg1: Int)
+
+      func myFun<T>(arg1: Int) where T: S
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 50)
+  }
 
   public func testFunctionFullWrap() {
     let input =

Diff for: Tests/SwiftFormatPrettyPrintTests/TupleDeclTests.swift

@@ -49,4 +49,21 @@ public class TupleDeclTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 37)
   }
+
+  public func testLabeledTuples() {
+    let input =
+      """
+      let a = (A: var1, B: var2)
+      var b: (A: Int, B: Double)
+      """
+
+    let expected =
+      """
+      let a = (A: var1, B: var2)
+      var b: (A: Int, B: Double)
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 30)
+  }
 }