Skip to content

Support SwiftSyntax 602. #3776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 17, 2025
Merged

Support SwiftSyntax 602. #3776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f42d110
Support SwiftSyntax 602.
mbrandonw Sep 17, 2025
9212e31
Re-record snapshots.
mbrandonw Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ let package = Package(
.package(url: "https://github.com/pointfreeco/swift-sharing", "0.1.2"..<"3.0.0"),
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.3.0"),
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.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(
Expand Down
2 changes: 1 addition & 1 deletion [email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ let package = Package(
.package(url: "https://github.com/pointfreeco/swift-sharing", "0.1.2"..<"3.0.0"),
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.3.0"),
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.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(
Expand Down
78 changes: 78 additions & 0 deletions Tests/ComposableArchitectureMacrosTests/ReducerMacroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,12 @@
enum CaseScope {
}
#if swift(<5.10)
@MainActor(unsafe)
#else
@preconcurrency @MainActor
#endif
Copy link
Member Author

@mbrandonw mbrandonw Sep 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few fixes from SwiftSyntax 602 macro expansion tools.

static func scope(_ store: ComposableArchitecture.Store<Self.State, Self.Action>) -> CaseScope {
switch store.state {
Expand Down Expand Up @@ -320,6 +326,12 @@
case tweet(ComposableArchitecture.StoreOf<Tweet>)
case alert(AlertState<Alert>)
}
#if swift(<5.10)
@MainActor(unsafe)
#else
@preconcurrency @MainActor
#endif
static func scope(_ store: ComposableArchitecture.Store<Self.State, Self.Action>) -> CaseScope {
switch store.state {
case .activity:
Expand Down Expand Up @@ -384,6 +396,12 @@
case timeline(ComposableArchitecture.StoreOf<Timeline>)
case meeting(ComposableArchitecture.StoreOf<Meeting>)
}
#if swift(<5.10)
@MainActor(unsafe)
#else
@preconcurrency @MainActor
#endif
static func scope(_ store: ComposableArchitecture.Store<Self.State, Self.Action>) -> CaseScope {
switch store.state {
case .timeline:
Expand Down Expand Up @@ -432,6 +450,12 @@
enum CaseScope {
}
#if swift(<5.10)
@MainActor(unsafe)
#else
@preconcurrency @MainActor
#endif
static func scope(_ store: ComposableArchitecture.Store<Self.State, Self.Action>) -> CaseScope {
switch store.state {
Expand Down Expand Up @@ -482,6 +506,12 @@
}
#if swift(<5.10)
@MainActor(unsafe)
#else
@preconcurrency @MainActor
#endif
package static func scope(_ store: ComposableArchitecture.Store<Self.State, Self.Action>) -> CaseScope {
switch store.state {
Expand Down Expand Up @@ -532,6 +562,12 @@
}
#if swift(<5.10)
@MainActor(unsafe)
#else
@preconcurrency @MainActor
#endif
public static func scope(_ store: ComposableArchitecture.Store<Self.State, Self.Action>) -> CaseScope {
switch store.state {
Expand Down Expand Up @@ -580,6 +616,12 @@
enum CaseScope {
case alert(AlertState<Never>)
}
#if swift(<5.10)
@MainActor(unsafe)
#else
@preconcurrency @MainActor
#endif
static func scope(_ store: ComposableArchitecture.Store<Self.State, Self.Action>) -> CaseScope {
switch store.state {
case let .alert(v0):
Expand Down Expand Up @@ -638,6 +680,12 @@
case activity(ComposableArchitecture.StoreOf<Activity>)
case timeline(ComposableArchitecture.StoreOf<Timeline>)
}
#if swift(<5.10)
@MainActor(unsafe)
#else
@preconcurrency @MainActor
#endif
static func scope(_ store: ComposableArchitecture.Store<Self.State, Self.Action>) -> CaseScope {
switch store.state {
case .activity:
Expand Down Expand Up @@ -697,6 +745,12 @@
case timeline(ComposableArchitecture.StoreOf<Timeline>)
case meeting(Meeting)
}
#if swift(<5.10)
@MainActor(unsafe)
#else
@preconcurrency @MainActor
#endif
static func scope(_ store: ComposableArchitecture.Store<Self.State, Self.Action>) -> CaseScope {
switch store.state {
case .timeline:
Expand Down Expand Up @@ -760,6 +814,12 @@
case dialog(ConfirmationDialogState<Dialog>)
case meeting(Meeting, syncUp: SyncUp)
}
#if swift(<5.10)
@MainActor(unsafe)
#else
@preconcurrency @MainActor
#endif
static func scope(_ store: ComposableArchitecture.Store<Self.State, Self.Action>) -> CaseScope {
switch store.state {
case let .alert(v0):
Expand Down Expand Up @@ -830,6 +890,12 @@
case popover(ComposableArchitecture.StoreOf<Counter>)
case sheet(ComposableArchitecture.StoreOf<Counter>)
}
#if swift(<5.10)
@MainActor(unsafe)
#else
@preconcurrency @MainActor
#endif
static func scope(_ store: ComposableArchitecture.Store<Self.State, Self.Action>) -> CaseScope {
switch store.state {
case .drillDown:
Expand Down Expand Up @@ -884,6 +950,12 @@
enum CaseScope {
case feature(ComposableArchitecture.StoreOf<Nested.Feature>)
}
#if swift(<5.10)
@MainActor(unsafe)
#else
@preconcurrency @MainActor
#endif
static func scope(_ store: ComposableArchitecture.Store<Self.State, Self.Action>) -> CaseScope {
switch store.state {
case .feature:
Expand Down Expand Up @@ -1246,6 +1318,12 @@
#endif
}
#if swift(<5.10)
@MainActor(unsafe)
#else
@preconcurrency @MainActor
#endif
static func scope(_ store: ComposableArchitecture.Store<Self.State, Self.Action>) -> CaseScope {
switch store.state {
case .child:
Expand Down
Loading