Support swift-syntax from 600.0.0-latest (#3160)

* Support swift-syntax from 600.0.0-latest

The Xcode 16 beta generates macro projects using these swift-syntax
snapshots. Luckily things seem to be backwards compatible, so we can
expand our supported range.

* wip

Author: stephencelis

ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -346,13 +346,13 @@ struct SpeakerArc: Shape {
     }
   }
 
-  private var degreesPerSpeaker: Double {
+  nonisolated private var degreesPerSpeaker: Double {
     360 / Double(totalSpeakers)
   }
-  private var startAngle: Angle {
+  nonisolated private var startAngle: Angle {
     Angle(degrees: degreesPerSpeaker * Double(speakerIndex) + 1)
   }
-  private var endAngle: Angle {
+  nonisolated private var endAngle: Angle {
     Angle(degrees: startAngle.degrees + degreesPerSpeaker - 1)
   }
 }

Examples/SyncUps/SyncUps/RecordMeeting.swift

@@ -19,19 +19,21 @@ final class AppFeatureTests: XCTestCase {
     }
 
     await store.send(\.path[id:0].detail.editButtonTapped) {
-      $0.path[id: 0]?.detail?.destination = .edit(
-        SyncUpForm.State(syncUp: syncUp)
-      )
+      $0.path[id: 0]?.modify(\.detail) { $0.destination = .edit(SyncUpForm.State(syncUp: syncUp)) }
     }
 
     syncUp.title = "Blob"
     await store.send(\.path[id:0].detail.destination.edit.binding.syncUp, syncUp) {
-      $0.path[id: 0]?.detail?.destination?.edit?.syncUp.title = "Blob"
+      $0.path[id: 0]?.modify(\.detail) {
+        $0.destination?.modify(\.edit) { $0.syncUp.title = "Blob" }
+      }
     }
 
     await store.send(\.path[id:0].detail.doneEditingButtonTapped) {
-      $0.path[id: 0]?.detail?.destination = nil
-      $0.path[id: 0]?.detail?.syncUp.title = "Blob"
+      $0.path[id: 0]?.modify(\.detail) {
+        $0.destination = nil
+        $0.syncUp.title = "Blob"
+      }
     }
     .finish()
   }
@@ -51,11 +53,11 @@ final class AppFeatureTests: XCTestCase {
     }
 
     await store.send(\.path[id:0].detail.deleteButtonTapped) {
-      $0.path[id: 0]?.detail?.destination = .alert(.deleteSyncUp)
+      $0.path[id: 0]?.modify(\.detail) { $0.destination = .alert(.deleteSyncUp) }
     }
 
     await store.send(\.path[id:0].detail.destination.alert.confirmDeletion) {
-      $0.path[id: 0, case: \.detail]?.destination = nil
+      $0.path[id: 0]?.modify(\.detail) { $0.destination = nil }
       $0.syncUpsList.syncUps = []
     }
 
@@ -109,13 +111,15 @@ final class AppFeatureTests: XCTestCase {
       XCTAssertEqual($0.path.count, 1)
     }
     store.assert {
-      $0.path[id: 0]?.detail?.syncUp.meetings = [
-        Meeting(
-          id: Meeting.ID(UUID(0)),
-          date: Date(timeIntervalSince1970: 1_234_567_890),
-          transcript: "I completed the project"
-        )
-      ]
+      $0.path[id: 0]?.modify(\.detail) {
+        $0.syncUp.meetings = [
+          Meeting(
+            id: Meeting.ID(UUID(0)),
+            date: Date(timeIntervalSince1970: 1_234_567_890),
+            transcript: "I completed the project"
+          )
+        ]
+      }
     }
   }
 }

Examples/SyncUps/SyncUpsTests/AppFeatureTests.swift

@@ -102,7 +102,7 @@ final class SyncUpDetailTests: XCTestCase {
 
     syncUp.title = "Blob's Meeting"
     await store.send(\.destination.edit.binding.syncUp, syncUp) {
-      $0.destination?.edit?.syncUp.title = "Blob's Meeting"
+      $0.destination?.modify(\.edit) { $0.syncUp.title = "Blob's Meeting" }
     }
 
     await store.send(.doneEditingButtonTapped) {

Examples/SyncUps/SyncUpsTests/SyncUpDetailTests.swift

@@ -24,7 +24,7 @@ final class SyncUpsListTests: XCTestCase {
 
     syncUp.title = "Engineering"
     await store.send(\.destination.add.binding.syncUp, syncUp) {
-      $0.destination?.add?.syncUp.title = "Engineering"
+      $0.destination?.modify(\.add) { $0.syncUp.title = "Engineering" }
     }
 
     await store.send(.confirmAddSyncUpButtonTapped) {

Examples/SyncUps/SyncUpsTests/SyncUpsListTests.swift

@@ -20,7 +20,7 @@ let package = Package(
   dependencies: [
     .package(url: "https://github.com/apple/swift-collections", from: "1.1.0"),
     .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
-    .package(url: "https://github.com/apple/swift-syntax", "509.0.0"..<"511.0.0"),
+    .package(url: "https://github.com/apple/swift-syntax", "509.0.0"..<"601.0.0"),
     .package(url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
     .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "1.0.0"),
     .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.3.0"),

[email protected]

@@ -35,10 +35,10 @@ struct NavigationIDPath: Hashable, Sendable {
 
 struct NavigationID: Hashable, @unchecked Sendable {
   private let kind: Kind
-  private let identifier: AnyHashableSendable?
+  private let identifier: AnyHashable?
   private let tag: UInt32?
 
-  enum Kind: Hashable, @unchecked Sendable {
+  enum Kind: Hashable {
     case casePath(root: Any.Type, value: Any.Type)
     case keyPath(AnyKeyPath)
 
@@ -73,7 +73,7 @@ struct NavigationID: Hashable, @unchecked Sendable {
     self.kind = .keyPath(keyPath)
     self.tag = EnumMetadata(Value.self)?.tag(of: base)
     if let id = _identifiableID(base) ?? EnumMetadata.project(base).flatMap(_identifiableID) {
-      self.identifier = AnyHashableSendable(id)
+      self.identifier = id
     } else {
       self.identifier = nil
     }
@@ -105,7 +105,7 @@ struct NavigationID: Hashable, @unchecked Sendable {
     self.kind = .casePath(root: Root.self, value: Value.self)
     self.tag = EnumMetadata(Root.self)?.tag(of: root)
     if let id = _identifiableID(root) ?? _identifiableID(value) {
-      self.identifier = AnyHashableSendable(id)
+      self.identifier = id
     } else {
       self.identifier = nil
     }

Sources/ComposableArchitecture/Internal/NavigationID.swift

@@ -6,15 +6,15 @@ extension PresentationState {
   }
 }
 
-struct PresentationID: Hashable, Identifiable, Sendable {
-  private let identifier: AnyHashableSendable?
+struct PresentationID: Hashable, Identifiable {
+  private let identifier: AnyHashable?
   private let tag: UInt32?
   private let type: Any.Type
 
   init<Base>(base: Base) {
     self.tag = EnumMetadata(Base.self)?.tag(of: base)
     if let id = _identifiableID(base) ?? EnumMetadata.project(base).flatMap(_identifiableID) {
-      self.identifier = AnyHashableSendable(id)
+      self.identifier = id
     } else {
       self.identifier = nil
     }

Sources/ComposableArchitecture/Internal/PresentationID.swift

@@ -12,7 +12,11 @@ public protocol ViewAction<ViewAction> {
 public protocol ViewActionSending<StoreState, StoreAction> {
   associatedtype StoreState
   associatedtype StoreAction: ViewAction
-  @MainActor(unsafe) var store: Store<StoreState, StoreAction> { get }
+  #if swift(>=5.10)
+    @MainActor @preconcurrency var store: Store<StoreState, StoreAction> { get }
+  #else
+    @MainActor(unsafe) var store: Store<StoreState, StoreAction> { get }
+  #endif
 }
 
 extension ViewActionSending {

Sources/ComposableArchitecture/Observation/ViewAction.swift

@@ -284,3 +284,15 @@ extension DeclGroupSyntax {
     return self.is(StructDeclSyntax.self)
   }
 }
+
+extension AttributedTypeSyntax {
+  var isInout: Bool {
+    #if canImport(SwiftSyntax600)
+      self.specifiers.contains(
+        where: { $0.as(SimpleTypeSpecifierSyntax.self)?.specifier.tokenKind == .keyword(.inout) }
+      ) == true
+    #else
+      self.specifier?.tokenKind == .keyword(.inout)
+    #endif
+  }
+}