Support SwiftSyntax 602 (#389)

* Support SwiftSyntax 602

* wip

* wip

Author: mbrandonw

Package.resolved

@@ -26,7 +26,7 @@ let package = Package(
     .package(url: "https://github.com/pointfreeco/swift-clocks", from: "1.0.4"),
     .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.4.0"),
-    .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"602.0.0"),
+    .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"603.0.0"),
   ],
   targets: [
     .target(

Package.swift

@@ -30,13 +30,13 @@ let package = Package(
     .package(url: "https://github.com/pointfreeco/swift-clocks", from: "1.0.4"),
     .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.4.0"),
-    .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"602.0.0"),
+    .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"603.0.0"),
   ],
   targets: [
     .target(
       name: "DependenciesTestObserver",
       dependencies: [
-        .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
+        .product(name: "IssueReporting", package: "xctest-dynamic-overlay")
       ]
     ),
     .target(
@@ -108,7 +108,7 @@ let package = Package(
         "DependenciesMacrosPlugin",
         .product(name: "MacroTesting", package: "swift-macro-testing"),
       ]
-    ),
+    )
   ])
 #endif
 

[email protected]

@@ -105,13 +105,14 @@ extension AsyncThrowingStream where Failure == Error {
 
 // MARK: -
 
+@available(*, deprecated)
+@_documentation(visibility: private)
 extension ActorIsolated {
   @available(
     *,
-    deprecated,
-    message: "Use the non-async version of 'withValue'."
+     deprecated,
+     message: "Use the non-async version of 'withValue'."
   )
-  @_documentation(visibility: private)
   public func withValue<T: Sendable>(
     _ operation: @Sendable (inout Value) async throws -> T
   ) async rethrows -> T where Value: Sendable {

Sources/Dependencies/Internal/Deprecations.swift

@@ -73,10 +73,22 @@ public enum DependencyClientMacro: MemberAttributeMacro, MemberMacro {
     return attributes
   }
 
-  public static func expansion<D: DeclGroupSyntax, C: MacroExpansionContext>(
+  #if canImport(SwiftSyntax602)
+  #else
+    public static func expansion<D: DeclGroupSyntax, C: MacroExpansionContext>(
+      of node: AttributeSyntax,
+      providingMembersOf declaration: D,
+      in context: C
+    ) throws -> [DeclSyntax] {
+      try expansion(of: node, providingMembersOf: declaration, conformingTo: [], in: context)
+    }
+  #endif
+
+  public static func expansion(
     of node: AttributeSyntax,
-    providingMembersOf declaration: D,
-    in context: C
+    providingMembersOf declaration: some DeclGroupSyntax,
+    conformingTo _: [TypeSyntax],
+    in context: some MacroExpansionContext
   ) throws -> [DeclSyntax] {
     guard let declaration = declaration.as(StructDeclSyntax.self)
     else {
@@ -116,7 +128,7 @@ public enum DependencyClientMacro: MemberAttributeMacro, MemberMacro {
         switch accessors {
         case .getter:
           continue
-        case let .accessors(accessors):
+        case .accessors(let accessors):
           if accessors.contains(where: { $0.accessorSpecifier.tokenKind == .keyword(.get) }) {
             continue
           }
@@ -295,7 +307,7 @@ extension VariableDeclSyntax {
   fileprivate func hasMacroAttached(_ macro: String) -> Bool {
     self.attributes.contains {
       guard
-        case let .attribute(attribute) = $0,
+        case .attribute(let attribute) = $0,
         let attributeName = attribute.attributeName.as(IdentifierTypeSyntax.self)?.name.text,
         [macro].qualified("DependenciesMacros").contains(attributeName)
       else { return false }

Sources/DependenciesMacrosPlugin/DependencyClientMacro.swift

@@ -953,7 +953,7 @@ final class DependencyEndpointMacroTests: BaseTestCase {
     } expansion: {
       #"""
       struct Client {
-        var endpoint: () -> Void // This is a comment {
+        var endpoint: () -> Void { // This is a comment
           get {
             _endpoint
           }

Tests/DependenciesMacrosPluginTests/DependencyEndpointMacroTests.swift

@@ -8,32 +8,32 @@ final class FireAndForgetTests: XCTestCase {
   #if !os(WASI)
     @MainActor
     func testTestContext() async throws {
-      let didExecute = ActorIsolated(false)
+      let didExecute = LockIsolated(false)
 
       await self.fireAndForget {
         try await Task.sleep(nanoseconds: 100_000_000)
-        await didExecute.setValue(true)
+        didExecute.setValue(true)
       }
 
-      let value = await didExecute.value
+      let value = didExecute.value
       XCTAssertEqual(value, true)
     }
 
     @MainActor
     func testTestContext_Cancellation() async throws {
-      let didExecute = ActorIsolated(false)
+      let didExecute = LockIsolated(false)
 
       let task = Task {
         await self.fireAndForget {
           try await Task.sleep(nanoseconds: 1_000_000_000)
-          await didExecute.setValue(true)
+          didExecute.setValue(true)
         }
       }
       try await Task.sleep(nanoseconds: 500_000_000)
       task.cancel()
       await task.value
 
-      let value = await didExecute.value
+      let value = didExecute.value
       XCTAssertEqual(value, true)
     }
 
@@ -42,18 +42,18 @@ final class FireAndForgetTests: XCTestCase {
       try await withDependencies {
         $0.context = .live
       } operation: {
-        let didExecute = ActorIsolated(false)
+        let didExecute = LockIsolated(false)
 
         await self.fireAndForget {
           try await Task.sleep(nanoseconds: 100_000_000)
-          await didExecute.setValue(true)
+          didExecute.setValue(true)
         }
 
-        var value = await didExecute.value
+        var value = didExecute.value
         XCTAssertEqual(value, false)
 
         try await Task.sleep(nanoseconds: 500_000_000)
-        value = await didExecute.value
+        value = didExecute.value
         XCTAssertEqual(value, true)
       }
     }
@@ -66,7 +66,7 @@ final class FireAndForgetTests: XCTestCase {
         $0.context = .live
         $0.date.now = Date(timeIntervalSince1970: 1_234_567_890)
       } operation: {
-        let date = ActorIsolated<Date?>(nil)
+        let date = LockIsolated<Date?>(nil)
 
         await self.fireAndForget(priority: .userInitiated) {
           @Dependency(\.date.now) var now: Date