Merge pull request #1162 from kimdv/kimdv/use-protocol-for-TupleExprElement-expression-param

Author: kimdv

Sources/SwiftSyntaxBuilder/ConvenienceInitializers.swift

@@ -376,7 +376,7 @@ extension TernaryExpr {
 extension TupleExprElement {
   /// A convenience initializer that allows passing in label as an optional string.
   /// The presence of the colon will be inferred based on the presence of the label.
-  public init(label: String? = nil, expression: ExprSyntax) {
+  public init<E: ExprSyntaxProtocol>(label: String? = nil, expression: E) {
     self.init(
       label: label.map { .identifier($0) },
       colon: label == nil ? nil : .colonToken(),

Tests/SwiftSyntaxBuilderTest/CustomAttributeTests.swift

@@ -21,8 +21,8 @@ final class CustomAttributeTests: XCTestCase {
       #line: (CustomAttribute("WithParens") {}, "@WithParens()"),
       #line: (
         CustomAttribute("WithArgs") {
-          TupleExprElement(expression: "value1")
-          TupleExprElement(label: "labelled", expression: "value2")
+          TupleExprElement(expression: Expr("value1"))
+          TupleExprElement(label: "labelled", expression: Expr("value2"))
         }, "@WithArgs(value1, labelled: value2)"
       ),
     ]

Tests/SwiftSyntaxBuilderTest/DoStmtTests.swift

@@ -43,7 +43,7 @@ final class DoStmtTests: XCTestCase {
         },
         CatchClause {
           FunctionCallExpr(callee: ExprSyntax("print")) {
-            TupleExprElement(expression: "error")
+            TupleExprElement(expression: Expr("error"))
           }
         },
       ]

Tests/SwiftSyntaxBuilderTest/FunctionTests.swift

@@ -40,7 +40,7 @@ final class FunctionTests: XCTestCase {
   func testArguments() {
     let buildable = FunctionCallExpr(callee: ExprSyntax("test")) {
       for param in (1...5) {
-        TupleExprElement(label: param.isMultiple(of: 2) ? "p\(param)" : nil, expression: "value\(raw: param)")
+        TupleExprElement(label: param.isMultiple(of: 2) ? "p\(param)" : nil, expression: Expr("value\(raw: param)"))
       }
     }
     AssertBuildResult(buildable, "test(value1, p2: value2, value3, p4: value4, value5)")
@@ -130,15 +130,15 @@ final class FunctionTests: XCTestCase {
 
   func testParensEmittedForArgumentAndTrailingClosure() {
     let buildable = FunctionCallExpr(callee: ExprSyntax("test"), trailingClosure: ClosureExpr()) {
-      TupleExprElement(expression: "42")
+      TupleExprElement(expression: Expr("42"))
     }
     AssertBuildResult(buildable, "test(42) {\n}")
   }
 
   func testParensOmittedForNoArgumentsAndTrailingClosure() {
     let closure = ClosureExpr(statementsBuilder: {
       FunctionCallExpr(callee: ExprSyntax("f")) {
-        TupleExprElement(expression: "a")
+        TupleExprElement(expression: Expr("a"))
       }
     })
     let buildable = FunctionCallExpr(callee: ExprSyntax("test"), trailingClosure: closure)

Tests/SwiftSyntaxBuilderTest/VariableTests.swift

@@ -176,8 +176,8 @@ final class VariableTests: XCTestCase {
         VariableDecl(
           attributes: AttributeList {
             CustomAttribute("WithArgs") {
-              TupleExprElement(expression: "value1")
-              TupleExprElement(label: "label", expression: "value2")
+              TupleExprElement(expression: Expr("value1"))
+              TupleExprElement(label: "label", expression: Expr("value2"))
             }
           },
           name: "z",
@@ -195,7 +195,7 @@ final class VariableTests: XCTestCase {
         VariableDecl(
           attributes: AttributeList {
             CustomAttribute("WithArgs") {
-              TupleExprElement(expression: "value")
+              TupleExprElement(expression: Expr("value"))
             }
           },
           modifiers: [DeclModifier(name: .public)],