Merge pull request #525 from fwcd/expressible-condition-elements

Make `OptionalBindingCondition` and `MatchingPatternCondition` expressible as `ConditionElement`

Author: fwcd

Sources/SwiftSyntaxBuilder/generated/ExpressibleAsProtocols.swift

@@ -1488,18 +1488,26 @@ public extension ExpressibleAsAvailabilityCondition {
     return createAvailabilityCondition()
   }
 }
-public protocol ExpressibleAsMatchingPatternCondition: ExpressibleAsSyntaxBuildable {
+public protocol ExpressibleAsMatchingPatternCondition: ExpressibleAsConditionElement {
   func createMatchingPatternCondition() -> MatchingPatternCondition
 }
 public extension ExpressibleAsMatchingPatternCondition {
+  /// Conformance to ExpressibleAsConditionElement
+func createConditionElement() -> ConditionElement {
+    return ConditionElement(condition: self)
+  }
   func createSyntaxBuildable() -> SyntaxBuildable {
     return createMatchingPatternCondition()
   }
 }
-public protocol ExpressibleAsOptionalBindingCondition: ExpressibleAsSyntaxBuildable {
+public protocol ExpressibleAsOptionalBindingCondition: ExpressibleAsConditionElement {
   func createOptionalBindingCondition() -> OptionalBindingCondition
 }
 public extension ExpressibleAsOptionalBindingCondition {
+  /// Conformance to ExpressibleAsConditionElement
+func createConditionElement() -> ConditionElement {
+    return ConditionElement(condition: self)
+  }
   func createSyntaxBuildable() -> SyntaxBuildable {
     return createOptionalBindingCondition()
   }

Sources/SwiftSyntaxBuilder/gyb_helpers/ExpressibleAsConformances.py

@@ -22,9 +22,15 @@
     'ExprList': [
         'ConditionElement'
     ],
+    'MatchingPatternCondition': [
+        'ConditionElement'
+    ],
     'MemberDeclList': [
         'MemberDeclBlock'
     ],
+    'OptionalBindingCondition': [
+        'ConditionElement'
+    ],
     'SequenceExpr': [
         'CodeBlockItem',
         'TupleExprElement'

Sources/SwiftSyntaxBuilderGeneration/gyb_generated/ExpressibleAsConformances.swift

@@ -36,9 +36,15 @@ let SYNTAX_BUILDABLE_EXPRESSIBLE_AS_CONFORMANCES: [String: [String]] = [
   "ExprList": [
     "ConditionElement",
   ],
+  "MatchingPatternCondition": [
+    "ConditionElement",
+  ],
   "MemberDeclList": [
     "MemberDeclBlock",
   ],
+  "OptionalBindingCondition": [
+    "ConditionElement",
+  ],
   "SequenceExpr": [
     "CodeBlockItem",
     "TupleExprElement",

Tests/SwiftSyntaxBuilderTest/IfStmtTests.swift

@@ -36,4 +36,33 @@ final class IfStmtTests: XCTestCase {
       }
       """)
   }
+
+  func testIfLetStmt() {
+    let buildable = IfStmt(
+      conditions: OptionalBindingCondition(
+        letOrVarKeyword: .let,
+        pattern: "x",
+        initializer: InitializerClause(value: "y")
+      )
+    ) {}
+    let syntax = buildable.buildSyntax(format: Format())
+    XCTAssertEqual(syntax.description, """
+      if let x = y {
+      }
+      """)
+  }
+
+  func testIfCaseStmt() {
+    let buildable = IfStmt(
+      conditions: MatchingPatternCondition(
+        pattern: ExpressionPattern(expression: MemberAccessExpr(name: "x")),
+        initializer: InitializerClause(value: "y")
+      )
+    ) {}
+    let syntax = buildable.buildSyntax(format: Format())
+    XCTAssertEqual(syntax.description, """
+      if case .x = y {
+      }
+      """)
+  }
 }