WIP

Author: ahoppen

CodeGeneration/Sources/Utils/CodeGenerationFormat.swift

@@ -62,17 +62,17 @@ public class CodeGenerationFormat: BasicFormat {
     }
   }
 
-  public override func visit(_ node: MemberDeclBlockSyntax) -> MemberDeclBlockSyntax {
+  public override func visit(_ node: MemberBlockSyntax) -> MemberBlockSyntax {
     if node.members.count == 0 {
       return node.with(\.leftBrace, .leftBraceToken())
     } else {
       return super.visit(node)
     }
   }
 
-  public override func visit(_ node: MemberDeclListItemSyntax) -> MemberDeclListItemSyntax {
+  public override func visit(_ node: MemberBlockItemSyntax) -> MemberBlockItemSyntax {
     let formatted = super.visit(node)
-    if node != node.parent?.children(viewMode: .sourceAccurate).first?.as(MemberDeclListItemSyntax.self) && !node.decl.is(EnumCaseDeclSyntax.self) {
+    if node != node.parent?.children(viewMode: .sourceAccurate).first?.as(MemberBlockItemSyntax.self) && !node.decl.is(EnumCaseDeclSyntax.self) {
       return ensuringTwoLeadingNewlines(node: formatted)
     } else {
       return formatted

CodeGeneration/Sources/generate-swiftsyntax/LayoutNode+Extensions.swift

@@ -162,7 +162,7 @@ extension LayoutNode {
       return nil
     }
 
-    let params = ParameterClauseSyntax {
+    let params = FunctionParameterClauseSyntax {
       FunctionParameterSyntax("leadingTrivia: Trivia? = nil")
       for param in normalParameters + builderParameters {
         param

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

@@ -478,7 +478,7 @@ class ValidateSyntaxNodes: XCTestCase {
             "child 'RawValue' is named inconsistently with 'MatchingPatternConditionSyntax.Initializer', which has the same type ('InitializerClauseSyntax')"
         ),
         ValidationFailure(
-          node: .enumCaseParameterClause,
+          node: .enumCaseParameter,
           message:
             "child 'DefaultArgument' is named inconsistently with 'MatchingPatternConditionSyntax.Initializer', which has the same type ('InitializerClauseSyntax')"
         ),

Sources/SwiftSyntaxBuilder/generated/RenamedChildrenBuilderCompatibility.swift

@@ -990,6 +990,3 @@ extension VariableDeclSyntax {
       )
   }
 }
-
-@available(*, deprecated, renamed: "MemberBlockItemListBuilder")
-public typealias MemberDeclListBuilder = MemberBlockItemListBuilder