Skip to content

Commit 9dae1ff

Browse files
stephencelisgithub-actions[bot]
authored andcommitted
Run swift-format
1 parent af60ed2 commit 9dae1ff

File tree

3 files changed

+28
-11
lines changed

3 files changed

+28
-11
lines changed

Sources/ComposableArchitecture/Macros.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,9 @@ public macro ReducerCaseIgnored() =
128128

129129
/// Defines and implements conformance of the Observable protocol.
130130
@attached(extension, conformances: Observable, ObservableState)
131-
@attached(member, names: named(_$id), named(_$observationRegistrar), named(_$willModify), named(shouldNotifyObservers))
131+
@attached(
132+
member, names: named(_$id), named(_$observationRegistrar), named(_$willModify),
133+
named(shouldNotifyObservers))
132134
@attached(memberAttribute)
133135
public macro ObservableState() =
134136
#externalMacro(module: "ComposableArchitectureMacros", type: "ObservableStateMacro")

Sources/ComposableArchitectureMacros/ObservableStateMacro.swift

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,31 +77,39 @@ public struct ObservableStateMacro {
7777
"""
7878
}
7979

80-
static func shouldNotifyObserversNonEquatableFunction(_ perceptibleType: TokenSyntax, context: some MacroExpansionContext) -> DeclSyntax {
80+
static func shouldNotifyObserversNonEquatableFunction(
81+
_ perceptibleType: TokenSyntax, context: some MacroExpansionContext
82+
) -> DeclSyntax {
8183
let memberGeneric = context.makeUniqueName("Member")
8284
return
8385
"""
8486
private nonisolated func shouldNotifyObservers<\(memberGeneric)>(_ lhs: \(memberGeneric), _ rhs: \(memberGeneric)) -> Bool { true }
8587
"""
8688
}
8789

88-
static func shouldNotifyObserversEquatableFunction(_ perceptibleType: TokenSyntax, context: some MacroExpansionContext) -> DeclSyntax {
90+
static func shouldNotifyObserversEquatableFunction(
91+
_ perceptibleType: TokenSyntax, context: some MacroExpansionContext
92+
) -> DeclSyntax {
8993
let memberGeneric = context.makeUniqueName("Member")
9094
return
9195
"""
9296
private nonisolated func shouldNotifyObservers<\(memberGeneric): Equatable>(_ lhs: \(memberGeneric), _ rhs: \(memberGeneric)) -> Bool { lhs != rhs }
9397
"""
9498
}
9599

96-
static func shouldNotifyObserversNonEquatableObjectFunction(_ perceptibleType: TokenSyntax, context: some MacroExpansionContext) -> DeclSyntax {
100+
static func shouldNotifyObserversNonEquatableObjectFunction(
101+
_ perceptibleType: TokenSyntax, context: some MacroExpansionContext
102+
) -> DeclSyntax {
97103
let memberGeneric = context.makeUniqueName("Member")
98104
return
99105
"""
100106
private nonisolated func shouldNotifyObservers<\(memberGeneric): AnyObject>(_ lhs: \(memberGeneric), _ rhs: \(memberGeneric)) -> Bool { lhs !== rhs }
101107
"""
102108
}
103109

104-
static func shouldNotifyObserversEquatableObjectFunction(_ perceptibleType: TokenSyntax, context: some MacroExpansionContext) -> DeclSyntax {
110+
static func shouldNotifyObserversEquatableObjectFunction(
111+
_ perceptibleType: TokenSyntax, context: some MacroExpansionContext
112+
) -> DeclSyntax {
105113
let memberGeneric = context.makeUniqueName("Member")
106114
return
107115
"""
@@ -330,10 +338,18 @@ extension ObservableStateMacro: MemberMacro {
330338
)
331339
declaration.addIfNeeded(ObservableStateMacro.idVariable(), to: &declarations)
332340
declaration.addIfNeeded(ObservableStateMacro.willModifyFunction(), to: &declarations)
333-
declaration.addIfNeeded(ObservableStateMacro.shouldNotifyObserversNonEquatableFunction(observableType, context: context), to: &declarations)
334-
declaration.addIfNeeded(ObservableStateMacro.shouldNotifyObserversEquatableFunction(observableType, context: context), to: &declarations)
335-
declaration.addIfNeeded(ObservableStateMacro.shouldNotifyObserversNonEquatableObjectFunction(observableType, context: context), to: &declarations)
336-
declaration.addIfNeeded(ObservableStateMacro.shouldNotifyObserversEquatableObjectFunction(observableType, context: context), to: &declarations)
341+
declaration.addIfNeeded(
342+
ObservableStateMacro.shouldNotifyObserversNonEquatableFunction(
343+
observableType, context: context), to: &declarations)
344+
declaration.addIfNeeded(
345+
ObservableStateMacro.shouldNotifyObserversEquatableFunction(observableType, context: context),
346+
to: &declarations)
347+
declaration.addIfNeeded(
348+
ObservableStateMacro.shouldNotifyObserversNonEquatableObjectFunction(
349+
observableType, context: context), to: &declarations)
350+
declaration.addIfNeeded(
351+
ObservableStateMacro.shouldNotifyObserversEquatableObjectFunction(
352+
observableType, context: context), to: &declarations)
337353

338354
return declarations
339355
}

Tests/ComposableArchitectureMacrosTests/ObservableStateMacroTests.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
final class ObservableStateMacroTests: MacroBaseTestCase {
99
override func invokeTest() {
10-
withMacroTesting(
11-
// record: .failed,
10+
withMacroTesting(// record: .failed,
1211
) {
1312
super.invokeTest()
1413
}

0 commit comments

Comments
 (0)