Merge pull request #1294 from kimdv/kimdv/add-missing-unexpected-after

Add missing parameter

Author: kimdv

CodeGeneration/Sources/SyntaxSupport/Node.swift

@@ -117,9 +117,14 @@ public class Node {
             isOptional: true,
             collectionElementName: unexpectedName
           ),
-          child,
+          child
         ]
-      }
+      } + (children.last != nil ? [Child(
+        name: "UnexpectedAfter\(children.last!.name)",
+        kind: "UnexpectedNodes",
+        isOptional: true,
+        collectionElementName: "UnexpectedAfter\(children.last!.name)"
+      )] : [])
     }
 
     self.nonUnexpectedChildren = children.filter { !$0.isUnexpectedNodes }

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxTraitsFile.swift

@@ -28,7 +28,7 @@ let syntaxTraitsFile = SourceFileSyntax {
       }
     }
 
-    ExtensionDeclSyntax("public extension \(trait.traitName)Syntax") {
+    ExtensionDeclSyntax("public extension \(raw: trait.traitName)Syntax") {
       FunctionDeclSyntax("""
       /// Without this function, the `with` function defined on `SyntaxProtocol`
       /// does not work on existentials of this protocol type.

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/BuildableNodesFile.swift

@@ -74,15 +74,8 @@ private func createConvenienceInitializer(node: Node) -> InitializerDeclSyntax?
       } else {
         produceExpr = ExprSyntax(FunctionCallExprSyntax("\(raw: child.swiftName)Builder()"))
       }
-      let defaultArgument = ClosureExprSyntax {
-        if child.type.isOptional {
-          NilLiteralExprSyntax()
-        } else {
-          FunctionCallExprSyntax("\(builderInitializableType.syntax)([])")
-        }
-      }
       builderParameters.append(FunctionParameterSyntax(
-        "@\(builderInitializableType.resultBuilderBaseName) \(child.swiftName)Builder: () -> \(builderInitializableType.syntax) = \(defaultArgument)",
+        "@\(builderInitializableType.resultBuilderBaseName) \(child.swiftName)Builder: () -> \(builderInitializableType.syntax)",
         for: .functionParameters
       ))
     } else {
@@ -103,7 +96,7 @@ private func createConvenienceInitializer(node: Node) -> InitializerDeclSyntax?
 
   return InitializerDeclSyntax(
     leadingTrivia: .docLineComment("/// A convenience initializer that allows initializing syntax collections using result builders") + .newline,
-    modifiers: [DeclModifierSyntax(name: .keyword(.public))],
+    modifiers: [DeclModifierSyntax(leadingTrivia: .newline, name: .keyword(.public))],
     signature: FunctionSignatureSyntax(
       input: ParameterClauseSyntax {
         FunctionParameterSyntax("leadingTrivia: Trivia? = nil", for: .functionParameters)

Sources/SwiftParser/Lexer/Cursor.swift

@@ -1298,7 +1298,6 @@ extension Lexer.Cursor {
   }
 
   mutating func lexHexNumber() -> Lexer.Result {
-    let tokStart = self
     // We assume we're starting from the 'x' in a '0x...' floating-point literal.
     let zeroConsumed = self.advance(matching: "0")
     let xConsumed = self.advance(matching: "x")

Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift

@@ -1183,7 +1183,7 @@ final class DeclarationTests: XCTestCase {
       substructure: Syntax(
         SourceFileSyntax(
           CodeBlockItemListSyntax {
-            MacroExpansionDeclSyntax(macro: "expand")
+            MacroExpansionDeclSyntax(macro: "expand") {}
           }
         )
       )

Tests/SwiftParserTest/DeclarationTests.swift

@@ -335,7 +335,7 @@ final class FunctionTests: XCTestCase {
   }
 
   func testParensEmittedForArgumentAndTrailingClosure() {
-    let buildable = FunctionCallExprSyntax(callee: ExprSyntax("test"), trailingClosure: ClosureExprSyntax()) {
+    let buildable = FunctionCallExprSyntax(callee: ExprSyntax("test"), trailingClosure: ClosureExprSyntax {}) {
       TupleExprElementSyntax(expression: ExprSyntax("42"))
     }
     AssertBuildResult(buildable, "test(42) {\n}")

Tests/SwiftSyntaxBuilderTest/FunctionTests.swift

@@ -45,7 +45,8 @@ final class StructTests: XCTestCase {
         .carriageReturns(1),
       ],
       structKeyword: .keyword(.struct),
-      identifier: "CarriateReturnsStruct"
+      identifier: "CarriateReturnsStruct",
+      members: MemberDeclBlockSyntax(members: [])
     )
     let carriageReturnFormFeedsStruct = StructDeclSyntax(
       leadingTrivia: [
@@ -55,7 +56,8 @@ final class StructTests: XCTestCase {
         .carriageReturnLineFeeds(1),
       ],
       structKeyword: .keyword(.struct),
-      identifier: "CarriageReturnFormFeedsStruct"
+      identifier: "CarriageReturnFormFeedsStruct",
+      members: MemberDeclBlockSyntax(members: [])
     )
     let testStruct = try StructDeclSyntax("public struct TestStruct") {
       nestedStruct