Add open breaks around type annotations in optional condition exprs.

This matches the breaks and grouping used by pattern binding syntax nodes (i.e. let and var expressions) so that the formatting of a let in a guard/if stmt will have the same formatting as an identical let/var expression outside of a guard/if stmt.

This fixes an issue where there was no space between the ":" and the type annotation when the let in an optional condition included a type annotation.

Author: dylansturg

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -1802,6 +1802,12 @@ private final class TokenStreamCreator: SyntaxVisitor {
 
   func visit(_ node: OptionalBindingConditionSyntax) -> SyntaxVisitorContinueKind {
     after(node.letOrVarKeyword, tokens: .break)
+
+    if let typeAnnotation = node.typeAnnotation {
+      after(typeAnnotation.colon, tokens: .break(.open(kind: .continuation)))
+      after(typeAnnotation.lastToken, tokens: .break(.close(mustBreak: false), size: 0))
+    }
+
     return .visitChildren
   }
 

Tests/SwiftFormatPrettyPrintTests/GuardStmtTests.swift

@@ -163,4 +163,35 @@ public class GuardStmtTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 40)
   }
+
+  public func testOptionalBindingConditions() {
+    let input =
+      """
+      guard let someObject: Foo = object as? Int else {
+        return nil
+      }
+      guard let someObject: (foo: Foo, bar: SomeVeryLongTypeNameThatBreaks, baz: Baz) = foo(a, b, c, d) else { return nil }
+      """
+
+    let expected =
+      """
+      guard
+        let someObject: Foo = object as? Int
+      else {
+        return nil
+      }
+      guard
+        let someObject:
+          (
+            foo: Foo,
+            bar:
+              SomeVeryLongTypeNameThatBreaks,
+            baz: Baz
+          ) = foo(a, b, c, d)
+      else { return nil }
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 40)
+  }
 }

Tests/SwiftFormatPrettyPrintTests/IfStmtTests.swift

@@ -325,4 +325,33 @@ public class IfStmtTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 50)
   }
+
+  public func testOptionalBindingConditions() {
+    let input =
+      """
+      if let someObject: Foo = object as? Int {
+        return nil
+      }
+      if let someObject: (foo: Foo, bar: SomeVeryLongTypeNameThatDefinitelyBreaks, baz: Baz) = foo(a, b, c, d) { return nil }
+      """
+
+    let expected =
+      """
+      if let someObject: Foo = object as? Int
+      {
+        return nil
+      }
+      if let someObject:
+        (
+          foo: Foo,
+          bar:
+            SomeVeryLongTypeNameThatDefinitelyBreaks,
+          baz: Baz
+        ) = foo(a, b, c, d)
+      { return nil }
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 40)
+  }
 }

Tests/SwiftFormatPrettyPrintTests/PatternBindingTests.swift

@@ -0,0 +1,26 @@
+import SwiftFormatConfiguration
+
+public class PatternBindingTests: PrettyPrintTestCase {
+  public func testBindingIncludingTypeAnnotation() {
+    let input =
+      """
+      let someObject: Foo = object
+      let someObject: (foo: Foo, bar: SomeVeryLongTypeNameThatDefinitelyBreaks, baz: Baz) = foo(a, b, c, d)
+      """
+
+    let expected =
+      """
+      let someObject: Foo = object
+      let someObject:
+        (
+          foo: Foo,
+          bar:
+            SomeVeryLongTypeNameThatDefinitelyBreaks,
+          baz: Baz
+        ) = foo(a, b, c, d)
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 40)
+  }
+}

Tests/SwiftFormatPrettyPrintTests/XCTestManifests.swift

@@ -302,6 +302,7 @@ extension GuardStmtTests {
         ("testGuardStatement", testGuardStatement),
         ("testGuardWithFuncCall", testGuardWithFuncCall),
         ("testOpenBraceIsGluedToElseKeyword", testOpenBraceIsGluedToElseKeyword),
+        ("testOptionalBindingConditions", testOptionalBindingConditions),
     ]
 }
 
@@ -329,6 +330,7 @@ extension IfStmtTests {
         ("testIfLetStatements", testIfLetStatements),
         ("testIfStatement", testIfStatement),
         ("testMatchingPatternConditions", testMatchingPatternConditions),
+        ("testOptionalBindingConditions", testOptionalBindingConditions),
     ]
 }
 
@@ -417,6 +419,15 @@ extension OperatorDeclTests {
     ]
 }
 
+extension PatternBindingTests {
+    // DO NOT MODIFY: This is autogenerated, use:
+    //   `swift test --generate-linuxmain`
+    // to regenerate.
+    static let __allTests__PatternBindingTests = [
+        ("testBindingIncludingTypeAnnotation", testBindingIncludingTypeAnnotation),
+    ]
+}
+
 extension ProtocolDeclTests {
     // DO NOT MODIFY: This is autogenerated, use:
     //   `swift test --generate-linuxmain`
@@ -701,6 +712,7 @@ public func __allTests() -> [XCTestCaseEntry] {
         testCase(NewlineTests.__allTests__NewlineTests),
         testCase(ObjectLiteralExprTests.__allTests__ObjectLiteralExprTests),
         testCase(OperatorDeclTests.__allTests__OperatorDeclTests),
+        testCase(PatternBindingTests.__allTests__PatternBindingTests),
         testCase(ProtocolDeclTests.__allTests__ProtocolDeclTests),
         testCase(RepeatStmtTests.__allTests__RepeatStmtTests),
         testCase(RespectsExistingLineBreaksTests.__allTests__RespectsExistingLineBreaksTests),