Merge pull request #121 from dylansturg/types_need_spaces

Use breaks around type annotations of ForInStmts

Author: allevato

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -511,6 +511,11 @@ private final class TokenStreamCreator: SyntaxVisitor {
     before(node.inKeyword, tokens: .break)
     after(node.inKeyword, tokens: .space)
 
+    if let typeAnnotation = node.typeAnnotation {
+      after(typeAnnotation.colon, tokens: .break(.open(kind: .continuation)))
+      after(typeAnnotation.lastToken, tokens: .break(.close(mustBreak: false), size: 0))
+    }
+
     arrangeBracesAndContents(of: node.body, contentsKeyPath: \.statements)
 
     return .visitChildren

Tests/SwiftFormatPrettyPrintTests/ForInStmtTests.swift

@@ -262,4 +262,48 @@ public class ForInStmtTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 30)
   }
+
+  public func testExplicitTypeAnnotation() {
+    let input =
+      """
+      for i: ExplicitType in mycontainer {
+        let a = 123
+        let b = i
+      }
+
+      for i:ExplicitType in mycontainer {
+        let a = 123
+        let b = i
+      }
+
+      for i: [ExplicitKeyType: ExplicitValueType] in myverylongcontainername {
+        let a = 123
+        let b = i
+      }
+      """
+
+    let expected =
+      """
+      for i: ExplicitType in mycontainer {
+        let a = 123
+        let b = i
+      }
+
+      for i: ExplicitType in mycontainer {
+        let a = 123
+        let b = i
+      }
+
+      for i:
+        [ExplicitKeyType: ExplicitValueType]
+        in myverylongcontainername
+      {
+        let a = 123
+        let b = i
+      }
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 40)
+  }
 }

Tests/SwiftFormatPrettyPrintTests/XCTestManifests.swift

@@ -229,6 +229,7 @@ extension ForInStmtTests {
     // to regenerate.
     static let __allTests__ForInStmtTests = [
         ("testBasicForLoop", testBasicForLoop),
+        ("testExplicitTypeAnnotation", testExplicitTypeAnnotation),
         ("testForCase", testForCase),
         ("testForLabels", testForLabels),
         ("testForLoopFullWrap", testForLoopFullWrap),