Accept a String for the expression in FunctionCallExpr(calledExpression:) convenience initializer

Author: ahoppen

Sources/SwiftSyntaxBuilder/ConvenienceInitializers.swift

@@ -96,15 +96,15 @@ extension FunctionCallExpr {
   /// instead of having to wrap them in a `TupleExprElementList`.
   /// The presence of the parenthesis will be inferred based on the presence of arguments and the trailing closure.
   public init(
-    calledExpression: ExprSyntaxProtocol,
+    callee: String,
     trailingClosure: ClosureExprSyntax? = nil,
     additionalTrailingClosures: MultipleTrailingClosureElementList? = nil,
     @TupleExprElementListBuilder argumentList: () -> TupleExprElementList = { [] }
   ) {
     let argumentList = argumentList()
     let shouldOmitParens = argumentList.isEmpty && trailingClosure != nil
     self.init(
-      calledExpression: calledExpression,
+      calledExpression: Expr(callee),
       leftParen: shouldOmitParens ? nil : .leftParen,
       argumentList: argumentList,
       rightParen: shouldOmitParens ? nil : .rightParen,
@@ -295,7 +295,7 @@ extension VariableDecl {
       PatternBinding(
         pattern: name,
         typeAnnotation: type,
-        accessor: .codeBlock(CodeBlock(statements: accessor()))
+        accessor: .getter(CodeBlock(statements: accessor()))
       )
     }
   }

Tests/SwiftSyntaxBuilderTest/CollectionNodeFlatteningTests.swift

@@ -21,18 +21,18 @@ final class CollectionNodeFlatteningTests: XCTestCase {
 
     @CodeBlockItemListBuilder
     func buildInnerCodeBlockItemList() -> CodeBlockItemList {
-      FunctionCallExpr(calledExpression: Expr("innerBuilder"))
+      FunctionCallExpr(callee: "innerBuilder")
     }
 
     @CodeBlockItemListBuilder
     func buildOuterCodeBlockItemList() -> CodeBlockItemList {
-      FunctionCallExpr(calledExpression: Expr("outerBuilder"))
+      FunctionCallExpr(callee: "outerBuilder")
 
       buildInnerCodeBlockItemList()
     }
 
     let codeBlock = CodeBlock(leadingTrivia: leadingTrivia) {
-      FunctionCallExpr(calledExpression: Expr("outsideBuilder"))
+      FunctionCallExpr(callee: "outsideBuilder")
       buildOuterCodeBlockItemList()
     }
 

Tests/SwiftSyntaxBuilderTest/DoStmtTests.swift

@@ -18,14 +18,14 @@ final class DoStmtTests: XCTestCase {
   func testDoStmt() {
     let buildable = DoStmt(
       body: CodeBlock(statementsBuilder: {
-        TryExpr(expression: FunctionCallExpr(calledExpression: MemberAccessExpr(base: "a", name: "b")))
+        TryExpr(expression: FunctionCallExpr(callee: "a.b"))
       }),
       catchClauses: [
         CatchClause(CatchItemList {
           CatchItem(pattern: Pattern("Error1"))
           CatchItem(pattern: Pattern("Error2"))
         }) {
-          FunctionCallExpr(calledExpression: Expr("print")) {
+          FunctionCallExpr(callee: "print") {
             TupleExprElement(expression: StringLiteralExpr(content: "Known error"))
           }
         },
@@ -36,7 +36,7 @@ final class DoStmtTests: XCTestCase {
           ThrowStmt(expression: MemberAccessExpr(base: "Error4", name: "error3"))
         },
         CatchClause {
-          FunctionCallExpr(calledExpression: Expr("print")) {
+          FunctionCallExpr(callee: "print") {
             TupleExprElement(expression: "error")
           }
         }

Tests/SwiftSyntaxBuilderTest/ExtensionDeclTests.swift

@@ -19,7 +19,7 @@ final class ExtensionDeclTests: XCTestCase {
     let keywords = ["associatedtype", "class"].map { keyword -> VariableDecl in
       // We need to use `CodeBlock` here to ensure there is braces around.
       let body = CodeBlock {
-        FunctionCallExpr(calledExpression: MemberAccessExpr("TokenSyntax.\(keyword)Keyword"))
+        FunctionCallExpr(callee: "TokenSyntax.\(keyword)Keyword")
       }
 
       return VariableDecl(

Tests/SwiftSyntaxBuilderTest/FunctionTests.swift

@@ -35,7 +35,7 @@ final class FunctionTests: XCTestCase {
   }
 
   func testArguments() {
-    let buildable = FunctionCallExpr(calledExpression: Expr("test")) {
+    let buildable = FunctionCallExpr(callee: "test") {
       for param in (1...5) {
         TupleExprElement(label: param.isMultiple(of: 2) ? "p\(param)" : nil, expression: "value\(param)")
       }
@@ -44,24 +44,24 @@ final class FunctionTests: XCTestCase {
   }
 
   func testParensEmittedForNoArgumentsAndNoTrailingClosure() {
-    let buildable = FunctionCallExpr(calledExpression: Expr("test"))
+    let buildable = FunctionCallExpr(callee: "test")
     AssertBuildResult(buildable, "test()")
   }
 
   func testParensEmittedForArgumentAndTrailingClosure() {
-    let buildable = FunctionCallExpr(calledExpression: Expr("test"), trailingClosure: ClosureExpr()) {
+    let buildable = FunctionCallExpr(callee: "test", trailingClosure: ClosureExpr()) {
       TupleExprElement(expression: "42")
     }
     AssertBuildResult(buildable, "test(42) {\n}")
   }
 
   func testParensOmittedForNoArgumentsAndTrailingClosure() {
     let closure = ClosureExpr(statementsBuilder: {
-      FunctionCallExpr(calledExpression: Expr("f")) {
+      FunctionCallExpr(callee: "f") {
         TupleExprElement(expression: "a")
       }
     })
-    let buildable = FunctionCallExpr(calledExpression: Expr("test"), trailingClosure: closure)
+    let buildable = FunctionCallExpr(callee: "test", trailingClosure: closure)
 
     AssertBuildResult(
       buildable,

Tests/SwiftSyntaxBuilderTest/IfStmtTests.swift

@@ -30,11 +30,11 @@ final class IfStmtTests: XCTestCase {
     // Use the convenience initializer from IfStmtConvenienceInitializers
     // with an else branch expressed by a second trailing closure.
     let buildable = IfStmt(conditions: ConditionElementList { BooleanLiteralExpr(true) }) {
-      FunctionCallExpr(calledExpression: Expr("print")) {
+      FunctionCallExpr(callee: "print") {
         TupleExprElement(expression: StringLiteralExpr(content: "Hello from the if-branch!"))
       }
     } elseBody: {
-      FunctionCallExpr(calledExpression: Expr("print")) {
+      FunctionCallExpr(callee: "print") {
         TupleExprElement(expression: StringLiteralExpr(content: "Hello from the else-branch!"))
       }
     }