Clean up macro implementation warnings

Author: natecook1000

lib/Macros/Sources/ObservationMacros/Extensions.swift

@@ -58,7 +58,7 @@ extension VariableDeclSyntax {
       guard let decl = accessor.as(AccessorDeclSyntax.self) else {
         return nil
       }
-      if predicate(decl.accessorKind.tokenKind) {
+      if predicate(decl.accessorSpecifier.tokenKind) {
         return decl
       } else {
         return nil
@@ -85,7 +85,7 @@ extension VariableDeclSyntax {
 
 
   var isImmutable: Bool {
-    return bindingKeyword.tokenKind == .keyword(.let)
+    return bindingSpecifier.tokenKind == .keyword(.let)
   }
 
   func isEquivalent(to other: VariableDeclSyntax) -> Bool {
@@ -198,9 +198,9 @@ extension FunctionDeclSyntax {
   var signatureStandin: SignatureStandin {
     var parameters = [String]()
     for parameter in signature.input.parameterList {
-      parameters.append(parameter.firstName.text + ":" + (parameter.type.genericSubstitution(genericParameterClause?.genericParameterList) ?? "" ))
+      parameters.append(parameter.firstName.text + ":" + (parameter.type.genericSubstitution(genericParameterClause?.parameters) ?? "" ))
     }
-    let returnType = signature.output?.returnType.genericSubstitution(genericParameterClause?.genericParameterList) ?? "Void"
+    let returnType = signature.output?.returnType.genericSubstitution(genericParameterClause?.parameters) ?? "Void"
     return SignatureStandin(isInstance: isInstance, identifier: identifier.text, parameters: parameters, returnType: returnType)
   }
 

lib/Macros/Sources/ObservationMacros/ObservableMacro.swift

@@ -71,7 +71,7 @@ public struct ObservableMacro {
   static var ignoredAttribute: AttributeSyntax {
     AttributeSyntax(
       leadingTrivia: .space,
-      atSignToken: .atSignToken(),
+      atSign: .atSignToken(),
       attributeName: SimpleTypeIdentifierSyntax(name: .identifier(ignoredMacroName)),
       trailingTrivia: .space
     )
@@ -173,12 +173,14 @@ extension PatternBindingListSyntax {
 }
 
 extension VariableDeclSyntax {
-    func privatePrefixed(_ prefix: String, addingAttribute attribute: AttributeSyntax) -> VariableDeclSyntax {
-    VariableDeclSyntax(
+  func privatePrefixed(_ prefix: String, addingAttribute attribute: AttributeSyntax) -> VariableDeclSyntax {
+    let newAttributes = AttributeListSyntax(
+      (attributes.map(Array.init) ?? []) + [.attribute(attribute)])
+    return VariableDeclSyntax(
       leadingTrivia: leadingTrivia,
-      attributes: attributes?.appending(.attribute(attribute)) ?? [.attribute(attribute)],
+      attributes: newAttributes,
       modifiers: modifiers?.privatePrefixed(prefix) ?? ModifierListSyntax(keyword: .private),
-      bindingKeyword: TokenSyntax(bindingKeyword.tokenKind, leadingTrivia: .space, trailingTrivia: .space, presence: .present),
+      bindingSpecifier: TokenSyntax(bindingSpecifier.tokenKind, leadingTrivia: .space, trailingTrivia: .space, presence: .present),
       bindings: bindings.privatePrefixed(prefix),
       trailingTrivia: trailingTrivia
     )