Bump swift-syntax to 510.0 (pointfreeco#47)

* Bump swift-syntax to 510.0

* fix

Author: stephencelis

Package.resolved

@@ -15,7 +15,7 @@ let package = Package(
     .library(name: "Perception", targets: ["Perception"])
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-syntax", from: "509.0.0"),
+    .package(url: "https://github.com/apple/swift-syntax", "509.0.0"..<"511.0.0"),
     .package(url: "https://github.com/apple/swift-collections", from: "1.0.0"),
     .package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.1.0"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.0.0"),

Package.swift

@@ -41,7 +41,7 @@ extension VariableDeclSyntax {
 
   func accessorsMatching(_ predicate: (TokenKind) -> Bool) -> [AccessorDeclSyntax] {
     let patternBindings = bindings.compactMap { binding in
-      binding.as(PatternBindingSyntax.self)
+      binding
     }
     let accessors: [AccessorDeclListSyntax.Element] = patternBindings.compactMap { patternBinding in
       switch patternBinding.accessorBlock?.accessors {
@@ -52,14 +52,7 @@ extension VariableDeclSyntax {
       }
     }.flatMap { $0 }
     return accessors.compactMap { accessor in
-      guard let decl = accessor.as(AccessorDeclSyntax.self) else {
-        return nil
-      }
-      if predicate(decl.accessorSpecifier.tokenKind) {
-        return decl
-      } else {
-        return nil
-      }
+      predicate(accessor.accessorSpecifier.tokenKind) ? accessor : nil
     }
   }
 
@@ -215,7 +208,7 @@ extension DeclGroupSyntax {
   var memberFunctionStandins: [FunctionDeclSyntax.SignatureStandin] {
     var standins = [FunctionDeclSyntax.SignatureStandin]()
     for member in memberBlock.members {
-      if let function = member.as(MemberBlockItemSyntax.self)?.decl.as(FunctionDeclSyntax.self) {
+      if let function = member.decl.as(FunctionDeclSyntax.self) {
         standins.append(function.signatureStandin)
       }
     }
@@ -224,7 +217,7 @@ extension DeclGroupSyntax {
 
   func hasMemberFunction(equivalentTo other: FunctionDeclSyntax) -> Bool {
     for member in memberBlock.members {
-      if let function = member.as(MemberBlockItemSyntax.self)?.decl.as(FunctionDeclSyntax.self) {
+      if let function = member.decl.as(FunctionDeclSyntax.self) {
         if function.isEquivalent(to: other) {
           return true
         }
@@ -235,7 +228,7 @@ extension DeclGroupSyntax {
 
   func hasMemberProperty(equivalentTo other: VariableDeclSyntax) -> Bool {
     for member in memberBlock.members {
-      if let variable = member.as(MemberBlockItemSyntax.self)?.decl.as(VariableDeclSyntax.self) {
+      if let variable = member.decl.as(VariableDeclSyntax.self) {
         if variable.isEquivalent(to: other) {
           return true
         }
@@ -246,7 +239,7 @@ extension DeclGroupSyntax {
 
   var definedVariables: [VariableDeclSyntax] {
     memberBlock.members.compactMap { member in
-      if let variableDecl = member.as(MemberBlockItemSyntax.self)?.decl.as(VariableDeclSyntax.self)
+      if let variableDecl = member.decl.as(VariableDeclSyntax.self)
       {
         return variableDecl
       }

Sources/PerceptionMacros/Extensions.swift

@@ -48,11 +48,11 @@ public struct PerceptibleMacro {
     return
       """
       internal nonisolated func access<Member>(
-          keyPath: KeyPath<\(perceptibleType), Member>,
-          file: StaticString = #file,
-          line: UInt = #line
+      keyPath: KeyPath<\(perceptibleType), Member>,
+      file: StaticString = #file,
+      line: UInt = #line
       ) {
-        \(raw: registrarVariableName).access(self, keyPath: keyPath, file: file, line: line)
+      \(raw: registrarVariableName).access(self, keyPath: keyPath, file: file, line: line)
       }
       """
   }
@@ -61,10 +61,10 @@ public struct PerceptibleMacro {
     return
       """
       internal nonisolated func withMutation<Member, MutationResult>(
-        keyPath: KeyPath<\(perceptibleType), Member>,
-        _ mutation: () throws -> MutationResult
+      keyPath: KeyPath<\(perceptibleType), Member>,
+      _ mutation: () throws -> MutationResult
       ) rethrows -> MutationResult {
-        try \(raw: registrarVariableName).withMutation(of: self, keyPath: keyPath, mutation)
+      try \(raw: registrarVariableName).withMutation(of: self, keyPath: keyPath, mutation)
       }
       """
   }
@@ -218,7 +218,7 @@ extension PerceptibleMacro: MemberMacro {
       return []
     }
 
-    let perceptibleType = identified.name
+    let perceptibleType = identified.name.trimmed
 
     if declaration.isEnum {
       // enumerations cannot store properties
@@ -333,7 +333,7 @@ public struct PerceptionTrackedMacro: AccessorMacro {
   ) throws -> [AccessorDeclSyntax] {
     guard let property = declaration.as(VariableDeclSyntax.self),
       property.isValidForPerception,
-      let identifier = property.identifier
+      let identifier = property.identifier?.trimmed
     else {
       return []
     }
@@ -346,24 +346,24 @@ public struct PerceptionTrackedMacro: AccessorMacro {
       """
       @storageRestrictions(initializes: _\(identifier))
       init(initialValue) {
-        _\(identifier) = initialValue
+      _\(identifier) = initialValue
       }
       """
 
     let getAccessor: AccessorDeclSyntax =
       """
       get {
-        access(keyPath: \\.\(identifier))
-        return _\(identifier)
+      access(keyPath: \\.\(identifier))
+      return _\(identifier)
       }
       """
 
     let setAccessor: AccessorDeclSyntax =
       """
       set {
-        withMutation(keyPath: \\.\(identifier)) {
-          _\(identifier) = newValue
-        }
+      withMutation(keyPath: \\.\(identifier)) {
+      _\(identifier) = newValue
+      }
       }
       """
 

Sources/PerceptionMacros/PerceptibleMacro.swift

@@ -6,7 +6,7 @@
   class PerceptionMacroTests: XCTestCase {
     override func invokeTest() {
       withMacroTesting(
-        //isRecording: true,
+        // isRecording: true,
         macros: [
           PerceptibleMacro.self,
           PerceptionTrackedMacro.self,
@@ -28,34 +28,34 @@
       } expansion: {
         #"""
         class Feature {
-          var count = 0 {
-            @storageRestrictions(initializes: _count )
+          var count {
+            @storageRestrictions(initializes: _count)
             init(initialValue) {
-              _count  = initialValue
+              _count = initialValue
             }
             get {
-              access(keyPath: \.count )
+              access(keyPath: \.count)
               return _count
             }
             set {
-              withMutation(keyPath: \.count ) {
-                _count  = newValue
+              withMutation(keyPath: \.count) {
+                _count = newValue
               }
             }
           }
 
           private let _$perceptionRegistrar = Perception.PerceptionRegistrar()
 
           internal nonisolated func access<Member>(
-              keyPath: KeyPath<Feature , Member>,
-              file: StaticString = #file,
-              line: UInt = #line
+            keyPath: KeyPath<Feature, Member>,
+            file: StaticString = #file,
+            line: UInt = #line
           ) {
             _$perceptionRegistrar.access(self, keyPath: keyPath, file: file, line: line)
           }
 
           internal nonisolated func withMutation<Member, MutationResult>(
-            keyPath: KeyPath<Feature , Member>,
+            keyPath: KeyPath<Feature, Member>,
             _ mutation: () throws -> MutationResult
           ) rethrows -> MutationResult {
             try _$perceptionRegistrar.withMutation(of: self, keyPath: keyPath, mutation)