[Macros] Fix SwiftSyntax deprecation warnings

Author: ahoppen

lib/Macros/Sources/ObservationMacros/Availability.swift

@@ -51,7 +51,7 @@ extension IfConfigClauseSyntax {
   }
 
   var clonedAsIf: IfConfigClauseSyntax {
-    detached.with(\.poundKeyword, .poundIfKeyword())
+    detached.with(\.poundKeyword, .poundIfToken())
   }
 }
 

lib/Macros/Sources/ObservationMacros/Extensions.swift

@@ -45,7 +45,7 @@ extension VariableDeclSyntax {
     let patternBindings = bindings.compactMap { binding in
       binding.as(PatternBindingSyntax.self)
     }
-    let accessors: [AccessorListSyntax.Element] = patternBindings.compactMap { patternBinding in
+    let accessors: [AccessorDeclListSyntax.Element] = patternBindings.compactMap { patternBinding in
       switch patternBinding.accessorBlock?.accessors {
       case .accessors(let accessors):
         return accessors
@@ -217,7 +217,7 @@ extension DeclGroupSyntax {
   var memberFunctionStandins: [FunctionDeclSyntax.SignatureStandin] {
     var standins = [FunctionDeclSyntax.SignatureStandin]()
     for member in memberBlock.members {
-      if let function = member.as(MemberDeclListItemSyntax.self)?.decl.as(FunctionDeclSyntax.self) {
+      if let function = member.as(MemberBlockItemSyntax.self)?.decl.as(FunctionDeclSyntax.self) {
         standins.append(function.signatureStandin)
       }
     }
@@ -226,7 +226,7 @@ extension DeclGroupSyntax {
 
   func hasMemberFunction(equvalentTo other: FunctionDeclSyntax) -> Bool {
     for member in memberBlock.members {
-      if let function = member.as(MemberDeclListItemSyntax.self)?.decl.as(FunctionDeclSyntax.self) {
+      if let function = member.as(MemberBlockItemSyntax.self)?.decl.as(FunctionDeclSyntax.self) {
         if function.isEquivalent(to: other) {
           return true
         }
@@ -237,7 +237,7 @@ extension DeclGroupSyntax {
 
   func hasMemberProperty(equivalentTo other: VariableDeclSyntax) -> Bool {
     for member in memberBlock.members {
-      if let variable = member.as(MemberDeclListItemSyntax.self)?.decl.as(VariableDeclSyntax.self) {
+      if let variable = member.as(MemberBlockItemSyntax.self)?.decl.as(VariableDeclSyntax.self) {
         if variable.isEquivalent(to: other) {
           return true
         }
@@ -248,7 +248,7 @@ extension DeclGroupSyntax {
 
   var definedVariables: [VariableDeclSyntax] {
     memberBlock.members.compactMap { member in
-      if let variableDecl = member.as(MemberDeclListItemSyntax.self)?.decl.as(VariableDeclSyntax.self) {
+      if let variableDecl = member.as(MemberBlockItemSyntax.self)?.decl.as(VariableDeclSyntax.self) {
         return variableDecl
       }
       return nil

lib/Macros/Sources/ObservationMacros/ObservableMacro.swift

@@ -71,7 +71,7 @@ public struct ObservableMacro {
     AttributeSyntax(
       leadingTrivia: .space,
       atSign: .atSignToken(),
-      attributeName: SimpleTypeIdentifierSyntax(name: .identifier(ignoredMacroName)),
+      attributeName: IdentifierTypeSyntax(name: .identifier(ignoredMacroName)),
       trailingTrivia: .space
     )
   }
@@ -108,10 +108,10 @@ extension DiagnosticsError {
   }
 }
 
-extension ModifierListSyntax {
-  func privatePrefixed(_ prefix: String) -> ModifierListSyntax {
+extension DeclModifierListSyntax {
+  func privatePrefixed(_ prefix: String) -> DeclModifierListSyntax {
     let modifier: DeclModifierSyntax = DeclModifierSyntax(name: "private", trailingTrivia: .space)
-    return ModifierListSyntax([modifier] + filter {
+    return [modifier] + filter {
       switch $0.name.tokenKind {
       case .keyword(let keyword):
         switch keyword {
@@ -126,7 +126,7 @@ extension ModifierListSyntax {
       default:
         return true
       }
-    })
+    }
   }
 
   init(keyword: Keyword) {
@@ -178,7 +178,7 @@ extension VariableDeclSyntax {
     return VariableDeclSyntax(
       leadingTrivia: leadingTrivia,
       attributes: newAttributes,
-      modifiers: modifiers?.privatePrefixed(prefix) ?? ModifierListSyntax(keyword: .private),
+      modifiers: modifiers?.privatePrefixed(prefix) ?? DeclModifierListSyntax(keyword: .private),
       bindingSpecifier: TokenSyntax(bindingSpecifier.tokenKind, leadingTrivia: .space, trailingTrivia: .space, presence: .present),
       bindings: bindings.privatePrefixed(prefix),
       trailingTrivia: trailingTrivia
@@ -252,7 +252,7 @@ extension ObservableMacro: MemberAttributeMacro {
 
 
     return [
-      AttributeSyntax(attributeName: SimpleTypeIdentifierSyntax(name: .identifier(ObservableMacro.trackedMacroName)))
+      AttributeSyntax(attributeName: IdentifierTypeSyntax(name: .identifier(ObservableMacro.trackedMacroName)))
     ]
   }
 }

lib/Macros/Sources/SwiftMacros/OptionSetMacro.swift

@@ -47,7 +47,7 @@ private let optionsEnumNameArgumentLabel = "optionsName"
 /// eventually be overridable.
 private let defaultOptionsEnumName = "Options"
 
-extension TupleExprElementListSyntax {
+extension LabeledExprListSyntax {
   /// Retrieve the first element with the given label.
   func first(labeled name: String) -> Element? {
     return first { element in
@@ -75,7 +75,7 @@ public struct OptionSetMacro {
   ) -> (StructDeclSyntax, EnumDeclSyntax, TypeSyntax)? {
     // Determine the name of the options enum.
     let optionsEnumName: String
-    if case let .argumentList(arguments) = attribute.argument,
+    if case let .argumentList(arguments) = attribute.arguments,
        let optionEnumNameArg = arguments.first(labeled: optionsEnumNameArgumentLabel) {
       // We have a options name; make sure it is a string literal.
       guard let stringLiteral = optionEnumNameArg.expression.as(StringLiteralExprSyntax.self),
@@ -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.identifier.text == optionsEnumName {
+         enumDecl.name.text == optionsEnumName {
         return enumDecl
       }
 
@@ -112,8 +112,8 @@ public struct OptionSetMacro {
     }
 
     // Retrieve the raw type from the attribute.
-    guard let genericArgs = attribute.attributeName.as(SimpleTypeIdentifierSyntax.self)?.genericArgumentClause,
-          let rawType = genericArgs.arguments.first?.argumentType else {
+    guard let genericArgs = attribute.attributeName.as(IdentifierTypeSyntax.self)?.genericArgumentClause,
+          let rawType = genericArgs.arguments.first?.argument else {
       context.diagnose(OptionSetMacroDiagnostic.requiresOptionsEnumRawType.diagnose(at: attribute))
       return nil
     }
@@ -138,8 +138,8 @@ extension OptionSetMacro: ConformanceMacro {
     }
 
     // If there is an explicit conformance to OptionSet already, don't add one.
-    if let inheritedTypes = structDecl.inheritanceClause?.inheritedTypeCollection,
-       inheritedTypes.contains(where: { inherited in inherited.typeName.trimmedDescription == "OptionSet" }) {
+    if let inheritedTypes = structDecl.inheritanceClause?.inheritedTypes,
+       inheritedTypes.contains(where: { inherited in inherited.type.trimmedDescription == "OptionSet" }) {
       return []
     }
 
@@ -174,8 +174,8 @@ extension OptionSetMacro: MemberMacro {
 
     let staticVars = caseElements.map { (element) -> DeclSyntax in
       """
-      \(access) static let \(element.identifier): Self =
-        Self(rawValue: 1 << \(optionsEnum.identifier).\(element.identifier).rawValue)
+      \(access) static let \(element.name): Self =
+        Self(rawValue: 1 << \(optionsEnum.name).\(element.name).rawValue)
       """
     }