Fix the problematic builders

Author: RoBo-Inc

Sources/SwiftSyntaxBuilder/ConvenienceInitializers.swift

@@ -13,7 +13,7 @@
 @_spi(RawSyntax) import SwiftParser
 @_spi(RawSyntax) import SwiftSyntax
 
-// MARK: - ArrayElementList
+// MARK: - ArrayElementListSyntax
 
 extension ArrayElementListSyntax {
   public init(expressions: [ExprSyntax]) {
@@ -30,15 +30,15 @@ extension ArrayElementListSyntax {
   }
 }
 
-// MARK: - ArrayExpr
+// MARK: - ArrayExprSyntax
 
 extension ArrayExprSyntax {
   public init(expressions: [ExprSyntax]) {
     self.init(elements: ArrayElementListSyntax(expressions: expressions))
   }
 }
 
-// MARK: - CustomAttribute
+// MARK: - AttributeSyntax
 
 extension AttributeSyntax {
   /// A convenience initializer that allows passing in arguments using a result builder
@@ -58,15 +58,15 @@ extension AttributeSyntax {
   }
 }
 
-// MARK: - BinaryOperatorExpr
+// MARK: - BinaryOperatorExprSyntax
 
 extension BinaryOperatorExprSyntax {
   public init(text: String) {
     self.init(operator: .binaryOperator(text))
   }
 }
 
-// MARK: - BooleanLiteralExpr
+// MARK: - BooleanLiteralExprSyntax
 
 extension BooleanLiteralExprSyntax: ExpressibleByBooleanLiteral {
   public init(_ value: Bool) {
@@ -78,7 +78,7 @@ extension BooleanLiteralExprSyntax: ExpressibleByBooleanLiteral {
   }
 }
 
-// MARK: - CatchClause
+// MARK: - CatchClauseSyntax
 
 extension CatchClauseSyntax {
   /// A convenience initializer that calculates spacing around the `catch` keyword.
@@ -96,7 +96,7 @@ extension CatchClauseSyntax {
   }
 }
 
-// MARK: - DictionaryExpr
+// MARK: - DictionaryExprSyntax
 
 extension DictionaryExprSyntax {
   /// A convenience initializer that allows passing in members using a result builder
@@ -115,7 +115,15 @@ extension DictionaryExprSyntax {
   }
 }
 
-// MARK: - Expr
+// MARK: - ExprListSyntax
+
+extension ExprListSyntax {
+  public init(_ elements: [ExprSyntaxProtocol]) {
+    self.init(elements.map { ExprSyntax(fromProtocol: $0) } as [ExprSyntax])
+  }
+}
+
+// MARK: - ExprSyntax
 
 extension ExprSyntax {
   /// Returns a syntax tree for an expression that represents the value of the
@@ -163,7 +171,7 @@ extension FloatLiteralExprSyntax: ExpressibleByFloatLiteral {
   }
 }
 
-// MARK: - FunctionCallExpr
+// MARK: - FunctionCallExprSyntax
 
 extension FunctionCallExprSyntax {
   /// A convenience initializer that allows passing in arguments using a result builder
@@ -188,7 +196,7 @@ extension FunctionCallExprSyntax {
   }
 }
 
-// MARK: - IntegerLiteralExpr
+// MARK: - IntegerLiteralExprSyntax
 
 extension IntegerLiteralExprSyntax: ExpressibleByIntegerLiteral {
   public init(_ value: Int) {
@@ -200,7 +208,21 @@ extension IntegerLiteralExprSyntax: ExpressibleByIntegerLiteral {
   }
 }
 
-// MARK: - StringLiteralExpr
+// MARK: - LabeledExprSyntax
+
+extension LabeledExprSyntax {
+  /// 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: some ExprSyntaxProtocol) {
+    self.init(
+      label: label.map { .identifier($0) },
+      colon: label == nil ? nil : .colonToken(trailingTrivia: .space),
+      expression: expression
+    )
+  }
+}
+
+// MARK: - StringLiteralExprSyntax
 
 extension String {
   /// Replace literal newlines with "\r", "\n", "\u{2028}", and ASCII control characters with "\0", "\u{7}"
@@ -338,21 +360,15 @@ extension StringLiteralExprSyntax {
   }
 }
 
-// MARK: - TupleExprElement
+// MARK: - UnexpectedNodesSyntax
 
-extension LabeledExprSyntax {
-  /// 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: some ExprSyntaxProtocol) {
-    self.init(
-      label: label.map { .identifier($0) },
-      colon: label == nil ? nil : .colonToken(trailingTrivia: .space),
-      expression: expression
-    )
+extension UnexpectedNodesSyntax {
+  public init(_ elements: [SyntaxProtocol]) {
+    self.init(elements.map { Syntax(fromProtocol: $0) } as [Syntax])
   }
 }
 
-// MARK: - VariableDecl
+// MARK: - VariableDeclSyntax
 
 extension VariableDeclSyntax {
   /// Creates an optionally initialized property.

Sources/SwiftSyntaxBuilder/ResultBuilderExtensions.swift

@@ -50,20 +50,14 @@ extension MemberBlockItemListBuilder {
   }
 }
 
-// MARK: Initializing collections from protocols
-// These initializers allow the creation of syntax collections that have a base
-// node as their element from the corresponding protocol type.
-// These are used by the result builders.
-// Since we only have two of these, it doesn’t make sense to generate them.
-
-extension ExprListSyntax {
-  init(_ elements: [ExprSyntaxProtocol]) {
-    self = ExprListSyntax(elements.map { ExprSyntax(fromProtocol: $0) } as [ExprSyntax])
+extension ExprListBuilder {
+  public static func buildExpression(_ expression: some ExprSyntaxProtocol) -> Component {
+    return buildExpression(ExprSyntax(fromProtocol: expression))
   }
 }
 
-extension UnexpectedNodesSyntax {
-  public init(_ elements: [SyntaxProtocol]) {
-    self = UnexpectedNodesSyntax(elements.map { Syntax(fromProtocol: $0) } as [Syntax])
+extension UnexpectedNodesBuilder {
+  public static func buildExpression(_ expression: some SyntaxProtocol) -> Component {
+    return buildExpression(Syntax(fromProtocol: expression))
   }
 }

Tests/SwiftParserTest/DeclarationTests.swift

@@ -1246,7 +1246,8 @@ final class DeclarationTests: ParserTestCase {
           ])
         ),
         UnexpectedNodesSyntax([
-          TokenSyntax.identifier("bogus"), TokenSyntax.keyword(.rethrows),
+          TokenSyntax.identifier("bogus"),
+          TokenSyntax.keyword(.rethrows),
           TokenSyntax.identifier("set"),
         ])
       ),
@@ -1352,7 +1353,10 @@ final class DeclarationTests: ParserTestCase {
       substructure: FunctionParameterSyntax(
         firstName: .identifier("first"),
         secondName: .identifier("second"),
-        UnexpectedNodesSyntax([TokenSyntax.identifier("third"), TokenSyntax.identifier("fourth")]),
+        UnexpectedNodesSyntax([
+          TokenSyntax.identifier("third"),
+          TokenSyntax.identifier("fourth"),
+        ]),
         colon: .colonToken(),
         type: IdentifierTypeSyntax(name: .identifier("Int"))
       ),
@@ -2879,9 +2883,7 @@ final class DeclarationTests: ParserTestCase {
       substructure: FunctionDeclSyntax(
         funcKeyword: .keyword(.func),
         name: .identifier("test"),
-        UnexpectedNodesSyntax([
-          TokenSyntax.identifier("<#name#>")
-        ]),
+        UnexpectedNodesSyntax([TokenSyntax.identifier("<#name#>")]),
         signature: FunctionSignatureSyntax(
           parameterClause: FunctionParameterClauseSyntax(
             parameters: FunctionParameterListSyntax([])