Skip to content

Revert "[Observation] ensure event triggers on deinitialization passes as if all properties that are being observed have changed (for weak storage)" #81727

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

Closed
wants to merge 1 commit into from
Closed

Revert "[Observation] ensure event triggers on deinitialization passes as if all properties that are being observed have changed (for weak storage)" #81727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 4 additions & 18 deletions stdlib/public/Observation/Sources/Observation/ObservationRegistrar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,9 @@ public struct ObservationRegistrar: Sendable {
}
}

internal mutating func deinitialize() -> [@Sendable () -> Void] {
var trackers = [@Sendable () -> Void]()
for (keyPath, ids) in lookups {
for id in ids {
if let tracker = observations[id]?.willSetTracker {
trackers.append({
tracker(keyPath)
})
}
}
}
internal mutating func cancelAll() {
observations.removeAll()
lookups.removeAll()
return trackers
}

internal mutating func willSet(keyPath: AnyKeyPath) -> [@Sendable (AnyKeyPath) -> Void] {
Expand Down Expand Up @@ -168,11 +157,8 @@ public struct ObservationRegistrar: Sendable {
state.withCriticalRegion { $0.cancel(id) }
}

internal func deinitialize() {
let tracking = state.withCriticalRegion { $0.deinitialize() }
for action in tracking {
action()
}
internal func cancelAll() {
state.withCriticalRegion { $0.cancelAll() }
}

internal func willSet<Subject: Observable, Member>(
Expand Down Expand Up @@ -203,7 +189,7 @@ public struct ObservationRegistrar: Sendable {
}

deinit {
context.deinitialize()
context.cancelAll()
}
}

Expand Down
31 changes: 0 additions & 31 deletions test/stdlib/Observation/Observable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,21 +287,6 @@ final class CowTest {
var container = CowContainer()
}

@Observable
final class DeinitTriggeredObserver {
var property: Int = 3
let deinitTrigger: () -> Void

init(_ deinitTrigger: @escaping () -> Void) {
self.deinitTrigger = deinitTrigger
}

deinit {
deinitTrigger()
}
}


@main
struct Validator {
@MainActor
Expand Down Expand Up @@ -526,22 +511,6 @@ struct Validator {
expectEqual(subject.container.id, startId)
}

suite.test("weak container observation") {
let changed = CapturedState(state: false)
let deinitialized = CapturedState(state: false)
var test = DeinitTriggeredObserver {
deinitialized.state = true
}
withObservationTracking { [weak test] in
_blackHole(test?.property)
} onChange: {
changed.state = true
}
test = DeinitTriggeredObserver { }
expectEqual(deinitialized.state, true)
expectEqual(changed.state, true)
}

runAllTests()
}
}
Expand Down