Add ExpressibleAsExprBuildable: ExpressibleAsCodeBlockItem

This generalizes the current conformance of ExpressibleAsFunctionCallExpr
to ExpressibleAsCodeBlockItem to arbitrary expressions.

Author: fwcd

Sources/SwiftSyntaxBuilder/generated/ExpressibleAsProtocols.swift

@@ -27,14 +27,18 @@ func createMemberDeclListItem() -> MemberDeclListItem {
     return MemberDeclListItem(decl: self)
   }
 }
-public protocol ExpressibleAsExprBuildable: ExpressibleAsExprList {
+public protocol ExpressibleAsExprBuildable: ExpressibleAsExprList, ExpressibleAsCodeBlockItem {
   func createExprBuildable() -> ExprBuildable
 }
 public extension ExpressibleAsExprBuildable {
   /// Conformance to `ExpressibleAsExprList`
 func createExprList() -> ExprList {
     return ExprList([self])
   }
+  /// Conformance to ExpressibleAsCodeBlockItem
+func createCodeBlockItem() -> CodeBlockItem {
+    return CodeBlockItem(item: self)
+  }
 }
 public protocol ExpressibleAsPatternBuildable {
   func createPatternBuildable() -> PatternBuildable
@@ -222,7 +226,7 @@ public extension ExpressibleAsAssignmentExpr {
     return createAssignmentExpr()
   }
 }
-public protocol ExpressibleAsSequenceExpr: ExpressibleAsCodeBlockItem, ExpressibleAsTupleExprElement, ExpressibleAsExprBuildable {
+public protocol ExpressibleAsSequenceExpr: ExpressibleAsTupleExprElement, ExpressibleAsExprBuildable {
   func createSequenceExpr() -> SequenceExpr
 }
 public extension ExpressibleAsSequenceExpr {
@@ -528,14 +532,10 @@ func createMultipleTrailingClosureElementList() -> MultipleTrailingClosureElemen
 public protocol ExpressibleAsMultipleTrailingClosureElementList {
   func createMultipleTrailingClosureElementList() -> MultipleTrailingClosureElementList
 }
-public protocol ExpressibleAsFunctionCallExpr: ExpressibleAsCodeBlockItem, ExpressibleAsExprBuildable {
+public protocol ExpressibleAsFunctionCallExpr: ExpressibleAsExprBuildable {
   func createFunctionCallExpr() -> FunctionCallExpr
 }
 public extension ExpressibleAsFunctionCallExpr {
-  /// Conformance to ExpressibleAsCodeBlockItem
-func createCodeBlockItem() -> CodeBlockItem {
-    return CodeBlockItem(item: self)
-  }
   func createExprBuildable() -> ExprBuildable {
     return createFunctionCallExpr()
   }

Sources/SwiftSyntaxBuilder/gyb_helpers/ExpressibleAsConformances.py

@@ -18,7 +18,7 @@
     'ExprList': [
         'ConditionElement'
     ],
-    'FunctionCallExpr': [
+    'ExprBuildable': [
         'CodeBlockItem'
     ],
     'MemberDeclList': [

Sources/SwiftSyntaxBuilderGeneration/gyb_generated/ExpressibleAsConformances.swift

@@ -32,7 +32,7 @@ let SYNTAX_BUILDABLE_EXPRESSIBLE_AS_CONFORMANCES: [String: [String]] = [
   "ExprList": [
     "ConditionElement",
   ],
-  "FunctionCallExpr": [
+  "ExprBuildable": [
     "CodeBlockItem",
   ],
   "MemberDeclList": [

Tests/SwiftSyntaxBuilderTest/ExpressibleBuildablesTests.swift

@@ -26,7 +26,7 @@ final class ExpressibleBuildablesTests: XCTestCase {
     """)
   }
 
-  func testExpressibleAsCodeBlockItem() {
+  func testDeclExpressibleAsCodeBlockItem() {
     let myCodeBlock = SourceFile(eofToken: .eof) {
       StructDecl(identifier: "MyStruct1") {}
 
@@ -43,6 +43,23 @@ final class ExpressibleBuildablesTests: XCTestCase {
     """)
   }
 
+  func testExprExpressibleAsCodeBlockItem() {
+    let myCodeBlock = CodeBlock(leftBrace: .leftBrace.withLeadingTrivia([])) {
+      FunctionCallExpr("print") { TupleExprElement(expression: StringLiteralExpr("Hello world")) }
+      IntegerLiteralExpr(42)
+      "someIdentifier"
+    }
+    
+    let syntax = myCodeBlock.buildSyntax(format: Format())
+    XCTAssertEqual(syntax.description, """
+    {
+        print("Hello world")
+        42
+        someIdentifier
+    }
+    """)
+  }
+
   func testExpressibleAsSwitchStmt() {
     let versions = [("version_1", "1.0.0"), ("version_2", "2.0.0"), ("version_3", "3.0.0"), ("version_3_1", "3.1.0")]
     let expression = IdentifierExpr("version")