[NFC] Update uses of DeclGroups to use headers

Clears up a bunch of warnings.

Author: beccadax

Sources/SwiftCompilerPluginMessageHandling/Macros.swift

@@ -132,7 +132,7 @@ extension PluginProviderMessageHandler {
     }
     let conformanceList = conformanceListSyntax.map {
       let placeholderStruct = sourceManager.add($0).cast(StructDeclSyntax.self)
-      return placeholderStruct.inheritanceClause!.inheritedTypes
+      return placeholderStruct.structHeader.inheritanceClause!.inheritedTypes
     }
 
     let context = PluginMacroExpansionContext(

Sources/SwiftLexicalLookup/LookupName.swift

@@ -110,7 +110,7 @@ import SwiftSyntax
     case .Self(let declSyntax):
       switch Syntax(declSyntax).as(SyntaxEnum.self) {
       case .protocolDecl(let protocolDecl):
-        return protocolDecl.name.positionAfterSkippingLeadingTrivia
+        return protocolDecl.protocolHeader.name.positionAfterSkippingLeadingTrivia
       default:
         return declSyntax.positionAfterSkippingLeadingTrivia
       }

Sources/SwiftLexicalLookup/Scopes/ScopeImplementations.swift

@@ -391,7 +391,7 @@ import SwiftSyntax
 }
 @_spi(Experimental) extension ExtensionDeclSyntax: LookInMembersScopeSyntax {
   @_spi(Experimental) public var lookupMembersPosition: AbsolutePosition {
-    extendedType.position
+    extensionHeader.extendedType.position
   }
 
   @_spi(Experimental) public var defaultIntroducedNames: [LookupName] {
@@ -420,7 +420,8 @@ import SwiftSyntax
         + defaultLookupImplementation(identifier, at: lookUpPosition, with: config, propagateToParent: false)
         + [.lookInMembers(self)]
         + lookupInParent(identifier, at: lookUpPosition, with: config)
-    } else if !extendedType.range.contains(lookUpPosition) && genericWhereClause != nil {
+    } else if !extensionHeader.extendedType.range.contains(lookUpPosition) && extensionHeader.genericWhereClause != nil
+    {
       if inRightTypeOrSameTypeRequirement(lookUpPosition) {
         return [.lookInGenericParametersOfExtendedType(self)] + [.lookInMembers(self)]
           + defaultLookupImplementation(identifier, at: lookUpPosition, with: config)
@@ -439,7 +440,7 @@ import SwiftSyntax
   private func inRightTypeOrSameTypeRequirement(
     _ checkedPosition: AbsolutePosition
   ) -> Bool {
-    genericWhereClause?.requirements.contains { elem in
+    extensionHeader.genericWhereClause?.requirements.contains { elem in
       switch Syntax(elem.requirement).as(SyntaxEnum.self) {
       case .conformanceRequirement(let conformanceRequirement):
         return conformanceRequirement.rightType.range.contains(checkedPosition)
@@ -612,7 +613,7 @@ import SwiftSyntax
   }
 
   @_spi(Experimental) public var lookupMembersPosition: AbsolutePosition {
-    name.positionAfterSkippingLeadingTrivia
+    protocolHeader.name.positionAfterSkippingLeadingTrivia
   }
 
   @_spi(Experimental) public var scopeDebugName: String {
@@ -644,7 +645,7 @@ import SwiftSyntax
   ) -> [LookupResult] {
     var results: [LookupResult] = []
 
-    if let primaryAssociatedTypeClause,
+    if let primaryAssociatedTypeClause = protocolHeader.primaryAssociatedTypeClause,
       primaryAssociatedTypeClause.range.contains(lookUpPosition)
     {
       results = memberBlock.lookupAssociatedTypeDeclarations(
@@ -656,7 +657,7 @@ import SwiftSyntax
 
     let lookInMembers: [LookupResult]
 
-    if !(inheritanceClause?.range.contains(lookUpPosition) ?? false) {
+    if !(protocolHeader.inheritanceClause?.range.contains(lookUpPosition) ?? false) {
       lookInMembers = [.lookInMembers(self)]
     } else {
       lookInMembers = []

Sources/SwiftSyntaxMacroExpansion/MacroSystem.swift

@@ -1490,7 +1490,7 @@ private extension SyntaxProtocol {
   var syntacticQualifiedTypeContext: TypeSyntax? {
     if let ext = self.as(ExtensionDeclSyntax.self) {
       // Don't handle nested 'extension' cases - they are invalid anyway.
-      return ext.extendedType.trimmed
+      return ext.extensionHeader.extendedType.trimmed
     }
 
     let base = self.parent?.syntacticQualifiedTypeContext

Tests/SwiftParserTest/DeclarationTests.swift

@@ -2337,8 +2337,10 @@ final class DeclarationTests: ParserTestCase {
         CodeBlockItemSyntax(
           item: .init(
             ClassDeclSyntax(
-              classKeyword: .keyword(.class),
-              name: .identifier("A"),
+              classHeader: ClassDeclHeaderSyntax(
+                classKeyword: .keyword(.class),
+                name: .identifier("A")
+              ),
               memberBlock: MemberBlockSyntax(
                 leftBrace: .leftBraceToken(),
                 members: MemberBlockItemListSyntax(),
@@ -2351,8 +2353,10 @@ final class DeclarationTests: ParserTestCase {
         CodeBlockItemSyntax(
           item: .init(
             ClassDeclSyntax(
-              classKeyword: .keyword(.class),
-              name: .identifier("B"),
+              classHeader: .init(
+                classKeyword: .keyword(.class),
+                name: .identifier("B")
+              ),
               memberBlock: MemberBlockSyntax(
                 leftBrace: .leftBraceToken(),
                 members: MemberBlockItemListSyntax(),

Tests/SwiftParserTest/translated/HashbangLibraryTests.swift

@@ -31,14 +31,16 @@ final class HashbangLibraryTests: ParserTestCase {
             item: .decl(
               DeclSyntax(
                 ClassDeclSyntax(
-                  classKeyword: .keyword(
-                    .class,
-                    leadingTrivia: [
-                      .newlines(1)
-                    ],
-                    trailingTrivia: .space
+                  classHeader: ClassDeclHeaderSyntax(
+                    classKeyword: .keyword(
+                      .class,
+                      leadingTrivia: [
+                        .newlines(1)
+                      ],
+                      trailingTrivia: .space
+                    ),
+                    name: .identifier("Foo", trailingTrivia: .space)
                   ),
-                  name: .identifier("Foo", trailingTrivia: .space),
                   memberBlock: MemberBlockSyntax(
                     members: MemberBlockItemListSyntax([])
                   )

Tests/SwiftSyntaxBuilderTest/ClassDeclSyntaxTests.swift

@@ -35,7 +35,7 @@ final class ClassDeclSyntaxTests: XCTestCase {
   }
 
   func testThrowableClass() throws {
-    let buildable = try ClassDeclSyntax(name: .identifier("Foo")) {
+    let buildable = try ClassDeclSyntax(classHeader: .init(name: .identifier("Foo"))) {
       try FunctionDeclSyntax("func foo() -> String") {
         StmtSyntax(#"return "hello world""#)
       }
@@ -54,7 +54,7 @@ final class ClassDeclSyntaxTests: XCTestCase {
   }
 
   func testNodeWithoutAnchorPointInResultBuilder() throws {
-    let buildable = ClassDeclSyntax(name: .identifier("Foo")) {
+    let buildable = ClassDeclSyntax(classHeader: .init(name: .identifier("Foo"))) {
       DeclSyntax(
         """
           func foo() -> String {

Tests/SwiftSyntaxBuilderTest/EnumCaseElementTests.swift

@@ -19,12 +19,14 @@ final class EnumCaseElementTests: XCTestCase {
     let leadingTrivia = Trivia.unexpectedText("␣")
     let buildable = EnumDeclSyntax(
       leadingTrivia: leadingTrivia,
-      name: "Greeting",
-      inheritanceClause: InheritanceClauseSyntax {
-        InheritedTypeSyntax(type: TypeSyntax("String"))
-        InheritedTypeSyntax(type: TypeSyntax("Codable"))
-        InheritedTypeSyntax(type: TypeSyntax("Equatable"))
-      }
+      enumHeader: .init(
+        name: "Greeting",
+        inheritanceClause: InheritanceClauseSyntax {
+          InheritedTypeSyntax(type: TypeSyntax("String"))
+          InheritedTypeSyntax(type: TypeSyntax("Codable"))
+          InheritedTypeSyntax(type: TypeSyntax("Equatable"))
+        }
+      )
     ) {
       MemberBlockItemSyntax(
         decl: EnumCaseDeclSyntax {

Tests/SwiftSyntaxBuilderTest/ExtensionDeclTests.swift

@@ -36,7 +36,7 @@ final class ExtensionDeclTests: XCTestCase {
     }
     let members = MemberBlockItemListSyntax(keywords.map { MemberBlockItemSyntax(decl: $0) })
     let buildable = ExtensionDeclSyntax(
-      extendedType: TypeSyntax("TokenSyntax"),
+      extensionHeader: .init(extendedType: TypeSyntax("TokenSyntax")),
       memberBlock: MemberBlockSyntax(members: members)
     )
 

Tests/SwiftSyntaxBuilderTest/SourceFileTests.swift

@@ -20,8 +20,10 @@ final class SourceFileTests: XCTestCase {
       DeclSyntax("import Foundation")
       DeclSyntax("import UIKit")
       ClassDeclSyntax(
-        classKeyword: .keyword(.class),
-        name: "SomeViewController",
+        classHeader: .init(
+          classKeyword: .keyword(.class),
+          name: "SomeViewController"
+        ),
         memberBlockBuilder: {
           DeclSyntax("let tableView: UITableView")
         }