Fix the problematic builders

Author: RoBo-Inc

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,8 +1246,9 @@ final class DeclarationTests: ParserTestCase {
           ])
         ),
         UnexpectedNodesSyntax([
-          TokenSyntax.identifier("bogus"), TokenSyntax.keyword(.rethrows),
-          TokenSyntax.identifier("set"),
+          Syntax(fromProtocol: TokenSyntax.identifier("bogus")),
+          Syntax(fromProtocol: TokenSyntax.keyword(.rethrows)),
+          Syntax(fromProtocol: TokenSyntax.identifier("set")),
         ])
       ),
       diagnostics: [
@@ -1336,7 +1337,7 @@ final class DeclarationTests: ParserTestCase {
       substructure: FunctionParameterSyntax(
         firstName: .identifier("first"),
         secondName: .identifier("second"),
-        UnexpectedNodesSyntax([TokenSyntax.identifier("third")]),
+        UnexpectedNodesSyntax([Syntax(fromProtocol: TokenSyntax.identifier("third"))]),
         colon: .colonToken(),
         type: IdentifierTypeSyntax(name: .identifier("Int"))
       ),
@@ -1352,7 +1353,10 @@ final class DeclarationTests: ParserTestCase {
       substructure: FunctionParameterSyntax(
         firstName: .identifier("first"),
         secondName: .identifier("second"),
-        UnexpectedNodesSyntax([TokenSyntax.identifier("third"), TokenSyntax.identifier("fourth")]),
+        UnexpectedNodesSyntax([
+          Syntax(fromProtocol: TokenSyntax.identifier("third")),
+          Syntax(fromProtocol: TokenSyntax.identifier("fourth")),
+        ]),
         colon: .colonToken(),
         type: IdentifierTypeSyntax(name: .identifier("Int"))
       ),
@@ -1406,10 +1410,10 @@ final class DeclarationTests: ParserTestCase {
         firstName: .identifier("first"),
         secondName: .identifier("second"),
         UnexpectedNodesSyntax([
-          TokenSyntax.leftSquareToken(),
-          TokenSyntax.identifier("third"),
-          TokenSyntax.identifier("fourth"),
-          TokenSyntax.rightSquareToken(),
+          Syntax(fromProtocol: TokenSyntax.leftSquareToken()),
+          Syntax(fromProtocol: TokenSyntax.identifier("third")),
+          Syntax(fromProtocol: TokenSyntax.identifier("fourth")),
+          Syntax(fromProtocol: TokenSyntax.rightSquareToken()),
         ]),
         colon: .colonToken(),
         type: IdentifierTypeSyntax(name: .identifier("Int"))
@@ -2203,7 +2207,7 @@ final class DeclarationTests: ParserTestCase {
               memberBlock: MemberBlockSyntax(
                 leftBrace: .leftBraceToken(),
                 members: MemberBlockItemListSyntax(),
-                UnexpectedNodesSyntax([TokenSyntax.binaryOperator("^")]),
+                UnexpectedNodesSyntax([Syntax(fromProtocol: TokenSyntax.binaryOperator("^"))]),
                 rightBrace: .rightBraceToken()
               )
             )
@@ -2880,7 +2884,7 @@ final class DeclarationTests: ParserTestCase {
         funcKeyword: .keyword(.func),
         name: .identifier("test"),
         UnexpectedNodesSyntax([
-          TokenSyntax.identifier("<#name#>")
+          Syntax(fromProtocol: TokenSyntax.identifier("<#name#>"))
         ]),
         signature: FunctionSignatureSyntax(
           parameterClause: FunctionParameterClauseSyntax(

Tests/SwiftParserTest/Parser+EntryTests.swift

@@ -50,11 +50,11 @@ public class EntryTests: ParserTestCase {
       "1️⃣operator 2️⃣test 3️⃣{} other tokens",
       { DeclSyntax.parse(from: &$0) },
       substructure: UnexpectedNodesSyntax([
-        TokenSyntax.leftBraceToken(),
-        PrecedenceGroupAttributeListSyntax([]),
-        TokenSyntax.rightBraceToken(),
-        TokenSyntax.identifier("other"),
-        TokenSyntax.identifier("tokens"),
+        Syntax(fromProtocol: TokenSyntax.leftBraceToken()),
+        Syntax(fromProtocol: PrecedenceGroupAttributeListSyntax([])),
+        Syntax(fromProtocol: TokenSyntax.rightBraceToken()),
+        Syntax(fromProtocol: TokenSyntax.identifier("other")),
+        Syntax(fromProtocol: TokenSyntax.identifier("tokens")),
       ]),
       substructureAfterMarker: "3️⃣",
       diagnostics: [

Tests/SwiftParserTest/translated/ErrorsTests.swift

@@ -300,7 +300,7 @@ final class ErrorsTests: ParserTestCase {
             )
           )
         ]),
-        UnexpectedNodesSyntax([TokenSyntax.keyword(.throws)])
+        UnexpectedNodesSyntax([Syntax(fromProtocol: TokenSyntax.keyword(.throws))])
       ),
       diagnostics: [
         DiagnosticSpec(message: "unexpected 'throws' keyword in function")