Merge pull request #526 from fwcd/expr-buildable-initializer-clause

Make `ExprBuildable` expressible as `InitializerClause`

Author: fwcd

Sources/SwiftSyntaxBuilder/VariableDeclConvenienceInitializers.swift

@@ -17,13 +17,13 @@ extension VariableDecl {
     _ letOrVarKeyword: TokenSyntax,
     name: ExpressibleAsIdentifierPattern,
     type: ExpressibleAsTypeAnnotation? = nil,
-    initializer: ExpressibleAsExprBuildable? = nil
+    initializer: ExpressibleAsInitializerClause? = nil
   ) {
     self.init(letOrVarKeyword: letOrVarKeyword) {
       PatternBinding(
         pattern: name,
         typeAnnotation: type,
-        initializer: initializer.map { InitializerClause(value: $0) }
+        initializer: initializer
       )
     }
   }

Sources/SwiftSyntaxBuilder/generated/ExpressibleAsProtocols.swift

@@ -27,7 +27,7 @@ func createMemberDeclListItem() -> MemberDeclListItem {
     return MemberDeclListItem(decl: self)
   }
 }
-public protocol ExpressibleAsExprBuildable: ExpressibleAsExprList, ExpressibleAsCodeBlockItem {
+public protocol ExpressibleAsExprBuildable: ExpressibleAsExprList, ExpressibleAsCodeBlockItem, ExpressibleAsInitializerClause {
   func createExprBuildable() -> ExprBuildable
 }
 public extension ExpressibleAsExprBuildable {
@@ -39,6 +39,10 @@ func createExprList() -> ExprList {
 func createCodeBlockItem() -> CodeBlockItem {
     return CodeBlockItem(item: self)
   }
+  /// Conformance to ExpressibleAsInitializerClause
+func createInitializerClause() -> InitializerClause {
+    return InitializerClause(value: self)
+  }
 }
 public protocol ExpressibleAsPatternBuildable {
   func createPatternBuildable() -> PatternBuildable

Sources/SwiftSyntaxBuilder/gyb_helpers/ExpressibleAsConformances.py

@@ -15,12 +15,13 @@
     'DictionaryType': [
         'TypeAnnotation'
     ],
+    'ExprBuildable': [
+        'CodeBlockItem',
+        'InitializerClause'
+    ],
     'ExprList': [
         'ConditionElement'
     ],
-    'ExprBuildable': [
-        'CodeBlockItem'
-    ],
     'MemberDeclList': [
         'MemberDeclBlock'
     ],

Sources/SwiftSyntaxBuilderGeneration/gyb_generated/ExpressibleAsConformances.swift

@@ -29,11 +29,12 @@ let SYNTAX_BUILDABLE_EXPRESSIBLE_AS_CONFORMANCES: [String: [String]] = [
   "DictionaryType": [
     "TypeAnnotation",
   ],
-  "ExprList": [
-    "ConditionElement",
-  ],
   "ExprBuildable": [
     "CodeBlockItem",
+    "InitializerClause",
+  ],
+  "ExprList": [
+    "ConditionElement",
   ],
   "MemberDeclList": [
     "MemberDeclBlock",

Tests/SwiftSyntaxBuilderTest/EnumCaseElementTests.swift

@@ -16,10 +16,10 @@ final class EnumCaseElementTests: XCTestCase {
       EnumCaseDecl {
         EnumCaseElement(
           identifier: "goodMorning",
-          rawValue: InitializerClause(value: StringLiteralExpr("Good Morning")))
+          rawValue: StringLiteralExpr("Good Morning"))
         EnumCaseElement(
           identifier: "helloWorld",
-          rawValue: InitializerClause(value: StringLiteralExpr("Hello World")))
+          rawValue: StringLiteralExpr("Hello World"))
         EnumCaseElement(identifier: "hi")
       }
     }

Tests/SwiftSyntaxBuilderTest/VariableTests.swift

@@ -21,7 +21,7 @@ final class VariableTests: XCTestCase {
       PatternBinding(
         pattern: "d",
         typeAnnotation: DictionaryType(keyType: "String", valueType: "Int"),
-        initializer: InitializerClause(value: DictionaryExpr()))
+        initializer: DictionaryExpr())
     }
 
     let syntax = buildable.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
@@ -30,31 +30,30 @@ final class VariableTests: XCTestCase {
 
   func testVariableDeclWithExplicitTrailingCommas() {
     let buildable = VariableDecl(letOrVarKeyword: .let, bindings: [
-      PatternBinding(pattern: "a", initializer: InitializerClause(
-        value: ArrayExpr(leftSquare: .`leftSquareBracket`.withTrailingTrivia(.newline)) {
-          for i in 1...3 {
-            ArrayElement(
-              expression: IntegerLiteralExpr(i),
-              trailingComma: .comma.withoutTrailingTrivia().withTrailingTrivia(.newline))
-          }
-        }))
+      PatternBinding(pattern: "a", initializer: ArrayExpr(leftSquare: .`leftSquareBracket`.withTrailingTrivia(.newline)) {
+        for i in 1...3 {
+          ArrayElement(
+            expression: IntegerLiteralExpr(i),
+            trailingComma: .comma.withoutTrailingTrivia().withTrailingTrivia(.newline))
+        }
+      })
     ])
     let syntax = buildable.buildSyntax(format: Format())
     XCTAssertEqual(syntax.description, "let a = [\n1,\n2,\n3,\n]")
   }
 
   func testMultiPatternVariableDecl() {
     let buildable = VariableDecl(letOrVarKeyword: .let) {
-      PatternBinding(pattern: "a", initializer: InitializerClause(value: ArrayExpr {
+      PatternBinding(pattern: "a", initializer: ArrayExpr {
         for i in 1...3 {
           ArrayElement(expression: IntegerLiteralExpr(i))
         }
-      }))
-      PatternBinding(pattern: "d", initializer: InitializerClause(value: DictionaryExpr {
+      })
+      PatternBinding(pattern: "d", initializer: DictionaryExpr {
         for i in 1...3 {
           DictionaryElement(keyExpression: StringLiteralExpr("key\(i)"), valueExpression: IntegerLiteralExpr(i))
         }
-      }))
+      })
       PatternBinding(pattern: "i", typeAnnotation: "Int")
       PatternBinding(pattern: "s", typeAnnotation: "String")
     }