Update macros to use new SwiftSyntax APIs

Author: beccadax

lib/Macros/Sources/ObservationMacros/ObservableMacro.swift

@@ -276,8 +276,8 @@ extension ObservableMacro: ExtensionMacro {
         """
     let ext = decl.cast(ExtensionDeclSyntax.self)
 
-    if let availability = declaration.attributes.availability {
-      return [ext.with(\.attributes, availability)]
+    if let availability = declaration.header.attributes.availability {
+      return [ext.with(\.header.attributes, availability)]
     } else {
       return [ext]
     }

lib/Macros/Sources/SwiftMacros/DebugDescriptionMacro.swift

@@ -396,7 +396,7 @@ extension DeclGroupSyntax {
     case .actorDecl, .classDecl, .enumDecl, .structDecl:
       return self.asProtocol(NamedDeclSyntax.self)?.name.text
     case .extensionDecl:
-      return self.as(ExtensionDeclSyntax.self)?.extendedType.trimmedDescription
+      return self.as(ExtensionDeclSyntax.self)?.extensionHeader.extendedType.trimmedDescription
     default:
       // New types of decls are not presumed to be valid.
       return nil

lib/Macros/Sources/SwiftMacros/DistributedResolvableMacro.swift

@@ -44,7 +44,8 @@ extension DistributedResolvableMacro {
       return []
     }
 
-    let accessModifiers = proto.accessControlModifiers
+    let protoHeader = proto.protocolHeader
+    let accessModifiers = protoHeader.accessControlModifiers
 
     let requirementStubs =
       proto.memberBlock.members // requirements
@@ -63,7 +64,7 @@ extension DistributedResolvableMacro {
 
     let extensionDecl: DeclSyntax =
       """
-      extension \(proto.name.trimmed) where Self: Distributed._DistributedActorStub {
+      extension \(protoHeader.name.trimmed) where Self: Distributed._DistributedActorStub {
         \(raw: requirementStubs)
       }
       """
@@ -132,9 +133,10 @@ extension DistributedResolvableMacro {
     var isGenericStub = false
     var specificActorSystemRequirement: TypeSyntax?
 
-    let accessModifiers = proto.accessControlModifiers
+    let protoHeader = proto.protocolHeader
+    let accessModifiers = protoHeader.accessControlModifiers
 
-    for req in proto.genericWhereClause?.requirements ?? [] {
+    for req in protoHeader.genericWhereClause?.requirements ?? [] {
       switch req.requirement {
       case .conformanceRequirement(let conformanceReq)
            where conformanceReq.leftType.isActorSystem:
@@ -154,7 +156,7 @@ extension DistributedResolvableMacro {
     if isGenericStub, let specificActorSystemRequirement {
       return [
         """
-        \(proto.modifiers) distributed actor $\(proto.name.trimmed)<ActorSystem>: \(proto.name.trimmed), 
+        \(protoHeader.modifiers) distributed actor $\(protoHeader.name.trimmed)<ActorSystem>: \(protoHeader.name.trimmed),
           Distributed._DistributedActorStub
           where ActorSystem: \(specificActorSystemRequirement) 
         { }
@@ -163,7 +165,7 @@ extension DistributedResolvableMacro {
     } else if let specificActorSystemRequirement {
       return [
         """
-        \(proto.modifiers) distributed actor $\(proto.name.trimmed): \(proto.name.trimmed), 
+        \(protoHeader.modifiers) distributed actor $\(protoHeader.name.trimmed): \(protoHeader.name.trimmed),
           Distributed._DistributedActorStub
         { 
           \(typealiasActorSystem(access: accessModifiers, proto, specificActorSystemRequirement)) 
@@ -179,7 +181,7 @@ extension DistributedResolvableMacro {
       // or extensions providing it.
       return [
         """
-        \(proto.modifiers) distributed actor $\(proto.name.trimmed): \(proto.name.trimmed), 
+        \(protoHeader.modifiers) distributed actor $\(protoHeader.name.trimmed): \(protoHeader.name.trimmed), 
           Distributed._DistributedActorStub
         {
         }

lib/Macros/Sources/SwiftMacros/OptionSetMacro.swift

@@ -99,7 +99,7 @@ public struct OptionSetMacro {
     // Find the option enum within the struct.
     let optionsEnums: [EnumDeclSyntax] = decl.memberBlock.members.compactMap({ member in
       if let enumDecl = member.decl.as(EnumDeclSyntax.self),
-         enumDecl.name.text == optionsEnumName {
+         enumDecl.enumHeader.name.text == optionsEnumName {
         return enumDecl
       }
 
@@ -169,12 +169,12 @@ extension OptionSetMacro: MemberMacro {
     }
 
     // Dig out the access control keyword we need.
-    let access = decl.modifiers.first(where: \.isNeededAccessLevelModifier)
+    let access = decl.header.modifiers.first(where: \.isNeededAccessLevelModifier)
 
     let staticVars = caseElements.map { (element) -> DeclSyntax in
       """
       \(access) static let \(element.name): Self =
-        Self(rawValue: 1 << \(optionsEnum.name).\(element.name).rawValue)
+        Self(rawValue: 1 << \(optionsEnum.enumHeader.name).\(element.name).rawValue)
       """
     }
 

lib/Macros/Sources/SwiftMacros/SyntaxExtensions.swift

@@ -16,9 +16,9 @@ import SwiftSyntax
 import SwiftSyntaxMacros
 import SwiftDiagnostics
 
-extension DeclGroupSyntax {
+extension DeclGroupHeaderSyntaxProtocol {
   internal var accessControlModifiers: DeclModifierListSyntax {
-      modifiers.filter { modifier in
+    modifiers.filter { modifier in
       modifier.isAccessControl
     }
   }
@@ -43,4 +43,4 @@ extension ImplicitlyUnwrappedOptionalTypeSyntax {
       trailingTrivia: self.trailingTrivia
     )
   }
-}
+}