Rename genericParameters to genericParameterClause for consistency

TTOzzi · TTOzzi · commit 5c39a2deb980 · 2023-05-24T05:13:59.000+09:00
diff --git a/CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift b/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.",
diff --git a/CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift b/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(
diff --git a/Sources/SwiftParser/Nominals.swift b/Sources/SwiftParser/Nominals.swift
@@ -189,7 +189,7 @@ extension RawEnumDeclSyntax: NominalTypeDeclarationTrait {
       enumKeyword: introducerKeyword,
       unexpectedBeforeIdentifier,
       identifier: identifier,
-      genericParameters: primaryOrGenerics,
+      genericParameterClause: primaryOrGenerics,
       inheritanceClause: inheritanceClause,
       genericWhereClause: genericWhereClause,
       memberBlock: memberBlock,
diff --git a/Sources/SwiftParser/Types.swift b/Sources/SwiftParser/Types.swift
@@ -1045,7 +1045,7 @@ extension Parser {
       let baseType = self.parseType()
       return RawTypeSyntax(
         RawNamedOpaqueReturnTypeSyntax(
-          genericParameters: generics,
+          genericParameterClause: generics,
           baseType: baseType,
           arena: self.arena
         )
diff --git a/Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift b/Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift
@@ -126,7 +126,7 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
     return "attributes"
   case \EnumDeclSyntax.modifiers:
     return "modifiers"
-  case \EnumDeclSyntax.genericParameters:
+  case \EnumDeclSyntax.genericParameterClause:
     return "generic parameter clause"
   case \EnumDeclSyntax.inheritanceClause:
     return "inheritance clause"
diff --git a/Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift b/Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift
@@ -28,3 +28,91 @@ public typealias AccessPathComponentSyntax = ImportPathComponentSyntax
 
 @available(*, deprecated, renamed: "WithAttributesSyntax")
 public typealias AttributedSyntax = WithAttributesSyntax
+
+public extension EnumDeclSyntax {
+  @available(*, deprecated, renamed: "unexpectedBetweenIdentifierAndGenericParameterClause")
+  var unexpectedBetweenIdentifierAndGenericParameters: UnexpectedNodesSyntax? { unexpectedBetweenIdentifierAndGenericParameterClause }
+
+  @available(*, deprecated, renamed: "genericParameterClause")
+  var genericParameters: GenericParameterClauseSyntax? { genericParameterClause }
+
+  @available(*, deprecated, renamed: "unexpectedBetweenGenericParameterClauseAndInheritanceClause")
+  var unexpectedBetweenGenericParametersAndInheritanceClause: UnexpectedNodesSyntax? { unexpectedBetweenGenericParameterClauseAndInheritanceClause }
+
+  @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: "unexpectedBeforeGenericParameterClause")
+  var unexpectedBeforeGenericParameters: UnexpectedNodesSyntax? { unexpectedBeforeGenericParameterClause }
+
+  @available(*, deprecated, renamed: "genericParameterClause")
+  var genericParameters: GenericParameterClauseSyntax? { genericParameterClause }
+
+  @available(*, deprecated, renamed: "unexpectedBetweenGenericParameterClauseAndBaseType")
+  var unexpectedBetweenGenericParametersAndBaseType: UnexpectedNodesSyntax? { unexpectedBetweenGenericParameterClauseAndBaseType }
+
+  @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
+    )
+  }
+}
diff --git a/Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift b/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.genericParameters:
-    return "genericParameters"
-  case \EnumDeclSyntax.unexpectedBetweenGenericParametersAndInheritanceClause:
-    return "unexpectedBetweenGenericParametersAndInheritanceClause"
+  case \EnumDeclSyntax.unexpectedBetweenIdentifierAndGenericParameterClause:
+    return "unexpectedBetweenIdentifierAndGenericParameterClause"
+  case \EnumDeclSyntax.genericParameterClause:
+    return "genericParameterClause"
+  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.genericParameters:
-    return "genericParameters"
-  case \NamedOpaqueReturnTypeSyntax.unexpectedBetweenGenericParametersAndBaseType:
-    return "unexpectedBetweenGenericParametersAndBaseType"
+  case \NamedOpaqueReturnTypeSyntax.unexpectedBeforeGenericParameterClause:
+    return "unexpectedBeforeGenericParameterClause"
+  case \NamedOpaqueReturnTypeSyntax.genericParameterClause:
+    return "genericParameterClause"
+  case \NamedOpaqueReturnTypeSyntax.unexpectedBetweenGenericParameterClauseAndBaseType:
+    return "unexpectedBetweenGenericParameterClauseAndBaseType"
   case \NamedOpaqueReturnTypeSyntax.baseType:
     return "baseType"
   case \NamedOpaqueReturnTypeSyntax.unexpectedAfterBaseType:
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift
@@ -8340,9 +8340,9 @@ public struct RawEnumDeclSyntax: RawDeclSyntaxNodeProtocol {
       enumKeyword: RawTokenSyntax, 
       _ unexpectedBetweenEnumKeywordAndIdentifier: RawUnexpectedNodesSyntax? = nil, 
       identifier: RawTokenSyntax, 
-      _ unexpectedBetweenIdentifierAndGenericParameters: RawUnexpectedNodesSyntax? = nil, 
-      genericParameters: 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[9] = genericParameters?.raw
-      layout[10] = unexpectedBetweenGenericParametersAndInheritanceClause?.raw
+      layout[8] = unexpectedBetweenIdentifierAndGenericParameterClause?.raw
+      layout[9] = genericParameterClause?.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 genericParameters: RawGenericParameterClauseSyntax? {
+  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:))
   }
   
@@ -14876,34 +14876,34 @@ public struct RawNamedOpaqueReturnTypeSyntax: RawTypeSyntaxNodeProtocol {
   }
   
   public init(
-      _ unexpectedBeforeGenericParameters: RawUnexpectedNodesSyntax? = nil, 
-      genericParameters: 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[1] = genericParameters.raw
-      layout[2] = unexpectedBetweenGenericParametersAndBaseType?.raw
+      layout[0] = unexpectedBeforeGenericParameterClause?.raw
+      layout[1] = genericParameterClause.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 genericParameters: RawGenericParameterClauseSyntax {
+  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:))
   }
   
diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxDeclNodes.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxDeclNodes.swift
@@ -1765,9 +1765,9 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
       enumKeyword: TokenSyntax = .keyword(.enum),
       _ unexpectedBetweenEnumKeywordAndIdentifier: UnexpectedNodesSyntax? = nil,
       identifier: TokenSyntax,
-      _ unexpectedBetweenIdentifierAndGenericParameters: UnexpectedNodesSyntax? = nil,
-      genericParameters: GenericParameterClauseSyntax? = nil,
-      _ unexpectedBetweenGenericParametersAndInheritanceClause: UnexpectedNodesSyntax? = nil,
+      _ unexpectedBetweenIdentifierAndGenericParameterClause: UnexpectedNodesSyntax? = nil,
+      genericParameterClause: GenericParameterClauseSyntax? = nil,
+      _ unexpectedBetweenGenericParameterClauseAndInheritanceClause: UnexpectedNodesSyntax? = nil,
       inheritanceClause: TypeInheritanceClauseSyntax? = nil,
       _ unexpectedBetweenInheritanceClauseAndGenericWhereClause: UnexpectedNodesSyntax? = nil,
       genericWhereClause: GenericWhereClauseSyntax? = nil,
@@ -1788,9 +1788,9 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
             enumKeyword, 
             unexpectedBetweenEnumKeywordAndIdentifier, 
             identifier, 
-            unexpectedBetweenIdentifierAndGenericParameters, 
-            genericParameters, 
-            unexpectedBetweenGenericParametersAndInheritanceClause, 
+            unexpectedBetweenIdentifierAndGenericParameterClause, 
+            genericParameterClause, 
+            unexpectedBetweenGenericParameterClauseAndInheritanceClause, 
             inheritanceClause, 
             unexpectedBetweenInheritanceClauseAndGenericWhereClause, 
             genericWhereClause, 
@@ -1807,9 +1807,9 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
           enumKeyword.raw, 
           unexpectedBetweenEnumKeywordAndIdentifier?.raw, 
           identifier.raw, 
-          unexpectedBetweenIdentifierAndGenericParameters?.raw, 
-          genericParameters?.raw, 
-          unexpectedBetweenGenericParametersAndInheritanceClause?.raw, 
+          unexpectedBetweenIdentifierAndGenericParameterClause?.raw, 
+          genericParameterClause?.raw, 
+          unexpectedBetweenGenericParameterClauseAndInheritanceClause?.raw, 
           inheritanceClause?.raw, 
           unexpectedBetweenInheritanceClauseAndGenericWhereClause?.raw, 
           genericWhereClause?.raw, 
@@ -1944,7 +1944,7 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenIdentifierAndGenericParameters: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenIdentifierAndGenericParameterClause: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 8, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -1954,7 +1954,7 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
   }
   
   /// The generic parameters, if any, for this enum declaration.
-  public var genericParameters: GenericParameterClauseSyntax? {
+  public var genericParameterClause: GenericParameterClauseSyntax? {
     get {
       return data.child(at: 9, parent: Syntax(self)).map(GenericParameterClauseSyntax.init)
     }
@@ -1963,7 +1963,7 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     }
   }
   
-  public var unexpectedBetweenGenericParametersAndInheritanceClause: UnexpectedNodesSyntax? {
+  public var unexpectedBetweenGenericParameterClauseAndInheritanceClause: UnexpectedNodesSyntax? {
     get {
       return data.child(at: 10, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
     }
@@ -2039,9 +2039,9 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
           \Self.enumKeyword, 
           \Self.unexpectedBetweenEnumKeywordAndIdentifier, 
           \Self.identifier, 
-          \Self.unexpectedBetweenIdentifierAndGenericParameters, 
-          \Self.genericParameters, 
-          \Self.unexpectedBetweenGenericParametersAndInheritanceClause, 
+          \Self.unexpectedBetweenIdentifierAndGenericParameterClause, 
+          \Self.genericParameterClause, 
+          \Self.unexpectedBetweenGenericParameterClauseAndInheritanceClause, 
           \Self.inheritanceClause, 
           \Self.unexpectedBetweenInheritanceClauseAndGenericWhereClause, 
           \Self.genericWhereClause, 
diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxTypeNodes.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxTypeNodes.swift
diff --git a/Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift b/Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift

Original file line number	Diff line number	Diff line change
`@@ -1045,7 +1045,7 @@ extension Parser {`
`1045`	`1045`	`let baseType = self.parseType()`
`1046`	`1046`	`return RawTypeSyntax(`
`1047`	`1047`	`RawNamedOpaqueReturnTypeSyntax(`
`1048`		`- genericParameters: generics,`
	`1048`	`+ genericParameterClause: generics,`
`1049`	`1049`	`baseType: baseType,`
`1050`	`1050`	`arena: self.arena`
`1051`	`1051`	`)`