Rename genericParameters to genericParameterClause using CodeGeneration

Author: TTOzzi

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -749,7 +749,7 @@ public let DECL_NODES: [Node] = [
         description: "Declares the name of this enum. If the name matches a reserved keyword use backticks to escape it."
       ),
       Child(
-        name: "GenericParameters",
+        name: "GenericParameterClause",
         kind: .node(kind: "GenericParameterClause"),
         nameForDiagnostics: "generic parameter clause",
         description: "The generic parameters, if any, for this enum declaration.",

CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift

@@ -322,7 +322,7 @@ public let TYPE_NODES: [Node] = [
     kind: "Type",
     children: [
       Child(
-        name: "GenericParameters",
+        name: "GenericParameterClause",
         kind: .node(kind: "GenericParameterClause")
       ),
       Child(

Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift

@@ -28,3 +28,151 @@ public typealias AccessPathComponentSyntax = ImportPathComponentSyntax
 
 @available(*, deprecated, renamed: "WithAttributesSyntax")
 public typealias AttributedSyntax = WithAttributesSyntax
+
+public extension RawNamedOpaqueReturnTypeSyntax {
+  @available(*, deprecated, renamed: "genericParameterClause")
+  var genericParameters: RawGenericParameterClauseSyntax? { genericParameterClause }
+
+  @available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
+  init(
+    _ unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? = nil,
+    genericParameters: RawGenericParameterClauseSyntax,
+    _ unexpectedBetweenGenericParametersAndBaseType: RawUnexpectedNodesSyntax? = nil,
+    baseType: RawTypeSyntax,
+    _ unexpectedAfterBaseType: RawUnexpectedNodesSyntax? = nil,
+    arena: __shared SyntaxArena
+  ) {
+    self.init(
+      unexpectedBeforeGenericParameters,
+      genericParameterClause: genericParameters,
+      unexpectedBetweenGenericParametersAndBaseType,
+      baseType: baseType,
+      unexpectedAfterBaseType,
+      arena: arena
+    )
+  }
+}
+
+public extension RawEnumDeclSyntax {
+  @available(*, deprecated, renamed: "genericParameterClause")
+  var genericParameters: RawGenericParameterClauseSyntax? { genericParameterClause }
+
+  @available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
+  init(
+    _ unexpectedBeforeAttributes: RawUnexpectedNodesSyntax? = nil,
+    attributes: RawAttributeListSyntax?,
+    _ unexpectedBetweenAttributesAndModifiers: RawUnexpectedNodesSyntax? = nil,
+    modifiers: RawModifierListSyntax?,
+    _ unexpectedBetweenModifiersAndEnumKeyword: RawUnexpectedNodesSyntax? = nil,
+    enumKeyword: RawTokenSyntax,
+    _ unexpectedBetweenEnumKeywordAndIdentifier: RawUnexpectedNodesSyntax? = nil,
+    identifier: RawTokenSyntax,
+    _ unexpectedBetweenIdentifierAndGenericParameters: RawUnexpectedNodesSyntax? = nil,
+    genericParameters: RawGenericParameterClauseSyntax?,
+    _ unexpectedBetweenGenericParametersAndInheritanceClause: RawUnexpectedNodesSyntax? = nil,
+    inheritanceClause: RawTypeInheritanceClauseSyntax?,
+    _ unexpectedBetweenInheritanceClauseAndGenericWhereClause: RawUnexpectedNodesSyntax? = nil,
+    genericWhereClause: RawGenericWhereClauseSyntax?,
+    _ unexpectedBetweenGenericWhereClauseAndMemberBlock: RawUnexpectedNodesSyntax? = nil,
+    memberBlock: RawMemberDeclBlockSyntax,
+    _ unexpectedAfterMemberBlock: RawUnexpectedNodesSyntax? = nil,
+    arena: __shared SyntaxArena
+  ) {
+    self.init(
+      unexpectedBeforeAttributes,
+      attributes: attributes,
+      unexpectedBetweenAttributesAndModifiers,
+      modifiers: modifiers,
+      unexpectedBetweenModifiersAndEnumKeyword,
+      enumKeyword: enumKeyword,
+      unexpectedBetweenEnumKeywordAndIdentifier,
+      identifier: identifier,
+      unexpectedBetweenIdentifierAndGenericParameters,
+      genericParameterClause: genericParameters,
+      unexpectedBetweenGenericParametersAndInheritanceClause,
+      inheritanceClause: inheritanceClause,
+      unexpectedBetweenInheritanceClauseAndGenericWhereClause,
+      genericWhereClause: genericWhereClause,
+      unexpectedBetweenGenericWhereClauseAndMemberBlock,
+      memberBlock: memberBlock,
+      unexpectedAfterMemberBlock,
+      arena: arena
+    )
+  }
+}
+
+public extension EnumDeclSyntax {
+  @available(*, deprecated, renamed: "genericParameterClause")
+  var genericParameters: GenericParameterClauseSyntax? { genericParameterClause }
+
+  @available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
+  init(
+    leadingTrivia: Trivia? = nil,
+    _ unexpectedBeforeAttributes: UnexpectedNodesSyntax? = nil,
+    attributes: AttributeListSyntax? = nil,
+    _ unexpectedBetweenAttributesAndModifiers: UnexpectedNodesSyntax? = nil,
+    modifiers: ModifierListSyntax? = nil,
+    _ unexpectedBetweenModifiersAndEnumKeyword: UnexpectedNodesSyntax? = nil,
+    enumKeyword: TokenSyntax = .keyword(.enum),
+    _ unexpectedBetweenEnumKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
+    identifier: TokenSyntax,
+    _ unexpectedBetweenIdentifierAndGenericParameters: UnexpectedNodesSyntax? = nil,
+    genericParameters: GenericParameterClauseSyntax? = nil,
+    _ unexpectedBetweenGenericParametersAndInheritanceClause: UnexpectedNodesSyntax? = nil,
+    inheritanceClause: TypeInheritanceClauseSyntax? = nil,
+    _ unexpectedBetweenInheritanceClauseAndGenericWhereClause: UnexpectedNodesSyntax? = nil,
+    genericWhereClause: GenericWhereClauseSyntax? = nil,
+    _ unexpectedBetweenGenericWhereClauseAndMemberBlock: UnexpectedNodesSyntax? = nil,
+    memberBlock: MemberDeclBlockSyntax,
+    _ unexpectedAfterMemberBlock: UnexpectedNodesSyntax? = nil,
+    trailingTrivia: Trivia? = nil
+  ) {
+    self.init(
+      leadingTrivia: leadingTrivia,
+      unexpectedBeforeAttributes,
+      attributes: attributes,
+      unexpectedBetweenAttributesAndModifiers,
+      modifiers: modifiers,
+      unexpectedBetweenModifiersAndEnumKeyword,
+      enumKeyword: enumKeyword,
+      unexpectedBetweenEnumKeywordAndIdentifier,
+      identifier: identifier,
+      unexpectedBetweenIdentifierAndGenericParameters,
+      genericParameterClause: genericParameters,
+      unexpectedBetweenGenericParametersAndInheritanceClause,
+      inheritanceClause: inheritanceClause,
+      unexpectedBetweenInheritanceClauseAndGenericWhereClause,
+      genericWhereClause: genericWhereClause,
+      unexpectedBetweenGenericWhereClauseAndMemberBlock,
+      memberBlock: memberBlock,
+      unexpectedAfterMemberBlock,
+      trailingTrivia: trailingTrivia
+    )
+  }
+}
+
+public extension NamedOpaqueReturnTypeSyntax {
+  @available(*, deprecated, renamed: "genericParameterClause")
+  var genericParameters: GenericParameterClauseSyntax? { genericParameterClause }
+
+  @available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
+  init(
+    leadingTrivia: Trivia? = nil,
+    _ unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? = nil,
+    genericParameters: GenericParameterClauseSyntax,
+    _ unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? = nil,
+    baseType: some TypeSyntaxProtocol,
+    _ unexpectedAfterBaseType: UnexpectedNodesSyntax? = nil,
+    trailingTrivia: Trivia? = nil
+  ) {
+    self.init(
+      leadingTrivia: leadingTrivia,
+      unexpectedBeforeGenericParameters,
+      genericParameterClause: genericParameters,
+      unexpectedBetweenGenericParametersAndBaseType,
+      baseType: baseType,
+      unexpectedAfterBaseType,
+      trailingTrivia: trailingTrivia
+    )
+  }
+}

Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

@@ -1207,12 +1207,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenEnumKeywordAndIdentifier"
   case \EnumDeclSyntax.identifier:
     return "identifier"
-  case \EnumDeclSyntax.unexpectedBetweenIdentifierAndGenericParameters:
-    return "unexpectedBetweenIdentifierAndGenericParameters"
+  case \EnumDeclSyntax.unexpectedBetweenIdentifierAndGenericParameterClause:
+    return "unexpectedBetweenIdentifierAndGenericParameterClause"
   case \EnumDeclSyntax.genericParameterClause:
     return "genericParameterClause"
-  case \EnumDeclSyntax.unexpectedBetweenGenericParametersAndInheritanceClause:
-    return "unexpectedBetweenGenericParametersAndInheritanceClause"
+  case \EnumDeclSyntax.unexpectedBetweenGenericParameterClauseAndInheritanceClause:
+    return "unexpectedBetweenGenericParameterClauseAndInheritanceClause"
   case \EnumDeclSyntax.inheritanceClause:
     return "inheritanceClause"
   case \EnumDeclSyntax.unexpectedBetweenInheritanceClauseAndGenericWhereClause:
@@ -2241,12 +2241,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "closure"
   case \MultipleTrailingClosureElementSyntax.unexpectedAfterClosure:
     return "unexpectedAfterClosure"
-  case \NamedOpaqueReturnTypeSyntax.unexpectedBeforeGenericParameters:
-    return "unexpectedBeforeGenericParameters"
+  case \NamedOpaqueReturnTypeSyntax.unexpectedBeforeGenericParameterClause:
+    return "unexpectedBeforeGenericParameterClause"
   case \NamedOpaqueReturnTypeSyntax.genericParameterClause:
     return "genericParameterClause"
-  case \NamedOpaqueReturnTypeSyntax.unexpectedBetweenGenericParametersAndBaseType:
-    return "unexpectedBetweenGenericParametersAndBaseType"
+  case \NamedOpaqueReturnTypeSyntax.unexpectedBetweenGenericParameterClauseAndBaseType:
+    return "unexpectedBetweenGenericParameterClauseAndBaseType"
   case \NamedOpaqueReturnTypeSyntax.baseType:
     return "baseType"
   case \NamedOpaqueReturnTypeSyntax.unexpectedAfterBaseType:

Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift

@@ -8340,9 +8340,9 @@ public struct RawEnumDeclSyntax: RawDeclSyntaxNodeProtocol {
       enumKeyword: RawTokenSyntax, 
       _ unexpectedBetweenEnumKeywordAndIdentifier: RawUnexpectedNodesSyntax? = nil, 
       identifier: RawTokenSyntax, 
-      _ unexpectedBetweenIdentifierAndGenericParameters: RawUnexpectedNodesSyntax? = nil, 
-      genericParameterClause: RawGenericParameterClauseSyntax?,
-      _ unexpectedBetweenGenericParametersAndInheritanceClause: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBetweenIdentifierAndGenericParameterClause: RawUnexpectedNodesSyntax? = nil, 
+      genericParameterClause: RawGenericParameterClauseSyntax?, 
+      _ unexpectedBetweenGenericParameterClauseAndInheritanceClause: RawUnexpectedNodesSyntax? = nil, 
       inheritanceClause: RawTypeInheritanceClauseSyntax?, 
       _ unexpectedBetweenInheritanceClauseAndGenericWhereClause: RawUnexpectedNodesSyntax? = nil, 
       genericWhereClause: RawGenericWhereClauseSyntax?, 
@@ -8362,9 +8362,9 @@ public struct RawEnumDeclSyntax: RawDeclSyntaxNodeProtocol {
       layout[5] = enumKeyword.raw
       layout[6] = unexpectedBetweenEnumKeywordAndIdentifier?.raw
       layout[7] = identifier.raw
-      layout[8] = unexpectedBetweenIdentifierAndGenericParameters?.raw
+      layout[8] = unexpectedBetweenIdentifierAndGenericParameterClause?.raw
       layout[9] = genericParameterClause?.raw
-      layout[10] = unexpectedBetweenGenericParametersAndInheritanceClause?.raw
+      layout[10] = unexpectedBetweenGenericParameterClauseAndInheritanceClause?.raw
       layout[11] = inheritanceClause?.raw
       layout[12] = unexpectedBetweenInheritanceClauseAndGenericWhereClause?.raw
       layout[13] = genericWhereClause?.raw
@@ -8407,15 +8407,15 @@ public struct RawEnumDeclSyntax: RawDeclSyntaxNodeProtocol {
     layoutView.children[7].map(RawTokenSyntax.init(raw:))!
   }
 
-  public var unexpectedBetweenIdentifierAndGenericParameters: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenIdentifierAndGenericParameterClause: RawUnexpectedNodesSyntax? {
     layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 
   public var genericParameterClause: RawGenericParameterClauseSyntax? {
     layoutView.children[9].map(RawGenericParameterClauseSyntax.init(raw:))
   }
 
-  public var unexpectedBetweenGenericParametersAndInheritanceClause: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenGenericParameterClauseAndInheritanceClause: RawUnexpectedNodesSyntax? {
     layoutView.children[10].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 
@@ -8444,54 +8444,6 @@ public struct RawEnumDeclSyntax: RawDeclSyntaxNodeProtocol {
   }
 }
 
-public extension RawEnumDeclSyntax {
-  @available(*, deprecated, renamed: "genericParameterClause")
-  var genericParameters: RawGenericParameterClauseSyntax? { genericParameterClause }
-  
-  @available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
-  init(
-      _ unexpectedBeforeAttributes: RawUnexpectedNodesSyntax? = nil,
-      attributes: RawAttributeListSyntax?,
-      _ unexpectedBetweenAttributesAndModifiers: RawUnexpectedNodesSyntax? = nil,
-      modifiers: RawModifierListSyntax?,
-      _ unexpectedBetweenModifiersAndEnumKeyword: RawUnexpectedNodesSyntax? = nil,
-      enumKeyword: RawTokenSyntax,
-      _ unexpectedBetweenEnumKeywordAndIdentifier: RawUnexpectedNodesSyntax? = nil,
-      identifier: RawTokenSyntax,
-      _ unexpectedBetweenIdentifierAndGenericParameters: RawUnexpectedNodesSyntax? = nil,
-      genericParameters: RawGenericParameterClauseSyntax?,
-      _ unexpectedBetweenGenericParametersAndInheritanceClause: RawUnexpectedNodesSyntax? = nil,
-      inheritanceClause: RawTypeInheritanceClauseSyntax?,
-      _ unexpectedBetweenInheritanceClauseAndGenericWhereClause: RawUnexpectedNodesSyntax? = nil,
-      genericWhereClause: RawGenericWhereClauseSyntax?,
-      _ unexpectedBetweenGenericWhereClauseAndMemberBlock: RawUnexpectedNodesSyntax? = nil,
-      memberBlock: RawMemberDeclBlockSyntax,
-      _ unexpectedAfterMemberBlock: RawUnexpectedNodesSyntax? = nil,
-      arena: __shared SyntaxArena
-    ) {
-      self.init(
-        unexpectedBeforeAttributes,
-        attributes: attributes,
-        unexpectedBetweenAttributesAndModifiers,
-        modifiers: modifiers,
-        unexpectedBetweenModifiersAndEnumKeyword,
-        enumKeyword: enumKeyword,
-        unexpectedBetweenEnumKeywordAndIdentifier,
-        identifier: identifier,
-        unexpectedBetweenIdentifierAndGenericParameters,
-        genericParameterClause: genericParameters,
-        unexpectedBetweenGenericParametersAndInheritanceClause,
-        inheritanceClause: inheritanceClause,
-        unexpectedBetweenInheritanceClauseAndGenericWhereClause,
-        genericWhereClause: genericWhereClause,
-        unexpectedBetweenGenericWhereClauseAndMemberBlock,
-        memberBlock: memberBlock,
-        unexpectedAfterMemberBlock,
-        arena: arena
-      )
-  }
-}
-
 @_spi(RawSyntax)
 public struct RawExposeAttributeArgumentsSyntax: RawSyntaxNodeProtocol {
   @_spi(RawSyntax)
@@ -14924,34 +14876,34 @@ public struct RawNamedOpaqueReturnTypeSyntax: RawTypeSyntaxNodeProtocol {
   }
 
   public init(
-      _ unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? = nil, 
-      genericParameterClause: RawGenericParameterClauseSyntax,
-      _ unexpectedBetweenGenericParametersAndBaseType: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforeGenericParameterClause: RawUnexpectedNodesSyntax? = nil, 
+      genericParameterClause: RawGenericParameterClauseSyntax, 
+      _ unexpectedBetweenGenericParameterClauseAndBaseType: RawUnexpectedNodesSyntax? = nil, 
       baseType: RawTypeSyntax, 
       _ unexpectedAfterBaseType: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
       kind: .namedOpaqueReturnType, uninitializedCount: 5, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeGenericParameters?.raw
+      layout[0] = unexpectedBeforeGenericParameterClause?.raw
       layout[1] = genericParameterClause.raw
-      layout[2] = unexpectedBetweenGenericParametersAndBaseType?.raw
+      layout[2] = unexpectedBetweenGenericParameterClauseAndBaseType?.raw
       layout[3] = baseType.raw
       layout[4] = unexpectedAfterBaseType?.raw
     }
     self.init(unchecked: raw)
   }
 
-  public var unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeGenericParameterClause: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 
   public var genericParameterClause: RawGenericParameterClauseSyntax {
     layoutView.children[1].map(RawGenericParameterClauseSyntax.init(raw:))!
   }
 
-  public var unexpectedBetweenGenericParametersAndBaseType: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenGenericParameterClauseAndBaseType: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 
@@ -14964,30 +14916,6 @@ public struct RawNamedOpaqueReturnTypeSyntax: RawTypeSyntaxNodeProtocol {
   }
 }
 
-public extension RawNamedOpaqueReturnTypeSyntax {
-  @available(*, deprecated, renamed: "genericParameterClause")
-  var genericParameters: RawGenericParameterClauseSyntax? { genericParameterClause }
-  
-  @available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
-  init(
-      _ unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? = nil,
-      genericParameters: RawGenericParameterClauseSyntax,
-      _ unexpectedBetweenGenericParametersAndBaseType: RawUnexpectedNodesSyntax? = nil,
-      baseType: RawTypeSyntax,
-      _ unexpectedAfterBaseType: RawUnexpectedNodesSyntax? = nil,
-      arena: __shared SyntaxArena
-    ) {
-      self.init(
-        unexpectedBeforeGenericParameters,
-        genericParameterClause: genericParameters,
-        unexpectedBetweenGenericParametersAndBaseType,
-        baseType: baseType,
-        unexpectedAfterBaseType,
-        arena: arena
-      )
-  }
-}
-
 @_spi(RawSyntax)
 public struct RawNilLiteralExprSyntax: RawExprSyntaxNodeProtocol {
   @_spi(RawSyntax)