Merge pull request #1300 from kimdv/kimdv/remove-convenience-initializers

Author: kimdv

Sources/SwiftSyntaxBuilder/ConvenienceInitializers.swift

@@ -13,6 +13,26 @@
 @_spi(RawSyntax) import SwiftParser
 @_spi(RawSyntax) import SwiftSyntax
 
+// MARK: - CustomAttribute
+
+extension AttributeSyntax {
+  /// A convenience initializer that allows passing in arguments using a result builder
+  /// and automatically adds parentheses as needed, similar to the convenience
+  /// initializer for ``FunctionCallExpr``.
+  public init(
+    _ attributeName: TypeSyntax,
+    @TupleExprElementListBuilder argumentList: () -> TupleExprElementListSyntax? = { nil }
+  ) {
+    let argumentList = argumentList()
+    self.init(
+      attributeName: attributeName,
+      leftParen: argumentList != nil ? .leftParenToken() : nil,
+      argument: argumentList.map(AttributeSyntax.Argument.argumentList),
+      rightParen: argumentList != nil ? .rightParenToken() : nil
+    )
+  }
+}
+
 // MARK: - BinaryOperatorExpr
 
 extension BinaryOperatorExprSyntax {
@@ -51,26 +71,6 @@ extension CatchClauseSyntax {
   }
 }
 
-// MARK: - CustomAttribute
-
-extension AttributeSyntax {
-  /// A convenience initializer that allows passing in arguments using a result builder
-  /// and automatically adds parentheses as needed, similar to the convenience
-  /// initializer for ``FunctionCallExpr``.
-  public init(
-    _ attributeName: TypeSyntax,
-    @TupleExprElementListBuilder argumentList: () -> TupleExprElementListSyntax? = { nil }
-  ) {
-    let argumentList = argumentList()
-    self.init(
-      attributeName: attributeName,
-      leftParen: argumentList != nil ? .leftParenToken() : nil,
-      argument: argumentList.map(AttributeSyntax.Argument.argumentList),
-      rightParen: argumentList != nil ? .rightParenToken() : nil
-    )
-  }
-}
-
 // MARK: - DictionaryExpr
 
 extension DictionaryExprSyntax {
@@ -173,11 +173,11 @@ extension FunctionCallExprSyntax {
 // strings, only literals.
 extension FunctionParameterSyntax {
   public init(
-    _ source: String,
+    _ source: PartialSyntaxNodeString,
     for subject: Parser.ParameterSubject
   ) {
     self = performParse(
-      source: Array(source.utf8),
+      source: source.sourceText,
       parse: {
         let raw = RawSyntax($0.parseFunctionParameter(for: subject))
         return Syntax(raw: raw).cast(FunctionParameterSyntax.self)
@@ -186,29 +186,6 @@ extension FunctionParameterSyntax {
   }
 }
 
-// MARK: - IfStmt
-
-extension IfStmtSyntax {
-  /// A convenience initializer that uses builder closures to express an
-  /// if body, potentially with a second trailing builder closure for an else
-  /// body.
-  public init(
-    leadingTrivia: Trivia = [],
-    conditions: ConditionElementListSyntax,
-    @CodeBlockItemListBuilder body: () -> CodeBlockItemListSyntax,
-    @CodeBlockItemListBuilder elseBody: () -> CodeBlockItemListSyntax? = { nil }
-  ) {
-    let generatedElseBody = elseBody()
-    self.init(
-      leadingTrivia: leadingTrivia,
-      conditions: conditions,
-      body: CodeBlockSyntax(statements: body()),
-      elseKeyword: generatedElseBody == nil ? nil : .keyword(.else, leadingTrivia: .space),
-      elseBody: generatedElseBody.map { .codeBlock(CodeBlockSyntax(statements: $0)) }
-    )
-  }
-}
-
 // MARK: - IntegerLiteralExpr
 
 extension IntegerLiteralExprSyntax: ExpressibleByIntegerLiteral {
@@ -221,20 +198,6 @@ extension IntegerLiteralExprSyntax: ExpressibleByIntegerLiteral {
   }
 }
 
-// MARK: - MemberAccessExpr
-
-extension MemberAccessExprSyntax {
-  /// Creates a `MemberAccessExpr` using the provided parameters.
-  public init(
-    base: ExprSyntax? = nil,
-    dot: TokenSyntax = .periodToken(),
-    name: String,
-    declNameArguments: DeclNameArgumentsSyntax? = nil
-  ) {
-    self.init(base: base, dot: dot, name: .identifier(name), declNameArguments: declNameArguments)
-  }
-}
-
 // MARK: - StringLiteralExpr
 
 extension String {
@@ -358,33 +321,6 @@ extension StringLiteralExprSyntax {
   }
 }
 
-// MARK: - SwitchCase
-
-extension SwitchCaseSyntax {
-  public init(_ label: SwitchCaseSyntax, @CodeBlockItemListBuilder statementsBuilder: () -> CodeBlockItemListSyntax) {
-    self = label
-    self.statements = statementsBuilder()
-  }
-}
-
-// MARK: - TernaryExpr
-
-extension TernaryExprSyntax {
-  public init<C: ExprSyntaxProtocol, F: ExprSyntaxProtocol, S: ExprSyntaxProtocol>(
-    if condition: C,
-    then firstChoice: F,
-    else secondChoice: S
-  ) {
-    self.init(
-      conditionExpression: condition,
-      questionMark: .infixQuestionMarkToken(leadingTrivia: .space, trailingTrivia: .space),
-      firstChoice: firstChoice,
-      colonMark: .colonToken(leadingTrivia: .space),
-      secondChoice: secondChoice
-    )
-  }
-}
-
 // MARK: - TupleExprElement
 
 extension TupleExprElementSyntax {
@@ -425,29 +361,6 @@ extension VariableDeclSyntax {
       )
     }
   }
-
-  /// Creates a computed property with the given accessor.
-  public init(
-    leadingTrivia: Trivia = [],
-    attributes: AttributeListSyntax? = nil,
-    modifiers: ModifierListSyntax? = nil,
-    name: PatternSyntax,
-    type: TypeAnnotationSyntax,
-    @CodeBlockItemListBuilder accessor: () -> CodeBlockItemListSyntax
-  ) {
-    self.init(
-      leadingTrivia: leadingTrivia,
-      attributes: attributes?.with(\.trailingTrivia, .space),
-      modifiers: modifiers,
-      letOrVarKeyword: .keyword(.var)
-    ) {
-      PatternBindingSyntax(
-        pattern: name,
-        typeAnnotation: type,
-        accessor: .getter(CodeBlockSyntax(statements: accessor()))
-      )
-    }
-  }
 }
 
 //==========================================================================//

Sources/SwiftSyntaxBuilder/SyntaxNodeWithBody.swift

@@ -144,6 +144,15 @@ public extension IfStmtSyntax {
   }
 }
 
+// MARK: - SwitchCase
+
+extension SwitchCaseSyntax {
+  public init(_ header: PartialSyntaxNodeString, @CodeBlockItemListBuilder statementsBuilder: () -> CodeBlockItemListSyntax) {
+    self = SwitchCaseSyntax("\(header)")
+    self.statements = statementsBuilder()
+  }
+}
+
 // MARK: - SwitchStmtSyntax
 // SwitchStmtSyntax is a special scenario as it don't have body or members
 // So we cannot conform to `HasTrailingCodeBlock` or `HasTrailingMemberDeclBlock`

Sources/_SwiftSyntaxTestSupport/SyntaxProtocol+Initializer.swift

@@ -74,7 +74,7 @@ private extension TriviaPiece {
       fatalError("Unknown associated value type")
     }
     return ExprSyntax(
-      FunctionCallExprSyntax(callee: MemberAccessExprSyntax(name: label!)) {
+      FunctionCallExprSyntax(callee: ExprSyntax(".\(raw: label!)")) {
         TupleExprElementSyntax(expression: arg)
       }
     )
@@ -137,7 +137,7 @@ extension SyntaxProtocol {
         tokenKindArgument = nil
       } else if case .keyword(let keyword) = tokenKind {
         tokenInitializerName = "keyword"
-        tokenKindArgument = ExprSyntax(MemberAccessExprSyntax(name: String(describing: keyword)))
+        tokenKindArgument = ExprSyntax(".\(raw: keyword)")
       } else if tokenKind.decomposeToRaw().rawKind.defaultText != nil {
         tokenInitializerName = "\(String(describing: tokenKind))Token"
         tokenKindArgument = nil
@@ -147,7 +147,7 @@ extension SyntaxProtocol {
         tokenKindArgument = ExprSyntax(StringLiteralExprSyntax(content: token.text))
       }
       return ExprSyntax(
-        FunctionCallExprSyntax(callee: MemberAccessExprSyntax(name: tokenInitializerName)) {
+        FunctionCallExprSyntax(callee: ExprSyntax(".\(raw: tokenInitializerName)")) {
           if let tokenKindArgument = tokenKindArgument {
             TupleExprElementSyntax(expression: tokenKindArgument)
           }

Tests/SwiftSyntaxBuilderTest/DoStmtTests.swift

@@ -35,11 +35,11 @@ final class DoStmtTests: XCTestCase {
           CatchItemListSyntax {
             CatchItemSyntax(
               pattern: PatternSyntax("Error3"),
-              whereClause: WhereClauseSyntax(guardResult: MemberAccessExprSyntax(base: "error", name: "isError4"))
+              whereClause: WhereClauseSyntax(guardResult: ExprSyntax("error.isError4"))
             )
           }
         ) {
-          ThrowStmtSyntax(expression: MemberAccessExprSyntax(base: "Error4", name: "error3"))
+          ThrowStmtSyntax(expression: ExprSyntax("Error4.error3"))
         },
         CatchClauseSyntax {
           FunctionCallExprSyntax(callee: ExprSyntax("print")) {
@@ -85,11 +85,11 @@ final class DoStmtTests: XCTestCase {
           CatchItemListSyntax {
             CatchItemSyntax(
               pattern: PatternSyntax("Error3"),
-              whereClause: WhereClauseSyntax(guardResult: MemberAccessExprSyntax(base: "error", name: "isError4"))
+              whereClause: WhereClauseSyntax(guardResult: ExprSyntax("error.isError4"))
             )
           }
         ) {
-          ThrowStmtSyntax(expression: MemberAccessExprSyntax(base: "Error4", name: "error3"))
+          ThrowStmtSyntax(expression: ExprSyntax("Error4.error3"))
         },
         CatchClauseSyntax {
           FunctionCallExprSyntax(callee: ExprSyntax("print")) {
@@ -135,11 +135,11 @@ final class DoStmtTests: XCTestCase {
           CatchItemListSyntax {
             CatchItemSyntax(
               pattern: PatternSyntax("Error3"),
-              whereClause: WhereClauseSyntax(guardResult: MemberAccessExprSyntax(base: "error", name: "isError4"))
+              whereClause: WhereClauseSyntax(guardResult: ExprSyntax("error.isError4"))
             )
           }
         ) {
-          ThrowStmtSyntax(expression: MemberAccessExprSyntax(base: "Error4", name: "error3"))
+          ThrowStmtSyntax(expression: ExprSyntax("Error4.error3"))
         },
         CatchClauseSyntax {
           FunctionCallExprSyntax(callee: ExprSyntax("print")) {

Tests/SwiftSyntaxBuilderTest/ExtensionDeclTests.swift

@@ -19,7 +19,7 @@ final class ExtensionDeclTests: XCTestCase {
     let keywords = ["associatedtype", "class"].map { keyword -> VariableDeclSyntax in
       // We need to use `CodeBlock` here to ensure there is braces around.
       let body = CodeBlockSyntax {
-        FunctionCallExprSyntax(callee: MemberAccessExprSyntax(base: "TokenSyntax", name: "\(keyword)Keyword"))
+        FunctionCallExprSyntax(callee: ExprSyntax("TokenSyntax.\(raw: keyword)Keyword"))
       }
 
       return VariableDeclSyntax(

Tests/SwiftSyntaxBuilderTest/IfStmtTests.swift

@@ -114,30 +114,6 @@ final class IfStmtTests: XCTestCase {
     }
   }
 
-  func testIfElseStmt() {
-    // Use the convenience initializer from IfStmtConvenienceInitializers
-    // with an else branch expressed by a second trailing closure.
-    let buildable = IfStmtSyntax(conditions: ConditionElementListSyntax { BooleanLiteralExprSyntax(true) }) {
-      FunctionCallExprSyntax(callee: ExprSyntax("print")) {
-        TupleExprElementSyntax(expression: StringLiteralExprSyntax(content: "Hello from the if-branch!"))
-      }
-    } elseBody: {
-      FunctionCallExprSyntax(callee: ExprSyntax("print")) {
-        TupleExprElementSyntax(expression: StringLiteralExprSyntax(content: "Hello from the else-branch!"))
-      }
-    }
-    AssertBuildResult(
-      buildable,
-      """
-      if true {
-          print("Hello from the if-branch!")
-      } else {
-          print("Hello from the else-branch!")
-      }
-      """
-    )
-  }
-
   func testIfLetStmt() {
     let buildable = IfStmtSyntax(
       conditions: ConditionElementListSyntax {

Tests/SwiftSyntaxBuilderTest/MemberAccessTests.swift

@@ -16,7 +16,7 @@ import SwiftSyntaxBuilder
 
 final class TernaryExprTests: XCTestCase {
   func testTernaryExpr() {
-    let buildable = TernaryExprSyntax(if: BooleanLiteralExprSyntax(true), then: ExprSyntax("a"), else: ExprSyntax("b"))
+    let buildable = ExprSyntax("true ? a : b")
     AssertBuildResult(
       buildable,
       """