Merge pull request swiftlang#64 from allevato/inout-function-type

allevato · web-flow · commit a2f7e1487fc0 · 2019-10-03T15:29:04.000-07:00
Break after `inout` in a function type.
diff --git a/Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift b/Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift
@@ -991,6 +991,7 @@ private final class TokenStreamCreator: SyntaxVisitor {
   func visit(_ node: TupleTypeElementSyntax) -> SyntaxVisitorContinueKind {
     before(node.firstToken, tokens: .open)
     after(node.colon, tokens: .break)
+    after(node.inOut, tokens: .break)
     before(node.secondName, tokens: .break)
 
     if let trailingComma = node.trailingComma {
diff --git a/Tests/SwiftFormatPrettyPrintTests/FunctionTypeTests.swift b/Tests/SwiftFormatPrettyPrintTests/FunctionTypeTests.swift
@@ -120,4 +120,34 @@ public class FunctionTypeTests: PrettyPrintTestCase {
     
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 67)
   }
+
+  func testFunctionTypeInOut() {
+    let input =
+      """
+      func f(g: (firstArg: inout FirstArg, secondArg: inout SecondArg) -> Result) {
+        let a = 123
+        let b = "abc"
+      }
+      """
+
+    let expected =
+      """
+      func f(
+        g: (
+          firstArg:
+            inout
+            FirstArg,
+          secondArg:
+            inout
+            SecondArg
+        ) -> Result
+      ) {
+        let a = 123
+        let b = "abc"
+      }
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 17)
+  }
 }
diff --git a/Tests/SwiftFormatPrettyPrintTests/XCTestManifests.swift b/Tests/SwiftFormatPrettyPrintTests/XCTestManifests.swift
@@ -253,6 +253,7 @@ extension FunctionTypeTests {
     // to regenerate.
     static let __allTests__FunctionTypeTests = [
         ("testFunctionType", testFunctionType),
+        ("testFunctionTypeInOut", testFunctionTypeInOut),
         ("testFunctionTypeThrows", testFunctionTypeThrows),
     ]
 }

Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,7 @@ extension FunctionTypeTests {`
`253`	`253`	`// to regenerate.`
`254`	`254`	`static let __allTests__FunctionTypeTests = [`
`255`	`255`	`("testFunctionType", testFunctionType),`
	`256`	`+ ("testFunctionTypeInOut", testFunctionTypeInOut),`
`256`	`257`	`("testFunctionTypeThrows", testFunctionTypeThrows),`
`257`	`258`	`]`
`258`	`259`	`}`