Merge pull request #67500 from ahoppen/ahoppen/accessor-refactoring

Adjustments for refactoring of representation of Accessors in SwiftSyntax

Author: ahoppen

lib/Macros/Sources/ObservationMacros/Extensions.swift

@@ -46,13 +46,13 @@ extension VariableDeclSyntax {
       binding.as(PatternBindingSyntax.self)
     }
     let accessors: [AccessorListSyntax.Element] = patternBindings.compactMap { patternBinding in
-      switch patternBinding.accessor {
+      switch patternBinding.accessorBlock?.accessors {
       case .accessors(let accessors):
         return accessors
       default:
         return nil
       }
-    }.flatMap { $0.accessors }
+    }.flatMap { $0 }
     return accessors.compactMap { accessor in
       guard let decl = accessor.as(AccessorDeclSyntax.self) else {
         return nil
@@ -76,9 +76,14 @@ extension VariableDeclSyntax {
     if accessorsMatching({ $0 == .keyword(.get) }).count > 0 {
       return true
     } else {
-      return bindings.compactMap { binding in
-        binding.as(PatternBindingSyntax.self)?.accessor?.as(CodeBlockSyntax.self)
-      }.count > 0
+      print("else branch")
+      return bindings.contains { binding in
+        if case .getter = binding.accessorBlock?.accessors {
+          return true
+        } else {
+          return false
+        }
+      }
     }
   }
 
@@ -196,11 +201,11 @@ extension FunctionDeclSyntax {
 
   var signatureStandin: SignatureStandin {
     var parameters = [String]()
-    for parameter in signature.input.parameterList {
+    for parameter in signature.parameterClause.parameters {
       parameters.append(parameter.firstName.text + ":" + (parameter.type.genericSubstitution(genericParameterClause?.parameters) ?? "" ))
     }
-    let returnType = signature.output?.returnType.genericSubstitution(genericParameterClause?.parameters) ?? "Void"
-    return SignatureStandin(isInstance: isInstance, identifier: identifier.text, parameters: parameters, returnType: returnType)
+    let returnType = signature.returnClause?.type.genericSubstitution(genericParameterClause?.parameters) ?? "Void"
+    return SignatureStandin(isInstance: isInstance, identifier: name.text, parameters: parameters, returnType: returnType)
   }
 
   func isEquivalent(to other: FunctionDeclSyntax) -> Bool {

lib/Macros/Sources/ObservationMacros/ObservableMacro.swift

@@ -160,7 +160,7 @@ extension PatternBindingListSyntax {
           ),
           typeAnnotation: binding.typeAnnotation,
           initializer: binding.initializer,
-          accessor: binding.accessor,
+          accessorBlock: binding.accessorBlock,
           trailingComma: binding.trailingComma,
           trailingTrivia: binding.trailingTrivia)
 
@@ -199,11 +199,11 @@ extension ObservableMacro: MemberMacro {
     providingMembersOf declaration: Declaration,
     in context: Context
   ) throws -> [DeclSyntax] {
-    guard let identified = declaration.asProtocol(IdentifiedDeclSyntax.self) else {
+    guard let identified = declaration.asProtocol(NamedDeclSyntax.self) else {
       return []
     }
 
-    let observableType = identified.identifier
+    let observableType = identified.name
 
     if declaration.isEnum {
       // enumerations cannot store properties

test/Macros/Inputs/syntax_macro_definitions.swift

@@ -467,11 +467,11 @@ extension PropertyWrapperMacro: PeerMacro {
   }
 }
 
-extension PatternBindingSyntax.Accessor {
+extension AccessorBlockSyntax {
   var hasGetter: Bool {
-    switch self {
+    switch self.accessors {
     case .accessors(let accessors):
-      for accessor in accessors.accessors {
+      for accessor in accessors {
         if accessor.accessorKind.text == "get" {
           return true
         }
@@ -769,12 +769,12 @@ extension VariableDeclSyntax {
     }
 
     let binding = bindings.first!
-    switch binding.accessor {
+    switch binding.accessorBlock?.accessors {
     case .none:
       return true
 
     case .accessors(let node):
-      for accessor in node.accessors {
+      for accessor in node {
         switch accessor.accessorKind.tokenKind {
         case .keyword(.willSet), .keyword(.didSet):
           // Observers can occur on a stored property.

test/SourceKit/Macros/macro_basic.swift

@@ -211,7 +211,6 @@ macro anonymousTypes(_: () -> String) = #externalMacro(module: "MacroDefinition"
 // NESTED_ATTACHED_EXPAND-NEXT:  get {
 // NESTED_ATTACHED_EXPAND-NEXT:    _storage.x
 // NESTED_ATTACHED_EXPAND-NEXT:  }
-// NESTED_ATTACHED_EXPAND-EMPTY:
 // NESTED_ATTACHED_EXPAND-NEXT:  set {
 // NESTED_ATTACHED_EXPAND-NEXT:    _storage.x = newValue
 // NESTED_ATTACHED_EXPAND-NEXT:  }
@@ -226,7 +225,6 @@ macro anonymousTypes(_: () -> String) = #externalMacro(module: "MacroDefinition"
 // ACCESSOR1_EXPAND-NEXT:  get {
 // ACCESSOR1_EXPAND-NEXT:    _storage.x
 // ACCESSOR1_EXPAND-NEXT:  }
-// ACCESSOR1_EXPAND-EMPTY:
 // ACCESSOR1_EXPAND-NEXT:  set {
 // ACCESSOR1_EXPAND-NEXT:    _storage.x = newValue
 // ACCESSOR1_EXPAND-NEXT:  }
@@ -241,7 +239,6 @@ macro anonymousTypes(_: () -> String) = #externalMacro(module: "MacroDefinition"
 // ACCESSOR2_EXPAND-NEXT:  get {
 // ACCESSOR2_EXPAND-NEXT:    _storage.y
 // ACCESSOR2_EXPAND-NEXT:  }
-// ACCESSOR2_EXPAND-EMPTY:
 // ACCESSOR2_EXPAND-NEXT:  set {
 // ACCESSOR2_EXPAND-NEXT:    _storage.y = newValue
 // ACCESSOR2_EXPAND-NEXT:  }

test/SourceKit/Macros/syntactic_expansion.swift.expected

@@ -15,7 +15,6 @@ source.edit.kind.active:
     get {
             _value.wrappedValue
       }
-
     set {
             _value.wrappedValue = newValue
       }
@@ -92,7 +91,6 @@ source.edit.kind.active:
     get {
             _value.wrappedValue
       }
-
     set {
             _value.wrappedValue = newValue
       }