Simplify .some(…) generation

Author: beccadax

Sources/SwiftSyntaxBuilder/ConvenienceInitializers.swift

@@ -141,6 +141,7 @@ extension FloatLiteralExprSyntax: ExpressibleByFloatLiteral {
 // MARK: - FunctionCallExpr
 
 extension FunctionCallExpr {
+  // Need an overload that's explicitly `ExprSyntax` for code literals to work.
   /// A convenience initializer that allows passing in arguments using a result builder
   /// 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.
@@ -161,6 +162,23 @@ extension FunctionCallExpr {
       additionalTrailingClosures: additionalTrailingClosures
     )
   }
+
+  /// A convenience initializer that allows passing in arguments using a result builder
+  /// 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(
+    callee: ExprSyntaxProtocol,
+    trailingClosure: ClosureExprSyntax? = nil,
+    additionalTrailingClosures: MultipleTrailingClosureElementList? = nil,
+    @TupleExprElementListBuilder argumentList: () -> TupleExprElementList = { [] }
+  ) {
+    self.init(
+      callee: ExprSyntax(fromProtocol: callee),
+      trailingClosure: trailingClosure,
+      additionalTrailingClosures: additionalTrailingClosures,
+      argumentList: argumentList
+    )
+  }
 }
 
 // MARK: - FunctionParameter

Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift

@@ -420,15 +420,9 @@ extension Optional: ExpressibleByLiteralSyntax where Wrapped: ExpressibleByLiter
       // e.g. `.some(nil)`, add a layer of `.some(_:)` around it to preserve the
       // depth of the data structure.
       if containsNil(wrappedExpr) {
-        // TODO: Can't we have something nicer than this? `MemberAccessExpr(name: "some").makeCall(wrapped)`?
-        return FunctionCallExpr(
-          calledExpression: MemberAccessExpr(name: "some"),
-          leftParen: .leftParen,
-          argumentList: TupleExprElementList {
-            TupleExprElement(expression: wrappedExpr)
-          },
-          rightParen: .rightParen
-        )
+        return FunctionCallExpr(callee: MemberAccessExpr(name: "some")) {
+          TupleExprElement(expression: wrappedExpr)
+        }
       }
 
       return wrappedExpr