From d2a9e0dcacd3022c516ff9ad903f8420ec894dc6 Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Fri, 15 Mar 2024 12:10:27 +0100 Subject: [PATCH 01/13] W --- packages/riverpod/lib/src/core/element.dart | 64 +++-- .../riverpod/lib/src/core/foundation.dart | 1 + .../lib/src/core/modifiers/select.dart | 23 +- .../lib/src/core/modifiers/select_async.dart | 3 + .../lib/src/core/provider/provider.dart | 4 +- .../lib/src/core/provider_container.dart | 6 +- .../src/core/proxy_provider_listenable.dart | 4 + packages/riverpod/lib/src/core/ref.dart | 4 +- packages/riverpod/lib/src/core/scheduler.dart | 6 +- .../test/new/core/auto_dispose_test.dart | 26 ++ .../test/new/core/modifiers/future_test.dart | 63 +++++ .../{ => modifiers}/select_async_test.dart | 2 +- .../test/new/core/modifiers/select_test.dart | 99 ++++++++ .../test/new/core/provider_element_test.dart | 184 +++++++++++++++ packages/riverpod/test/new/core/ref_test.dart | 111 ++++++++- .../riverpod/test/new/core/select_test.dart | 27 --- .../old/framework/provider_element_test.dart | 223 ------------------ .../test/old/framework/ref_watch_test.dart | 5 +- .../test/old/legacy/framework_test.dart | 19 -- 19 files changed, 570 insertions(+), 304 deletions(-) create mode 100644 packages/riverpod/test/new/core/modifiers/future_test.dart rename packages/riverpod/test/new/core/{ => modifiers}/select_async_test.dart (99%) create mode 100644 packages/riverpod/test/new/core/modifiers/select_test.dart create mode 100644 packages/riverpod/test/new/core/provider_element_test.dart delete mode 100644 packages/riverpod/test/new/core/select_test.dart delete mode 100644 packages/riverpod/test/old/framework/provider_element_test.dart diff --git a/packages/riverpod/lib/src/core/element.dart b/packages/riverpod/lib/src/core/element.dart index d55372e93..565d1de12 100644 --- a/packages/riverpod/lib/src/core/element.dart +++ b/packages/riverpod/lib/src/core/element.dart @@ -67,20 +67,32 @@ abstract class ProviderElement implements Node { Ref? ref; - /// Whether this [ProviderElement] is currently listened to or not. + /// Whether this [ProviderElement] is actively in use. /// - /// This maps to listeners added with [Ref.listen]. - /// See also [_mayNeedDispose], called when [hasListeners] may have changed. - bool get hasListeners => - (_dependents?.isNotEmpty ?? false) || _providerDependents.isNotEmpty; + /// A provider is considered not used if: + /// - it has no listeners + /// - all of its listeners are "weak" (i.e. created with `listen(weak: true)`) + /// + /// See also [_mayNeedDispose], called when [isActive] may have changed. + bool get isActive => + (_dependents?.isNotEmpty ?? false) || _watchDependents.isNotEmpty; var _dependencies = HashMap(); HashMap? _previousDependencies; List? _subscriptions; List? _dependents; + /// "listen(weak: true)" pointing to this provider. + /// + /// Those subscriptions are separate from [_dependents] for a few reasons: + /// - They do not count towards [isActive]. + /// - They may be reused between two instances of a [ProviderElement]. + /// + /// The list is passed by reference before [_mount] by [ProviderPointer]. + late final List _weakDependents; + /// The element of the providers that depends on this provider. - final _providerDependents = []; + final _watchDependents = []; bool _mustRecomputeState = false; bool _dependencyMayHaveChanged = false; @@ -95,6 +107,7 @@ abstract class ProviderElement implements Node { bool _debugDidSetState = false; bool _didBuild = false; + var _didMount = false; /* STATE */ Result? _stateResult; @@ -197,8 +210,7 @@ This could mean a few things: } /// Called the first time a provider is obtained. - @internal - void mount() { + void _mount() { if (kDebugMode) { _debugCurrentCreateHash = provider.debugGetCreateSourceHash(); } @@ -206,6 +218,7 @@ This could mean a few things: final ref = this.ref = Ref._(this); buildState(ref); + // TODO refactor to use notifyListeners(); switch (_stateResult!) { case final ResultData newState: final onChangeSelfListeners = ref._onChangeSelfListeners; @@ -219,6 +232,20 @@ This could mean a few things: } } + final listeners = _dependents?.toList(growable: false); + if (listeners != null) { + for (var i = 0; i < listeners.length; i++) { + final listener = listeners[i]; + if (listener is _ProviderStateSubscription) { + Zone.current.runBinaryGuarded( + listener.listener, + null, + newState.state, + ); + } + } + } + for (final observer in container.observers) { runTernaryGuarded( observer.didAddProvider, @@ -301,7 +328,7 @@ This could mean a few things: // Unsubscribe to everything that a provider no longer depends on. for (final sub in previousDependencies.entries) { sub.key - .._providerDependents.remove(this) + .._watchDependents.remove(this) .._onRemoveListener(); } _previousDependencies = null; @@ -330,6 +357,11 @@ This could mean a few things: /// [flush] from users, such that they don't need to care about invoking this function. @internal void flush() { + if (!_didMount) { + _didMount = true; + _mount(); + } + _maybeRebuildDependencies(); if (_mustRecomputeState) { _mustRecomputeState = false; @@ -495,8 +527,8 @@ The provider ${_debugCurrentlyBuildingElement!.origin} modified $origin while bu default: } - for (var i = 0; i < _providerDependents.length; i++) { - _providerDependents[i].invalidateSelf(asReload: true); + for (var i = 0; i < _watchDependents.length; i++) { + _watchDependents[i].invalidateSelf(asReload: true); } for (final observer in container.observers) { @@ -543,6 +575,7 @@ The provider ${_debugCurrentlyBuildingElement!.origin} modified $origin while bu ProviderSubscription listen( ProviderListenable listenable, void Function(T? previous, T value) listener, { + bool weak = false, void Function(Object error, StackTrace stackTrace)? onError, bool fireImmediately = false, // Not part of the public "Ref" API @@ -554,6 +587,7 @@ The provider ${_debugCurrentlyBuildingElement!.origin} modified $origin while bu final result = listenable.addListener( this, listener, + weak: weak, fireImmediately: fireImmediately, onError: onError, onDependencyMayHaveChanged: onDependencyMayHaveChanged, @@ -585,7 +619,7 @@ The provider ${_debugCurrentlyBuildingElement!.origin} modified $origin while bu if (provider.isAutoDispose) { final links = ref?._keepAliveLinks; - if (!hasListeners && (links == null || links.isEmpty)) { + if (!isActive && (links == null || links.isEmpty)) { container.scheduler.scheduleProviderDispose(this); } } @@ -666,7 +700,7 @@ The provider ${_debugCurrentlyBuildingElement!.origin} modified $origin while bu ref = null; for (final sub in _dependencies.entries) { - sub.key._providerDependents.remove(this); + sub.key._watchDependents.remove(this); sub.key._onRemoveListener(); } _dependencies.clear(); @@ -708,8 +742,8 @@ The provider ${_debugCurrentlyBuildingElement!.origin} modified $origin while bu required void Function(ProxyElementValueListenable element) listenableVisitor, }) { - for (var i = 0; i < _providerDependents.length; i++) { - elementVisitor(_providerDependents[i]); + for (var i = 0; i < _watchDependents.length; i++) { + elementVisitor(_watchDependents[i]); } final dependents = _dependents; diff --git a/packages/riverpod/lib/src/core/foundation.dart b/packages/riverpod/lib/src/core/foundation.dart index 17b26f39c..0c014cd84 100644 --- a/packages/riverpod/lib/src/core/foundation.dart +++ b/packages/riverpod/lib/src/core/foundation.dart @@ -176,6 +176,7 @@ mixin ProviderListenable implements ProviderListenableOrFamily { ProviderSubscription addListener( Node node, void Function(StateT? previous, StateT next) listener, { + required bool weak, required void Function(Object error, StackTrace stackTrace)? onError, required void Function()? onDependencyMayHaveChanged, required bool fireImmediately, diff --git a/packages/riverpod/lib/src/core/modifiers/select.dart b/packages/riverpod/lib/src/core/modifiers/select.dart index 944ad8024..15d21dc21 100644 --- a/packages/riverpod/lib/src/core/modifiers/select.dart +++ b/packages/riverpod/lib/src/core/modifiers/select.dart @@ -7,8 +7,9 @@ abstract class Node { ProviderSubscription listen( ProviderListenable listenable, void Function(StateT? previous, StateT next) listener, { - void Function(Object error, StackTrace stackTrace)? onError, - bool fireImmediately = false, + required void Function(Object error, StackTrace stackTrace)? onError, + required bool fireImmediately, + required bool weak, }); /// Reads the state of a provider, potentially creating it in the process. @@ -57,20 +58,21 @@ class _ProviderSelector with ProviderListenable { void _selectOnChange({ required InputT newState, - required Result lastSelectedValue, + required Result? lastSelectedValue, required void Function(Object error, StackTrace stackTrace) onError, required void Function(OutputT? prev, OutputT next) listener, required void Function(Result newState) onChange, }) { final newSelectedValue = _select(Result.data(newState)); - if (!lastSelectedValue.hasState || + if (lastSelectedValue == null || + !lastSelectedValue.hasState || !newSelectedValue.hasState || lastSelectedValue.requireState != newSelectedValue.requireState) { onChange(newSelectedValue); switch (newSelectedValue) { case ResultData(:final state): listener( - lastSelectedValue.stateOrNull, + lastSelectedValue?.stateOrNull, state, ); case ResultError(:final error, :final stackTrace): @@ -86,11 +88,11 @@ class _ProviderSelector with ProviderListenable { required void Function(Object error, StackTrace stackTrace)? onError, required void Function()? onDependencyMayHaveChanged, required bool fireImmediately, + required bool weak, }) { onError ??= Zone.current.handleUncaughtError; - late Result lastSelectedValue; - + Result? lastSelectedValue; final sub = node.listen( provider, (prev, input) { @@ -102,14 +104,16 @@ class _ProviderSelector with ProviderListenable { onChange: (newState) => lastSelectedValue = newState, ); }, + weak: weak, + fireImmediately: false, onError: onError, ); - lastSelectedValue = _select(Result.guard(sub.read)); + if (!weak) lastSelectedValue = _select(Result.guard(sub.read)); if (fireImmediately) { _handleFireImmediately( - lastSelectedValue, + lastSelectedValue!, listener: listener, onError: onError, ); @@ -120,6 +124,7 @@ class _ProviderSelector with ProviderListenable { sub, () { return switch (lastSelectedValue) { + null => read(node), ResultData(:final state) => state, ResultError(:final error, :final stackTrace) => throwErrorWithCombinedStackTrace( diff --git a/packages/riverpod/lib/src/core/modifiers/select_async.dart b/packages/riverpod/lib/src/core/modifiers/select_async.dart index a358d968e..5981cc432 100644 --- a/packages/riverpod/lib/src/core/modifiers/select_async.dart +++ b/packages/riverpod/lib/src/core/modifiers/select_async.dart @@ -38,6 +38,7 @@ class _AsyncSelector with ProviderListenable> { required void Function(Object error, StackTrace stackTrace)? onError, required void Function()? onDependencyMayHaveChanged, required bool fireImmediately, + required bool weak, }) { Result? lastSelectedValue; Completer? selectedCompleter; @@ -135,6 +136,8 @@ class _AsyncSelector with ProviderListenable> { provider, (prev, input) => playValue(input), onError: onError, + weak: weak, + fireImmediately: false, ); playValue(sub.read(), callListeners: false); diff --git a/packages/riverpod/lib/src/core/provider/provider.dart b/packages/riverpod/lib/src/core/provider/provider.dart index 5301f7995..ac9a2b2d2 100644 --- a/packages/riverpod/lib/src/core/provider/provider.dart +++ b/packages/riverpod/lib/src/core/provider/provider.dart @@ -56,13 +56,15 @@ abstract base class ProviderBase extends ProviderOrFamily void Function(StateT? previous, StateT next) listener, { required void Function(Object error, StackTrace stackTrace)? onError, required void Function()? onDependencyMayHaveChanged, + required bool weak, required bool fireImmediately, }) { onError ??= Zone.current.handleUncaughtError; final element = node.readProviderElement(this); - element.flush(); + if (!weak) element.flush(); + if (fireImmediately) { _handleFireImmediately( element.stateResult!, diff --git a/packages/riverpod/lib/src/core/provider_container.dart b/packages/riverpod/lib/src/core/provider_container.dart index 450c8ca9b..9d55f91e2 100644 --- a/packages/riverpod/lib/src/core/provider_container.dart +++ b/packages/riverpod/lib/src/core/provider_container.dart @@ -200,9 +200,7 @@ class ProviderDirectory implements _PointerBase { /// This has otherwise no impact unless there is a bug. pointer.element = element; - element - .._origin = origin - ..mount(); + element._origin = origin; } return pointer; @@ -752,6 +750,7 @@ class ProviderContainer implements Node { ProviderListenable provider, void Function(State? previous, State next) listener, { bool fireImmediately = false, + bool weak = false, void Function(Object error, StackTrace stackTrace)? onError, }) { return provider.addListener( @@ -759,6 +758,7 @@ class ProviderContainer implements Node { listener, fireImmediately: fireImmediately, onError: onError, + weak: weak, onDependencyMayHaveChanged: null, ); } diff --git a/packages/riverpod/lib/src/core/proxy_provider_listenable.dart b/packages/riverpod/lib/src/core/proxy_provider_listenable.dart index f7d883c5b..f4ef10ba6 100644 --- a/packages/riverpod/lib/src/core/proxy_provider_listenable.dart +++ b/packages/riverpod/lib/src/core/proxy_provider_listenable.dart @@ -81,6 +81,7 @@ class ProviderElementProxy required void Function(Object error, StackTrace stackTrace)? onError, required void Function()? onDependencyMayHaveChanged, required bool fireImmediately, + required bool weak, }) { final element = node.readProviderElement(provider); @@ -93,6 +94,9 @@ class ProviderElementProxy final innerSub = node.listen( provider, (prev, next) {}, + weak: weak, + fireImmediately: false, + onError: null, ); final notifier = _lense(element); diff --git a/packages/riverpod/lib/src/core/ref.dart b/packages/riverpod/lib/src/core/ref.dart index d0641f586..b235a2a7b 100644 --- a/packages/riverpod/lib/src/core/ref.dart +++ b/packages/riverpod/lib/src/core/ref.dart @@ -568,7 +568,7 @@ final = Provider(dependencies: []); element .._onListen() - .._providerDependents.add(_element); + .._watchDependents.add(_element); return Object(); }); @@ -603,11 +603,13 @@ final = Provider(dependencies: []); ProviderListenable provider, void Function(T? previous, T next) listener, { void Function(Object error, StackTrace stackTrace)? onError, + bool weak = false, bool fireImmediately = false, }) { return _element.listen( provider, listener, + weak: weak, onError: onError, fireImmediately: fireImmediately, ); diff --git a/packages/riverpod/lib/src/core/scheduler.dart b/packages/riverpod/lib/src/core/scheduler.dart index 75e1409f7..27ed24a74 100644 --- a/packages/riverpod/lib/src/core/scheduler.dart +++ b/packages/riverpod/lib/src/core/scheduler.dart @@ -98,13 +98,13 @@ class ProviderScheduler { /// child will automatically refresh its parent when it will try to read it for (var i = 0; i < _stateToRefresh.length; i++) { final element = _stateToRefresh[i]; - if (element.hasListeners) element.flush(); + if (element.isActive) element.flush(); } } void scheduleProviderDispose(ProviderElement element) { assert( - !element.hasListeners, + !element.isActive, 'Tried to dispose ${element.origin} , but still has listeners', ); @@ -124,7 +124,7 @@ class ProviderScheduler { final links = element.ref?._keepAliveLinks; if ((links != null && links.isNotEmpty) || - element.hasListeners || + element.isActive || element.container._disposed) { continue; } diff --git a/packages/riverpod/test/new/core/auto_dispose_test.dart b/packages/riverpod/test/new/core/auto_dispose_test.dart index e0d9723bf..6eb4b7c07 100644 --- a/packages/riverpod/test/new/core/auto_dispose_test.dart +++ b/packages/riverpod/test/new/core/auto_dispose_test.dart @@ -9,6 +9,32 @@ import 'provider_container_test.dart'; void main() { group('AutoDispose', () { + test( + 'onDispose is triggered only once if within autoDispose unmount, a dependency changed', + () async { + // regression test for https://github.com/rrousselGit/riverpod/issues/1064 + final container = ProviderContainer.test(); + final onDispose = OnDisposeMock(); + final dep = StateProvider((ref) => 0); + final provider = Provider.autoDispose((ref) { + ref.watch(dep); + ref.onDispose(onDispose.call); + }); + + when(onDispose()).thenAnswer((realInvocation) { + container.read(dep.notifier).state++; + }); + + container.read(provider); + verifyZeroInteractions(onDispose); + + // cause provider to be disposed + await container.pump(); + + verify(onDispose()).called(1); + verifyNoMoreInteractions(onDispose); + }); + test('supports disposing of overridden families', () async { // Regression test for https://github.com/rrousselGit/riverpod/issues/2480 final provider = Provider.autoDispose.family( diff --git a/packages/riverpod/test/new/core/modifiers/future_test.dart b/packages/riverpod/test/new/core/modifiers/future_test.dart new file mode 100644 index 000000000..db961a56d --- /dev/null +++ b/packages/riverpod/test/new/core/modifiers/future_test.dart @@ -0,0 +1,63 @@ +import 'package:mockito/mockito.dart'; +import 'package:riverpod/riverpod.dart'; +import 'package:test/test.dart'; + +import '../../utils.dart'; + +void main() { + group('provider.future', () { + group('handles listen(weak: true)', () { + test('common use-case ', () async { + var buildCount = 0; + final provider = FutureProvider((ref) { + buildCount++; + return 'Hello'; + }); + final container = ProviderContainer.test(); + final listener = Listener>(); + + container.listen( + provider.future, + listener.call, + weak: true, + ); + + verifyZeroInteractions(listener); + expect(buildCount, 0); + + container.read(provider); + + expect(buildCount, 1); + final [future as Future] = verifyOnly( + listener, + listener.call(argThat(isNull), captureAny), + ).captured; + expect(await future, 'Hello'); + }); + + test('calling `sub.read` on a weak listener will read the value', + () async { + final provider = FutureProvider((ref) => 'Hello'); + final container = ProviderContainer.test(); + final listener = Listener>(); + + final sub = container.listen( + provider.future, + listener.call, + weak: true, + ); + + verifyZeroInteractions(listener); + + expect(await sub.read(), 'Hello'); + + final [future as Future] = verifyOnly( + listener, + listener.call(argThat(isNull), captureAny), + ).captured; + + expect(await future, 'Hello'); + }); + }); + }); +} diff --git a/packages/riverpod/test/new/core/select_async_test.dart b/packages/riverpod/test/new/core/modifiers/select_async_test.dart similarity index 99% rename from packages/riverpod/test/new/core/select_async_test.dart rename to packages/riverpod/test/new/core/modifiers/select_async_test.dart index 8250c0841..2c75a54cc 100644 --- a/packages/riverpod/test/new/core/select_async_test.dart +++ b/packages/riverpod/test/new/core/modifiers/select_async_test.dart @@ -5,7 +5,7 @@ import 'package:riverpod/legacy.dart'; import 'package:riverpod/riverpod.dart'; import 'package:test/test.dart'; -import '../utils.dart'; +import '../../utils.dart'; void main() { group('If disposed before a value could be emitted', () { diff --git a/packages/riverpod/test/new/core/modifiers/select_test.dart b/packages/riverpod/test/new/core/modifiers/select_test.dart new file mode 100644 index 000000000..b55e50a9d --- /dev/null +++ b/packages/riverpod/test/new/core/modifiers/select_test.dart @@ -0,0 +1,99 @@ +import 'package:mockito/mockito.dart'; +import 'package:riverpod/legacy.dart'; +import 'package:riverpod/riverpod.dart'; +import 'package:test/test.dart'; + +import '../../utils.dart'; + +void main() { + group('provider.select', () { + test('handles when the selector throws', () { + final provider = Provider((ref) => Object()); + final container = ProviderContainer.test(); + + final errors = []; + container.read(provider); + final sub = container.listen( + provider.select((value) => throw StateError('Foo')), + (_, __) {}, + onError: (err, stack) => errors.add(err), + ); + + container.invalidate(provider); + + expect( + sub.read, + throwsA(isStateError.having((e) => e.message, 'message', 'Foo')), + ); + expect(errors, [isStateError.having((e) => e.message, 'message', 'Foo')]); + }); + + group('handles listen(weak: true)', () { + test('common use-case ', () { + final provider = StateProvider((ref) => 'Hello'); + final container = ProviderContainer.test(); + final listener = Listener(); + + container.listen( + provider.select((value) => value[0]), + listener.call, + weak: true, + ); + + verifyZeroInteractions(listener); + + container.read(provider); + + verifyOnly(listener, listener.call(null, 'H')); + + container.read(provider.notifier).state = 'World'; + + verifyOnly(listener, listener.call('H', 'W')); + + container.read(provider.notifier).state = 'Will not notify'; + + verifyNoMoreInteractions(listener); + }); + + test('calling `sub.read` on a weak listener will select the value', () { + final provider = StateProvider((ref) => 'Hello'); + final container = ProviderContainer.test(); + final listener = Listener(); + + final sub = container.listen( + provider.select((value) => value[0]), + listener.call, + weak: true, + ); + + verifyZeroInteractions(listener); + + expect(sub.read(), 'H'); + + verifyOnly(listener, listener.call(null, 'H')); + }); + + test( + 'after calling `sub.read`, notifications correctly compare the previous and new value ' + 'instead of considering that "previous" is missing.', () { + final provider = StateProvider((ref) => 'Hello'); + final container = ProviderContainer.test(); + final listener = Listener(); + + final sub = container.listen( + provider.select((value) => value[0]), + listener.call, + weak: true, + ); + + sub.read(); + + verifyOnly(listener, listener.call(null, 'H')); + + container.read(provider.notifier).state = 'Hi'; + + verifyNoMoreInteractions(listener); + }); + }); + }); +} diff --git a/packages/riverpod/test/new/core/provider_element_test.dart b/packages/riverpod/test/new/core/provider_element_test.dart new file mode 100644 index 000000000..7d83f92e9 --- /dev/null +++ b/packages/riverpod/test/new/core/provider_element_test.dart @@ -0,0 +1,184 @@ +import 'package:mockito/mockito.dart'; +import 'package:riverpod/src/internals.dart'; +import 'package:test/test.dart'; + +import '../../old/utils.dart'; + +void main() { + group('ProviderElement', () { + test( + 'does not throw outdated error when a dependency is flushed while the dependent is building', + () async { + final container = ProviderContainer.test(); + final a = StateProvider((ref) => 0); + + final dep = Provider((ref) { + return ref.watch(a) + 10; + }); + final dependent = Provider((ref) { + if (ref.watch(a) > 0) { + ref.watch(dep); + // Voluntarily using "watch" twice. + // When `dep` is flushed, it could cause subsequent "watch" calls to throw + // because `dependent` is considered as outdated + return ref.watch(dep); + } + return null; + }); + final listener = Listener(); + + expect(container.read(dep), 10); + container.listen(dependent, listener.call, fireImmediately: true); + + verifyOnly(listener, listener(null, null)); + + // schedules `dep` and `dependent` to rebuild + // Will build `dependent` before `dep` because `dependent` doesn't depend on `dep` yet + // And since nothing is watchin `dep` at the moment, then `dependent` will + // rebuild before `dep` even though `dep` is its ancestor. + // This is fine since nothing is listening to `dep` yet, but it should + // not cause certain assertions to trigger + container.read(a.notifier).state++; + await container.pump(); + + verifyOnly(listener, listener(null, 11)); + }); + + group('readSelf', () { + test('throws on providers that threw', () { + final container = ProviderContainer.test(); + final provider = Provider((ref) => throw UnimplementedError()); + + final element = container.readProviderElement(provider); + + expect( + element.readSelf, + throwsUnimplementedError, + ); + }); + }); + + group('visitChildren', () { + test('includes ref.watch dependents', () { + final container = ProviderContainer.test(); + final provider = Provider((ref) => 0); + final dependent = Provider((ref) { + ref.watch(provider); + }); + final dependent2 = Provider((ref) { + ref.watch(provider); + }); + + container.read(dependent); + container.read(dependent2); + + final children = []; + + container.readProviderElement(provider).visitChildren( + elementVisitor: children.add, + listenableVisitor: (_) {}, + ); + expect( + children, + unorderedMatches([ + isA() + .having((e) => e.provider, 'provider', dependent), + isA() + .having((e) => e.provider, 'provider', dependent2), + ]), + ); + }); + + test('includes ref.listen dependents', () { + final container = ProviderContainer.test(); + final provider = Provider((ref) => 0); + final dependent = Provider((ref) { + ref.listen(provider, (_, __) {}); + }); + final dependent2 = Provider((ref) { + ref.listen(provider, (_, __) {}); + }); + + container.read(dependent); + container.read(dependent2); + + final children = []; + + container.readProviderElement(provider).visitChildren( + elementVisitor: children.add, + listenableVisitor: (_) {}, + ); + expect( + children, + unorderedMatches([ + isA() + .having((e) => e.provider, 'provider', dependent), + isA() + .having((e) => e.provider, 'provider', dependent2), + ]), + ); + }); + }); + + group('hasListeners', () { + test('includes provider listeners', () async { + final provider = Provider((ref) => 0); + final dep = Provider((ref) { + ref.listen(provider, (prev, value) {}); + }); + final container = ProviderContainer.test(); + + expect(container.readProviderElement(provider).hasListeners, false); + + container.read(dep); + + expect(container.readProviderElement(provider).hasListeners, true); + }); + + test('includes provider dependents', () async { + final provider = Provider((ref) => 0); + final dep = Provider((ref) { + ref.watch(provider); + }); + final container = ProviderContainer.test(); + + expect(container.readProviderElement(provider).hasListeners, false); + + container.read(dep); + + expect(container.readProviderElement(provider).hasListeners, true); + }); + + test('includes container listeners', () async { + final provider = Provider((ref) => 0); + final container = ProviderContainer.test(); + + expect(container.readProviderElement(provider).hasListeners, false); + + container.listen(provider, (_, __) {}); + + expect(container.readProviderElement(provider).hasListeners, true); + }); + }); + + test('does not notify listeners when rebuilding the state', () async { + final container = ProviderContainer.test(); + final listener = Listener(); + + final dep = StateProvider((ref) => 0); + final provider = Provider((ref) { + ref.watch(dep); + return ref.state = 0; + }); + + container.listen(provider, listener.call, fireImmediately: true); + + verifyOnly(listener, listener(null, 0)); + + container.read(dep.notifier).state++; + await container.pump(); + + verifyNoMoreInteractions(listener); + }); + }); +} diff --git a/packages/riverpod/test/new/core/ref_test.dart b/packages/riverpod/test/new/core/ref_test.dart index f0e375838..3ffc0921e 100644 --- a/packages/riverpod/test/new/core/ref_test.dart +++ b/packages/riverpod/test/new/core/ref_test.dart @@ -4,7 +4,11 @@ import 'package:mockito/mockito.dart'; import 'package:riverpod/legacy.dart'; import 'package:riverpod/riverpod.dart'; import 'package:riverpod/src/internals.dart' - show CircularDependencyError, UnmountedRefException; + show + CircularDependencyError, + ProviderContainerTest, + ProviderElement, + UnmountedRefException; import 'package:test/test.dart'; import '../utils.dart'; @@ -824,6 +828,111 @@ void main() { }); group('listen', () { + group('weak', () { + test('Mounts the element but does not initialize the provider', () { + final container = ProviderContainer.test(); + + final dep = StateProvider((ref) => 0); + final provider = Provider((ref) { + ref.listen( + dep, + weak: true, + (previous, next) {}, + ); + return 0; + }); + + container.read(provider); + + expect( + container.pointerManager.orphanPointers.pointers[dep]!.element, + isA>() + .having((e) => e.stateResult, 'stateResult', null), + ); + }); + + test('when finally mounting an element, notifies weak listeners', () { + final container = ProviderContainer.test(); + + final listener = Listener(); + final dep = StateProvider((ref) => 0); + final provider = Provider((ref) { + ref.listen(dep, weak: true, listener.call); + return 0; + }); + + container.read(provider); + + verifyZeroInteractions(listener); + + // Flush the provider + container.read(dep); + + verifyOnly(listener, listener(null, 0)); + }); + + test('when finally rebuilding a dirty element, notifies weak listeners', + () { + final container = ProviderContainer.test(); + + final listener = Listener(); + var result = 0; + final dep = StateProvider((ref) => result); + final provider = Provider((ref) { + ref.listen(dep, weak: true, listener.call); + return 0; + }); + + container.read(dep); + container.invalidate(dep); + result = 1; + + container.read(provider); + + verifyZeroInteractions(listener); + + // Flush the provider + container.read(dep); + + verifyOnly(listener, listener(0, 1)); + }); + + test( + 'adding a weak listener on an invalidated provider does not rebuild it', + () { + final container = ProviderContainer.test(); + var buildCount = 0; + final dep = StateProvider((ref) { + buildCount++; + return 0; + }); + final provider = Provider((ref) { + ref.listen(dep, weak: true, (previous, next) {}); + return 0; + }); + + container.read(dep); + container.invalidate(dep); + expect(buildCount, 1); + + container.read(provider); + + expect(buildCount, 1); + }); + + test('throws if specifying both weak and fireImmediately', () { + throw UnimplementedError(); + }); + + test('does not count towards the pause mechanism', () { + throw UnimplementedError(); + }); + + test('does not interfere with autoDispose', () { + throw UnimplementedError(); + }); + }); + test('ref.listen on outdated provider causes it to rebuild', () { final dep = StateProvider((ref) => 0); var buildCount = 0; diff --git a/packages/riverpod/test/new/core/select_test.dart b/packages/riverpod/test/new/core/select_test.dart deleted file mode 100644 index eb9c37a6b..000000000 --- a/packages/riverpod/test/new/core/select_test.dart +++ /dev/null @@ -1,27 +0,0 @@ -import 'package:riverpod/riverpod.dart'; -import 'package:test/test.dart'; - -void main() { - group('provider.select', () { - test('handles when the selector throws', () { - final provider = Provider((ref) => Object()); - final container = ProviderContainer.test(); - - final errors = []; - container.read(provider); - final sub = container.listen( - provider.select((value) => throw StateError('Foo')), - (_, __) {}, - onError: (err, stack) => errors.add(err), - ); - - container.invalidate(provider); - - expect( - sub.read, - throwsA(isStateError.having((e) => e.message, 'message', 'Foo')), - ); - expect(errors, [isStateError.having((e) => e.message, 'message', 'Foo')]); - }); - }); -} diff --git a/packages/riverpod/test/old/framework/provider_element_test.dart b/packages/riverpod/test/old/framework/provider_element_test.dart deleted file mode 100644 index 00c6720fb..000000000 --- a/packages/riverpod/test/old/framework/provider_element_test.dart +++ /dev/null @@ -1,223 +0,0 @@ -import 'package:mockito/mockito.dart'; -import 'package:riverpod/src/internals.dart'; -import 'package:test/test.dart'; - -import '../utils.dart'; - -void main() { - test( - 'onDispose is triggered only once if within autoDispose unmount, a dependency changed', - () async { - // regression test for https://github.com/rrousselGit/riverpod/issues/1064 - final container = ProviderContainer.test(); - final onDispose = OnDisposeMock(); - final dep = StateProvider((ref) => 0); - final provider = Provider.autoDispose((ref) { - ref.watch(dep); - ref.onDispose(onDispose.call); - }); - - when(onDispose()).thenAnswer((realInvocation) { - container.read(dep.notifier).state++; - }); - - container.read(provider); - verifyZeroInteractions(onDispose); - - // cause provider to be disposed - await container.pump(); - - verify(onDispose()).called(1); - verifyNoMoreInteractions(onDispose); - }); - - test( - 'does not throw outdated error when a dependency is flushed while the dependent is building', - () async { - final container = ProviderContainer.test(); - final a = StateProvider((ref) => 0); - - final dep = Provider((ref) { - return ref.watch(a) + 10; - }); - final dependent = Provider((ref) { - if (ref.watch(a) > 0) { - ref.watch(dep); - // Voluntarily using "watch" twice. - // When `dep` is flushed, it could cause subsequent "watch" calls to throw - // because `dependent` is considered as outdated - return ref.watch(dep); - } - return null; - }); - final listener = Listener(); - - expect(container.read(dep), 10); - container.listen(dependent, listener.call, fireImmediately: true); - - verifyOnly(listener, listener(null, null)); - - // schedules `dep` and `dependent` to rebuild - // Will build `dependent` before `dep` because `dependent` doesn't depend on `dep` yet - // And since nothing is watchin `dep` at the moment, then `dependent` will - // rebuild before `dep` even though `dep` is its ancestor. - // This is fine since nothing is listening to `dep` yet, but it should - // not cause certain assertions to trigger - container.read(a.notifier).state++; - await container.pump(); - - verifyOnly(listener, listener(null, 11)); - }); - - group('getState', () { - test('throws on providers that threw', () { - final container = ProviderContainer.test(); - final provider = Provider((ref) => throw UnimplementedError()); - - final element = container.readProviderElement(provider); - - expect( - element.stateResult, - isA>() - .having((e) => e.error, 'error', isUnimplementedError), - ); - }); - }); - - group('readSelf', () { - test('throws on providers that threw', () { - final container = ProviderContainer.test(); - final provider = Provider((ref) => throw UnimplementedError()); - - final element = container.readProviderElement(provider); - - expect( - element.readSelf, - throwsUnimplementedError, - ); - }); - }); - - group('visitChildren', () { - test('includes ref.watch dependents', () { - final container = ProviderContainer.test(); - final provider = Provider((ref) => 0); - final dependent = Provider((ref) { - ref.watch(provider); - }); - final dependent2 = Provider((ref) { - ref.watch(provider); - }); - - container.read(dependent); - container.read(dependent2); - - final children = []; - - container.readProviderElement(provider).visitChildren( - elementVisitor: children.add, - listenableVisitor: (_) {}, - ); - expect( - children, - unorderedMatches([ - isA() - .having((e) => e.provider, 'provider', dependent), - isA() - .having((e) => e.provider, 'provider', dependent2), - ]), - ); - }); - - test('includes ref.listen dependents', () { - final container = ProviderContainer.test(); - final provider = Provider((ref) => 0); - final dependent = Provider((ref) { - ref.listen(provider, (_, __) {}); - }); - final dependent2 = Provider((ref) { - ref.listen(provider, (_, __) {}); - }); - - container.read(dependent); - container.read(dependent2); - - final children = []; - - container.readProviderElement(provider).visitChildren( - elementVisitor: children.add, - listenableVisitor: (_) {}, - ); - expect( - children, - unorderedMatches([ - isA() - .having((e) => e.provider, 'provider', dependent), - isA() - .having((e) => e.provider, 'provider', dependent2), - ]), - ); - }); - }); - - group('hasListeners', () { - test('includes provider listeners', () async { - final provider = Provider((ref) => 0); - final dep = Provider((ref) { - ref.listen(provider, (prev, value) {}); - }); - final container = ProviderContainer.test(); - - expect(container.readProviderElement(provider).hasListeners, false); - - container.read(dep); - - expect(container.readProviderElement(provider).hasListeners, true); - }); - - test('includes provider dependents', () async { - final provider = Provider((ref) => 0); - final dep = Provider((ref) { - ref.watch(provider); - }); - final container = ProviderContainer.test(); - - expect(container.readProviderElement(provider).hasListeners, false); - - container.read(dep); - - expect(container.readProviderElement(provider).hasListeners, true); - }); - - test('includes container listeners', () async { - final provider = Provider((ref) => 0); - final container = ProviderContainer.test(); - - expect(container.readProviderElement(provider).hasListeners, false); - - container.listen(provider, (_, __) {}); - - expect(container.readProviderElement(provider).hasListeners, true); - }); - }); - - test('does not notify listeners when rebuilding the state', () async { - final container = ProviderContainer.test(); - final listener = Listener(); - - final dep = StateProvider((ref) => 0); - final provider = Provider((ref) { - ref.watch(dep); - return ref.state = 0; - }); - - container.listen(provider, listener.call, fireImmediately: true); - - verifyOnly(listener, listener(null, 0)); - - container.read(dep.notifier).state++; - await container.pump(); - - verifyNoMoreInteractions(listener); - }); -} diff --git a/packages/riverpod/test/old/framework/ref_watch_test.dart b/packages/riverpod/test/old/framework/ref_watch_test.dart index 9ba5d089e..c0ad29f4d 100644 --- a/packages/riverpod/test/old/framework/ref_watch_test.dart +++ b/packages/riverpod/test/old/framework/ref_watch_test.dart @@ -251,7 +251,7 @@ void main() { }); test( - 'when selecting a provider, element.visitChildren visits the selected provider', + 'when selecting a provider, element.visitAncestors visits the selected provider', () { final container = ProviderContainer.test(); final selected = StateNotifierProvider, int>((ref) { @@ -261,6 +261,9 @@ void main() { ref.watch(selected.select((value) => null)); }); + container.read(provider); + container.read(selected); + final element = container.readProviderElement(provider); final selectedElement = container.readProviderElement(selected); diff --git a/packages/riverpod/test/old/legacy/framework_test.dart b/packages/riverpod/test/old/legacy/framework_test.dart index a41dee43e..c896f1cf2 100644 --- a/packages/riverpod/test/old/legacy/framework_test.dart +++ b/packages/riverpod/test/old/legacy/framework_test.dart @@ -7,25 +7,6 @@ import 'package:test/test.dart'; import '../utils.dart'; void main() { - test('hasListeners', () { - final container = ProviderContainer.test(); - final provider = Provider((_) => 42); - - expect(container.read(provider), 42); - - final state = container.getAllProviderElements().single; - - expect(state.hasListeners, false); - - final sub = container.listen(provider, (_, __) {}); - - expect(state.hasListeners, true); - - sub.close(); - - expect(state.hasListeners, false); - }); - test('test two families one overridden the other not', () { final family = Provider.family((ref, value) { return '$value'; From d9ddce238700d23428697ba2ad521b45755eb403 Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Fri, 15 Mar 2024 12:10:46 +0100 Subject: [PATCH 02/13] Rename --- .../auto_dispose_family_future_provider_test.dart | 2 +- packages/riverpod/test/{new => src}/common/result_test.dart | 0 packages/riverpod/test/{new => src}/core/async_value_test.dart | 0 packages/riverpod/test/{new => src}/core/auto_dispose_test.dart | 0 .../riverpod/test/{new => src}/core/modifiers/future_test.dart | 0 .../test/{new => src}/core/modifiers/select_async_test.dart | 0 .../riverpod/test/{new => src}/core/modifiers/select_test.dart | 0 packages/riverpod/test/{new => src}/core/overrides_test.dart | 0 .../test/{new => src}/core/provider_container_test.dart | 0 .../riverpod/test/{new => src}/core/provider_element_test.dart | 0 .../riverpod/test/{new => src}/core/provider_observer_test.dart | 0 packages/riverpod/test/{new => src}/core/provider_test.dart | 0 packages/riverpod/test/{new => src}/core/ref_test.dart | 0 packages/riverpod/test/{new => src}/core/scope_test.dart | 0 .../riverpod/test/{new => src}/core/uni_directional_test.dart | 0 packages/riverpod/test/{new => src}/core/visit_states_test.dart | 0 packages/riverpod/test/{new => src}/matrix.dart | 0 .../test/{new => src}/matrix/async_notifier_provider.dart | 0 packages/riverpod/test/{new => src}/matrix/notifier_mixin.dart | 0 .../riverpod/test/{new => src}/matrix/notifier_provider.dart | 0 .../test/{new => src}/matrix/stream_notifier_provider.dart | 0 .../test/{new => src}/providers/async_notifier_test.dart | 0 .../riverpod/test/{new => src}/providers/notifier_test.dart | 0 .../test/{new => src}/providers/stream_notifier_test.dart | 0 packages/riverpod/test/{new => src}/utils.dart | 0 25 files changed, 1 insertion(+), 1 deletion(-) rename packages/riverpod/test/{new => src}/common/result_test.dart (100%) rename packages/riverpod/test/{new => src}/core/async_value_test.dart (100%) rename packages/riverpod/test/{new => src}/core/auto_dispose_test.dart (100%) rename packages/riverpod/test/{new => src}/core/modifiers/future_test.dart (100%) rename packages/riverpod/test/{new => src}/core/modifiers/select_async_test.dart (100%) rename packages/riverpod/test/{new => src}/core/modifiers/select_test.dart (100%) rename packages/riverpod/test/{new => src}/core/overrides_test.dart (100%) rename packages/riverpod/test/{new => src}/core/provider_container_test.dart (100%) rename packages/riverpod/test/{new => src}/core/provider_element_test.dart (100%) rename packages/riverpod/test/{new => src}/core/provider_observer_test.dart (100%) rename packages/riverpod/test/{new => src}/core/provider_test.dart (100%) rename packages/riverpod/test/{new => src}/core/ref_test.dart (100%) rename packages/riverpod/test/{new => src}/core/scope_test.dart (100%) rename packages/riverpod/test/{new => src}/core/uni_directional_test.dart (100%) rename packages/riverpod/test/{new => src}/core/visit_states_test.dart (100%) rename packages/riverpod/test/{new => src}/matrix.dart (100%) rename packages/riverpod/test/{new => src}/matrix/async_notifier_provider.dart (100%) rename packages/riverpod/test/{new => src}/matrix/notifier_mixin.dart (100%) rename packages/riverpod/test/{new => src}/matrix/notifier_provider.dart (100%) rename packages/riverpod/test/{new => src}/matrix/stream_notifier_provider.dart (100%) rename packages/riverpod/test/{new => src}/providers/async_notifier_test.dart (100%) rename packages/riverpod/test/{new => src}/providers/notifier_test.dart (100%) rename packages/riverpod/test/{new => src}/providers/stream_notifier_test.dart (100%) rename packages/riverpod/test/{new => src}/utils.dart (100%) diff --git a/packages/riverpod/test/old/legacy_providers/future_provider/auto_dispose_family_future_provider_test.dart b/packages/riverpod/test/old/legacy_providers/future_provider/auto_dispose_family_future_provider_test.dart index 9f7c538e9..fa7607dd2 100644 --- a/packages/riverpod/test/old/legacy_providers/future_provider/auto_dispose_family_future_provider_test.dart +++ b/packages/riverpod/test/old/legacy_providers/future_provider/auto_dispose_family_future_provider_test.dart @@ -2,7 +2,7 @@ import 'package:riverpod/riverpod.dart'; import 'package:riverpod/src/framework.dart'; import 'package:test/test.dart'; -import '../../../new/core/provider_container_test.dart'; +import '../../../src/core/provider_container_test.dart'; import '../../utils.dart'; void main() { diff --git a/packages/riverpod/test/new/common/result_test.dart b/packages/riverpod/test/src/common/result_test.dart similarity index 100% rename from packages/riverpod/test/new/common/result_test.dart rename to packages/riverpod/test/src/common/result_test.dart diff --git a/packages/riverpod/test/new/core/async_value_test.dart b/packages/riverpod/test/src/core/async_value_test.dart similarity index 100% rename from packages/riverpod/test/new/core/async_value_test.dart rename to packages/riverpod/test/src/core/async_value_test.dart diff --git a/packages/riverpod/test/new/core/auto_dispose_test.dart b/packages/riverpod/test/src/core/auto_dispose_test.dart similarity index 100% rename from packages/riverpod/test/new/core/auto_dispose_test.dart rename to packages/riverpod/test/src/core/auto_dispose_test.dart diff --git a/packages/riverpod/test/new/core/modifiers/future_test.dart b/packages/riverpod/test/src/core/modifiers/future_test.dart similarity index 100% rename from packages/riverpod/test/new/core/modifiers/future_test.dart rename to packages/riverpod/test/src/core/modifiers/future_test.dart diff --git a/packages/riverpod/test/new/core/modifiers/select_async_test.dart b/packages/riverpod/test/src/core/modifiers/select_async_test.dart similarity index 100% rename from packages/riverpod/test/new/core/modifiers/select_async_test.dart rename to packages/riverpod/test/src/core/modifiers/select_async_test.dart diff --git a/packages/riverpod/test/new/core/modifiers/select_test.dart b/packages/riverpod/test/src/core/modifiers/select_test.dart similarity index 100% rename from packages/riverpod/test/new/core/modifiers/select_test.dart rename to packages/riverpod/test/src/core/modifiers/select_test.dart diff --git a/packages/riverpod/test/new/core/overrides_test.dart b/packages/riverpod/test/src/core/overrides_test.dart similarity index 100% rename from packages/riverpod/test/new/core/overrides_test.dart rename to packages/riverpod/test/src/core/overrides_test.dart diff --git a/packages/riverpod/test/new/core/provider_container_test.dart b/packages/riverpod/test/src/core/provider_container_test.dart similarity index 100% rename from packages/riverpod/test/new/core/provider_container_test.dart rename to packages/riverpod/test/src/core/provider_container_test.dart diff --git a/packages/riverpod/test/new/core/provider_element_test.dart b/packages/riverpod/test/src/core/provider_element_test.dart similarity index 100% rename from packages/riverpod/test/new/core/provider_element_test.dart rename to packages/riverpod/test/src/core/provider_element_test.dart diff --git a/packages/riverpod/test/new/core/provider_observer_test.dart b/packages/riverpod/test/src/core/provider_observer_test.dart similarity index 100% rename from packages/riverpod/test/new/core/provider_observer_test.dart rename to packages/riverpod/test/src/core/provider_observer_test.dart diff --git a/packages/riverpod/test/new/core/provider_test.dart b/packages/riverpod/test/src/core/provider_test.dart similarity index 100% rename from packages/riverpod/test/new/core/provider_test.dart rename to packages/riverpod/test/src/core/provider_test.dart diff --git a/packages/riverpod/test/new/core/ref_test.dart b/packages/riverpod/test/src/core/ref_test.dart similarity index 100% rename from packages/riverpod/test/new/core/ref_test.dart rename to packages/riverpod/test/src/core/ref_test.dart diff --git a/packages/riverpod/test/new/core/scope_test.dart b/packages/riverpod/test/src/core/scope_test.dart similarity index 100% rename from packages/riverpod/test/new/core/scope_test.dart rename to packages/riverpod/test/src/core/scope_test.dart diff --git a/packages/riverpod/test/new/core/uni_directional_test.dart b/packages/riverpod/test/src/core/uni_directional_test.dart similarity index 100% rename from packages/riverpod/test/new/core/uni_directional_test.dart rename to packages/riverpod/test/src/core/uni_directional_test.dart diff --git a/packages/riverpod/test/new/core/visit_states_test.dart b/packages/riverpod/test/src/core/visit_states_test.dart similarity index 100% rename from packages/riverpod/test/new/core/visit_states_test.dart rename to packages/riverpod/test/src/core/visit_states_test.dart diff --git a/packages/riverpod/test/new/matrix.dart b/packages/riverpod/test/src/matrix.dart similarity index 100% rename from packages/riverpod/test/new/matrix.dart rename to packages/riverpod/test/src/matrix.dart diff --git a/packages/riverpod/test/new/matrix/async_notifier_provider.dart b/packages/riverpod/test/src/matrix/async_notifier_provider.dart similarity index 100% rename from packages/riverpod/test/new/matrix/async_notifier_provider.dart rename to packages/riverpod/test/src/matrix/async_notifier_provider.dart diff --git a/packages/riverpod/test/new/matrix/notifier_mixin.dart b/packages/riverpod/test/src/matrix/notifier_mixin.dart similarity index 100% rename from packages/riverpod/test/new/matrix/notifier_mixin.dart rename to packages/riverpod/test/src/matrix/notifier_mixin.dart diff --git a/packages/riverpod/test/new/matrix/notifier_provider.dart b/packages/riverpod/test/src/matrix/notifier_provider.dart similarity index 100% rename from packages/riverpod/test/new/matrix/notifier_provider.dart rename to packages/riverpod/test/src/matrix/notifier_provider.dart diff --git a/packages/riverpod/test/new/matrix/stream_notifier_provider.dart b/packages/riverpod/test/src/matrix/stream_notifier_provider.dart similarity index 100% rename from packages/riverpod/test/new/matrix/stream_notifier_provider.dart rename to packages/riverpod/test/src/matrix/stream_notifier_provider.dart diff --git a/packages/riverpod/test/new/providers/async_notifier_test.dart b/packages/riverpod/test/src/providers/async_notifier_test.dart similarity index 100% rename from packages/riverpod/test/new/providers/async_notifier_test.dart rename to packages/riverpod/test/src/providers/async_notifier_test.dart diff --git a/packages/riverpod/test/new/providers/notifier_test.dart b/packages/riverpod/test/src/providers/notifier_test.dart similarity index 100% rename from packages/riverpod/test/new/providers/notifier_test.dart rename to packages/riverpod/test/src/providers/notifier_test.dart diff --git a/packages/riverpod/test/new/providers/stream_notifier_test.dart b/packages/riverpod/test/src/providers/stream_notifier_test.dart similarity index 100% rename from packages/riverpod/test/new/providers/stream_notifier_test.dart rename to packages/riverpod/test/src/providers/stream_notifier_test.dart diff --git a/packages/riverpod/test/new/utils.dart b/packages/riverpod/test/src/utils.dart similarity index 100% rename from packages/riverpod/test/new/utils.dart rename to packages/riverpod/test/src/utils.dart From 32ccc6933db79acfe569fb8b6cd46776955f0bfb Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Fri, 15 Mar 2024 18:21:48 +0100 Subject: [PATCH 03/13] W --- examples/counter/lib/main.g.dart | 4 +- examples/pub/lib/detail.g.dart | 28 +-- examples/pub/lib/search.g.dart | 8 +- examples/stackoverflow/lib/common.g.dart | 4 +- examples/stackoverflow/lib/question.g.dart | 4 +- examples/stackoverflow/lib/tag.g.dart | 4 +- .../legacy/change_notifier_provider.dart | 6 +- packages/riverpod/lib/riverpod.dart | 3 +- .../riverpod/lib/src/common/listenable.dart | 6 - .../lib/src/providers/async_notifier.dart | 2 +- .../src/providers/async_notifier/family.dart | 4 +- .../src/providers/async_notifier/orphan.dart | 4 +- .../lib/src/providers/future_provider.dart | 6 +- .../legacy/state_notifier_provider.dart | 6 +- .../src/providers/legacy/state_provider.dart | 6 +- .../riverpod/lib/src/providers/notifier.dart | 2 +- .../lib/src/providers/notifier/family.dart | 4 +- .../lib/src/providers/notifier/orphan.dart | 4 +- .../riverpod/lib/src/providers/provider.dart | 8 +- .../lib/src/providers/stream_notifier.dart | 2 +- .../src/providers/stream_notifier/family.dart | 4 +- .../src/providers/stream_notifier/orphan.dart | 4 +- .../lib/src/providers/stream_provider.dart | 8 +- .../lib/riverpod_annotation.dart | 1 + .../integration/build_yaml/lib/main.g.dart | 84 ++++---- .../lib/src/templates/family.dart | 22 +- .../lib/src/templates/provider.dart | 8 +- .../test/integration/annotated.g.dart | 44 ++-- .../test/integration/async.g.dart | 76 +++---- .../test/integration/auto_dispose.g.dart | 36 ++-- .../test/integration/dependencies.g.dart | 92 ++++---- .../test/integration/dependencies2.g.dart | 36 ++-- .../test/integration/documented.g.dart | 28 +-- .../test/integration/generated.g.dart | 92 ++++---- .../test/integration/hash/hash1.g.dart | 12 +- .../test/integration/scopes.g.dart | 16 +- .../test/integration/split.g.dart | 8 +- .../test/integration/stream.g.dart | 56 ++--- .../test/integration/sync.g.dart | 196 +++++++++--------- .../generated/golden/lib/sync.g.dart | 44 ++-- ..._class_based_provider_to_functional.g.dart | 28 +-- ..._functional_provider_to_class_based.g.dart | 12 +- .../avoid_build_context_in_providers.g.dart | 24 +-- .../avoid_public_notifier_properties.g.dart | 12 +- .../functional_ref/functional_ref.g.dart | 36 ++-- .../test/lints/notifier_extends.g.dart | 64 +++--- ...ly_use_keep_alive_inside_keep_alive.g.dart | 20 +- .../protected_notifier_properties.g.dart | 94 ++++----- .../provider_dependencies/another.g.dart | 12 +- .../missing_dependencies.g.dart | 44 ++-- .../missing_dependencies2.g.dart | 96 ++++----- .../unused_dependency.g.dart | 36 ++-- .../test/lints/provider_parameters.g.dart | 8 +- ...oviders_should_specify_dependencies.g.dart | 12 +- .../test/lints/unknown_scoped_usage.g.dart | 8 +- .../lints/unsupported_provider_value.g.dart | 87 ++++---- .../advanced/select/select/codegen.g.dart | 4 +- .../select/select_async/codegen.g.dart | 8 +- .../cancel/detail_screen/codegen.g.dart | 5 +- .../detail_screen_cancel/codegen.g.dart | 5 +- .../detail_screen_debounce/codegen.g.dart | 5 +- .../provider_with_extension/codegen.g.dart | 5 +- .../fetch_activity/codegen.g.dart | 5 +- .../pull_to_refresh/full_app/codegen.g.dart | 5 +- .../docs/concepts/about_codegen/main.g.dart | 8 +- .../provider_type/async_class_future.g.dart | 4 +- .../provider_type/async_class_stream.g.dart | 4 +- .../provider_type/async_fn_future.g.dart | 4 +- .../provider_type/async_fn_stream.g.dart | 4 +- .../provider_type/auto_dispose.g.dart | 8 +- .../about_codegen/provider_type/family.g.dart | 8 +- .../provider_type/family_class.g.dart | 12 +- .../provider_type/family_fn.g.dart | 8 +- .../provider_type/sync_class.g.dart | 4 +- .../provider_type/sync_fn.g.dart | 4 +- .../characters_provider/codegen.g.dart | 12 +- .../city_provider/codegen.g.dart | 4 +- .../codegen.g.dart | 8 +- .../read_in_provider/codegen.g.dart | 8 +- .../select_async_provider/codegen.g.dart | 8 +- .../todo_list_provider/codegen.g.dart | 4 +- .../weather_provider/codegen.g.dart | 8 +- .../whole_object_provider/codegen.g.dart | 8 +- .../lifecycle_on_dispose/codegen.g.dart | 4 +- .../creating_a_provider/codegen.g.dart | 4 +- .../declaring_many_providers/codegen.g.dart | 8 +- .../concepts/reading/counter/codegen.g.dart | 8 +- .../concepts/reading/listen/codegen.g.dart | 4 +- .../reading/listen_build/codegen.g.dart | 4 +- .../reading/listen_build/codegen_hooks.g.dart | 4 +- .../concepts/reading/provider/codegen.g.dart | 8 +- .../docs/concepts/reading/read/codegen.g.dart | 4 +- .../reading/read/codegen_hooks.g.dart | 4 +- .../reading/read_build/codegen.g.dart | 4 +- .../read_notifier_build/codegen.g.dart | 4 +- .../concepts/reading/watch/codegen.g.dart | 12 +- .../reading/watch_build/codegen.g.dart | 8 +- .../reading/watch_build/codegen_hooks.g.dart | 8 +- .../watch_notifier_build/codegen.g.dart | 4 +- .../concepts/why_immutability/codegen.g.dart | 4 +- .../cache_for_usage/codegen.g.dart | 4 +- .../auto_dispose/codegen_keep_alive.g.dart | 4 +- .../invalidate_family_example/codegen.g.dart | 8 +- .../auto_dispose/keep_alive/codegen.g.dart | 4 +- .../on_dispose_example/codegen.g.dart | 8 +- .../functional_ref/codegen.g.dart | 8 +- .../listen_example/codegen.g.dart | 8 +- .../notifier_ref/codegen.g.dart | 8 +- .../read_example/codegen.g.dart | 8 +- .../watch_example/codegen.g.dart | 8 +- .../watch_placement/codegen.g.dart | 12 +- .../require_value/codegen.g.dart | 4 +- .../first_request/codegen/provider.g.dart | 5 +- .../passing_args/family/codegen.g.dart | 21 +- .../no_arg_provider/codegen.g.dart | 9 +- .../codegen/todo_list_notifier.g.dart | 4 +- .../todo_list_notifier_add_todo.g.dart | 4 +- .../codegen/todo_list_provider.g.dart | 5 +- .../testing/notifier_mock/codegen.g.dart | 4 +- .../testing/provider_to_mock/codegen.g.dart | 4 +- .../pipe_change_notifier.g.dart | 4 +- .../websockets_sync/raw_usage.g.dart | 5 +- .../shared_pipe_change_notifier.g.dart | 8 +- .../stream_provider/codegen.g.dart | 4 +- .../sync_definition/codegen.g.dart | 4 +- .../docs/from_provider/family/family.g.dart | 8 +- .../async_values/async_values.g.dart | 9 +- .../auto_dispose/auto_dispose.g.dart | 8 +- .../motivation/combine/combine.g.dart | 8 +- .../motivation/same_type/same_type.g.dart | 8 +- .../dart_hello_world/main.g.dart | 4 +- .../hello_world/hooks_codegen/main.g.dart | 4 +- .../getting_started/hello_world/main.g.dart | 4 +- .../introduction/why_riverpod/codegen.g.dart | 8 +- .../declaration/declaration.g.dart | 4 +- .../initialization/initialization.g.dart | 4 +- .../migrated/migrated.g.dart | 4 +- .../add_listener/add_listener.g.dart | 4 +- .../async_notifier/async_notifier.g.dart | 4 +- .../build_init/build_init.g.dart | 4 +- .../family_and_dispose.g.dart | 17 +- .../from_state_provider.g.dart | 4 +- .../old_lifecycles/old_lifecycles.g.dart | 4 +- .../old_lifecycles_final.g.dart | 12 +- .../config_provider/codegen.g.dart | 4 +- .../remote_todos/codegen.g.dart | 4 +- .../notifier_provider/todos/codegen.g.dart | 4 +- .../completed_todos/completed_todos.g.dart | 4 +- .../optimized_previous_button.g.dart | 8 +- .../docs/providers/provider/todo/todo.g.dart | 4 +- .../unoptimized_previous_button.g.dart | 4 +- .../live_stream_chat_provider/codegen.g.dart | 4 +- website/static/snippets/async.g.dart | 4 +- website/static/snippets/combine.g.dart | 12 +- website/static/snippets/create.g.dart | 4 +- website/static/snippets/declare.g.dart | 4 +- 156 files changed, 1079 insertions(+), 1109 deletions(-) diff --git a/examples/counter/lib/main.g.dart b/examples/counter/lib/main.g.dart index 329a2e299..9c6018064 100644 --- a/examples/counter/lib/main.g.dart +++ b/examples/counter/lib/main.g.dart @@ -73,8 +73,8 @@ final class CounterProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$counterHash() => r'4243b34530f53accfd9014a9f0e316fe304ada3e'; diff --git a/examples/pub/lib/detail.g.dart b/examples/pub/lib/detail.g.dart index 9d4cf8519..56f66131e 100644 --- a/examples/pub/lib/detail.g.dart +++ b/examples/pub/lib/detail.g.dart @@ -50,8 +50,8 @@ final class FetchPackageDetailsProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override FetchPackageDetailsProvider $copyWithCreate( @@ -122,14 +122,14 @@ final class FetchPackageDetailsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FetchPackageDetailsProvider; final argument = provider.argument as String; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -169,8 +169,8 @@ final class LikedPackagesProvider extends $FunctionalProvider< @$internal @override $FutureProviderElement> $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override LikedPackagesProvider $copyWithCreate( @@ -229,8 +229,8 @@ final class PubRepositoryProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override PubRepositoryProvider $copyWithCreate( @@ -327,8 +327,8 @@ final class PackageMetricsProvider @$internal @override $AsyncNotifierProviderElement - $createElement(ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $createElement($ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -381,14 +381,14 @@ final class PackageMetricsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as PackageMetricsProvider; final argument = provider.argument as String; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -403,14 +403,14 @@ final class PackageMetricsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as PackageMetricsProvider; final argument = provider.argument as String; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/examples/pub/lib/search.g.dart b/examples/pub/lib/search.g.dart index 23790cab4..7f1bff945 100644 --- a/examples/pub/lib/search.g.dart +++ b/examples/pub/lib/search.g.dart @@ -57,8 +57,8 @@ final class FetchPackagesProvider extends $FunctionalProvider< @$internal @override $FutureProviderElement> $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override FetchPackagesProvider $copyWithCreate( @@ -143,7 +143,7 @@ final class FetchPackagesFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FetchPackagesProvider; final argument = provider.argument as ({ @@ -153,7 +153,7 @@ final class FetchPackagesFamily extends Family { return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/examples/stackoverflow/lib/common.g.dart b/examples/stackoverflow/lib/common.g.dart index 63b1a4c40..1d5703c51 100644 --- a/examples/stackoverflow/lib/common.g.dart +++ b/examples/stackoverflow/lib/common.g.dart @@ -62,8 +62,8 @@ final class ThemeProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ThemeProvider $copyWithCreate( diff --git a/examples/stackoverflow/lib/question.g.dart b/examples/stackoverflow/lib/question.g.dart index 9e663d100..4a56d8b9a 100644 --- a/examples/stackoverflow/lib/question.g.dart +++ b/examples/stackoverflow/lib/question.g.dart @@ -151,8 +151,8 @@ final class CurrentQuestionProvider @$internal @override $ProviderElement> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CurrentQuestionProvider $copyWithCreate( diff --git a/examples/stackoverflow/lib/tag.g.dart b/examples/stackoverflow/lib/tag.g.dart index 453f84ab8..1a25986f9 100644 --- a/examples/stackoverflow/lib/tag.g.dart +++ b/examples/stackoverflow/lib/tag.g.dart @@ -50,8 +50,8 @@ final class TagThemeProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override TagThemeProvider $copyWithCreate( diff --git a/packages/flutter_riverpod/lib/src/providers/legacy/change_notifier_provider.dart b/packages/flutter_riverpod/lib/src/providers/legacy/change_notifier_provider.dart index 642d31211..15fd2be27 100644 --- a/packages/flutter_riverpod/lib/src/providers/legacy/change_notifier_provider.dart +++ b/packages/flutter_riverpod/lib/src/providers/legacy/change_notifier_provider.dart @@ -135,9 +135,9 @@ final class ChangeNotifierProvider @internal @override ChangeNotifierProviderElement $createElement( - ProviderContainer container, + $ProviderPointer pointer, ) { - return ChangeNotifierProviderElement._(this, container); + return ChangeNotifierProviderElement._(this, pointer); } @mustBeOverridden @@ -161,7 +161,7 @@ final class ChangeNotifierProvider /// The element of [ChangeNotifierProvider]. class ChangeNotifierProviderElement extends ProviderElement { - ChangeNotifierProviderElement._(this.provider, super.container); + ChangeNotifierProviderElement._(this.provider, super.pointer); @override final ChangeNotifierProvider provider; diff --git a/packages/riverpod/lib/riverpod.dart b/packages/riverpod/lib/riverpod.dart index 67dc9e532..0d14e569f 100644 --- a/packages/riverpod/lib/riverpod.dart +++ b/packages/riverpod/lib/riverpod.dart @@ -20,11 +20,12 @@ export 'src/framework.dart' Node, ProviderElementProxy, OnError, + WeakNode, ProviderContainerTest, DebugRiverpodDevtoolBiding, TransitiveFamilyOverride, TransitiveProviderOverride, - ProviderPointer, + $ProviderPointer, UnmountedRefException, ProviderPointerManager, ProviderDirectory, diff --git a/packages/riverpod/lib/src/common/listenable.dart b/packages/riverpod/lib/src/common/listenable.dart index e31db5d41..7284f7c37 100644 --- a/packages/riverpod/lib/src/common/listenable.dart +++ b/packages/riverpod/lib/src/common/listenable.dart @@ -48,12 +48,6 @@ class ProxyElementValueListenable extends _ValueListenable { _notifyError(value.error, value.stackTrace); } } - - /// Updates the [result] of this [ProxyElementValueListenable] without invoking listeners. - // ignore: use_setters_to_change_properties, non_constant_identifier_names - void UNSAFE_setResultWithoutNotifyingListeners(Result? value) { - _result = value; - } } class _ValueListenable { diff --git a/packages/riverpod/lib/src/providers/async_notifier.dart b/packages/riverpod/lib/src/providers/async_notifier.dart index 61bff0a28..dd008f83e 100644 --- a/packages/riverpod/lib/src/providers/async_notifier.dart +++ b/packages/riverpod/lib/src/providers/async_notifier.dart @@ -59,7 +59,7 @@ class $AsyncNotifierProviderElement< // FutureModifierClassElement> { /// Implementation detail of `riverpod_generator`. /// Do not use. - $AsyncNotifierProviderElement(this.provider, super.container); + $AsyncNotifierProviderElement(this.provider, super.pointer); @override final $AsyncNotifierProvider provider; diff --git a/packages/riverpod/lib/src/providers/async_notifier/family.dart b/packages/riverpod/lib/src/providers/async_notifier/family.dart index 1e908728d..e9ccd5ced 100644 --- a/packages/riverpod/lib/src/providers/async_notifier/family.dart +++ b/packages/riverpod/lib/src/providers/async_notifier/family.dart @@ -96,9 +96,9 @@ final class FamilyAsyncNotifierProvider< // @internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container, + $ProviderPointer pointer, ) { - return $AsyncNotifierProviderElement(this, container); + return $AsyncNotifierProviderElement(this, pointer); } @mustBeOverridden diff --git a/packages/riverpod/lib/src/providers/async_notifier/orphan.dart b/packages/riverpod/lib/src/providers/async_notifier/orphan.dart index 7cd802786..12b5f08ae 100644 --- a/packages/riverpod/lib/src/providers/async_notifier/orphan.dart +++ b/packages/riverpod/lib/src/providers/async_notifier/orphan.dart @@ -119,9 +119,9 @@ final class AsyncNotifierProvider< // @internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container, + $ProviderPointer pointer, ) { - return $AsyncNotifierProviderElement(this, container); + return $AsyncNotifierProviderElement(this, pointer); } @mustBeOverridden diff --git a/packages/riverpod/lib/src/providers/future_provider.dart b/packages/riverpod/lib/src/providers/future_provider.dart index 45dc0a18b..1c442ee0e 100644 --- a/packages/riverpod/lib/src/providers/future_provider.dart +++ b/packages/riverpod/lib/src/providers/future_provider.dart @@ -136,8 +136,8 @@ final class FutureProvider @internal @override - $FutureProviderElement $createElement(ProviderContainer container) { - return $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) { + return $FutureProviderElement(this, pointer); } @mustBeOverridden @@ -165,7 +165,7 @@ class $FutureProviderElement extends ProviderElement> with FutureModifierElement { /// The element of a [FutureProvider] /// Implementation detail of `riverpod_generator`. Do not use. - $FutureProviderElement(this.provider, super.container); + $FutureProviderElement(this.provider, super.pointer); @override final $FutureProvider>> provider; diff --git a/packages/riverpod/lib/src/providers/legacy/state_notifier_provider.dart b/packages/riverpod/lib/src/providers/legacy/state_notifier_provider.dart index 93334d62b..e5b85785c 100644 --- a/packages/riverpod/lib/src/providers/legacy/state_notifier_provider.dart +++ b/packages/riverpod/lib/src/providers/legacy/state_notifier_provider.dart @@ -138,9 +138,9 @@ final class StateNotifierProvider< // @internal @override StateNotifierProviderElement $createElement( - ProviderContainer container, + $ProviderPointer pointer, ) { - return StateNotifierProviderElement._(this, container); + return StateNotifierProviderElement._(this, pointer); } @mustBeOverridden @@ -164,7 +164,7 @@ final class StateNotifierProvider< // /// The element of [StateNotifierProvider]. class StateNotifierProviderElement, StateT> extends ProviderElement { - StateNotifierProviderElement._(this.provider, super.container); + StateNotifierProviderElement._(this.provider, super.pointer); @override final StateNotifierProvider provider; diff --git a/packages/riverpod/lib/src/providers/legacy/state_provider.dart b/packages/riverpod/lib/src/providers/legacy/state_provider.dart index f1b306379..f88c531f2 100644 --- a/packages/riverpod/lib/src/providers/legacy/state_provider.dart +++ b/packages/riverpod/lib/src/providers/legacy/state_provider.dart @@ -88,9 +88,9 @@ final class StateProvider extends $FunctionalProvider @internal @override StateProviderElement $createElement( - ProviderContainer container, + $ProviderPointer pointer, ) { - return StateProviderElement._(this, container); + return StateProviderElement._(this, pointer); } @mustBeOverridden @@ -113,7 +113,7 @@ final class StateProvider extends $FunctionalProvider /// The element of [StateProvider]. class StateProviderElement extends ProviderElement { - StateProviderElement._(this.provider, super.container); + StateProviderElement._(this.provider, super.pointer); @override final StateProvider provider; diff --git a/packages/riverpod/lib/src/providers/notifier.dart b/packages/riverpod/lib/src/providers/notifier.dart index 8a4116709..d8a3b2dbf 100644 --- a/packages/riverpod/lib/src/providers/notifier.dart +++ b/packages/riverpod/lib/src/providers/notifier.dart @@ -111,7 +111,7 @@ class $NotifierProviderElement< // StateT> { /// An implementation detail of `riverpod_generator`. /// Do not use. - $NotifierProviderElement(this.provider, super.container); + $NotifierProviderElement(this.provider, super.pointer); @override final $NotifierProvider provider; diff --git a/packages/riverpod/lib/src/providers/notifier/family.dart b/packages/riverpod/lib/src/providers/notifier/family.dart index 6aec115a5..12b6c4146 100644 --- a/packages/riverpod/lib/src/providers/notifier/family.dart +++ b/packages/riverpod/lib/src/providers/notifier/family.dart @@ -40,9 +40,9 @@ final class FamilyNotifierProvider // @internal @override $NotifierProviderElement $createElement( - ProviderContainer container, + $ProviderPointer pointer, ) { - return $NotifierProviderElement(this, container); + return $NotifierProviderElement(this, pointer); } FamilyNotifierProvider _copyWith({ diff --git a/packages/riverpod/lib/src/providers/notifier/orphan.dart b/packages/riverpod/lib/src/providers/notifier/orphan.dart index d0d1df078..af0f7f2d3 100644 --- a/packages/riverpod/lib/src/providers/notifier/orphan.dart +++ b/packages/riverpod/lib/src/providers/notifier/orphan.dart @@ -119,9 +119,9 @@ final class NotifierProvider, StateT> @internal @override $NotifierProviderElement $createElement( - ProviderContainer container, + $ProviderPointer pointer, ) { - return $NotifierProviderElement(this, container); + return $NotifierProviderElement(this, pointer); } NotifierProvider _copyWith({ diff --git a/packages/riverpod/lib/src/providers/provider.dart b/packages/riverpod/lib/src/providers/provider.dart index df922d39b..2d63a1517 100644 --- a/packages/riverpod/lib/src/providers/provider.dart +++ b/packages/riverpod/lib/src/providers/provider.dart @@ -54,10 +54,8 @@ base class Provider extends $FunctionalProvider @internal @override - $ProviderElement $createElement( - ProviderContainer container, - ) { - return $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) { + return $ProviderElement(this, pointer); } @mustBeOverridden @@ -344,7 +342,7 @@ base class Provider extends $FunctionalProvider @internal class $ProviderElement extends ProviderElement { /// A [ProviderElement] for [Provider] - $ProviderElement(this.provider, super.container); + $ProviderElement(this.provider, super.pointer); @override final $Provider> provider; diff --git a/packages/riverpod/lib/src/providers/stream_notifier.dart b/packages/riverpod/lib/src/providers/stream_notifier.dart index 872507a61..eaebc6885 100644 --- a/packages/riverpod/lib/src/providers/stream_notifier.dart +++ b/packages/riverpod/lib/src/providers/stream_notifier.dart @@ -60,7 +60,7 @@ class $StreamNotifierProviderElement< // FutureModifierClassElement> { /// Implementation detail of `riverpod_generator`. /// Do not use. - $StreamNotifierProviderElement(this.provider, super.container); + $StreamNotifierProviderElement(this.provider, super.pointer); @override final $StreamNotifierProvider provider; diff --git a/packages/riverpod/lib/src/providers/stream_notifier/family.dart b/packages/riverpod/lib/src/providers/stream_notifier/family.dart index 6b421a8e0..1c9d130a5 100644 --- a/packages/riverpod/lib/src/providers/stream_notifier/family.dart +++ b/packages/riverpod/lib/src/providers/stream_notifier/family.dart @@ -53,9 +53,9 @@ final class FamilyStreamNotifierProvider< // @internal @override $StreamNotifierProviderElement $createElement( - ProviderContainer container, + $ProviderPointer pointer, ) { - return $StreamNotifierProviderElement(this, container); + return $StreamNotifierProviderElement(this, pointer); } FamilyStreamNotifierProvider _copyWith({ diff --git a/packages/riverpod/lib/src/providers/stream_notifier/orphan.dart b/packages/riverpod/lib/src/providers/stream_notifier/orphan.dart index 3e612185c..d0fbaec59 100644 --- a/packages/riverpod/lib/src/providers/stream_notifier/orphan.dart +++ b/packages/riverpod/lib/src/providers/stream_notifier/orphan.dart @@ -105,9 +105,9 @@ final class StreamNotifierProvider< // @internal @override $StreamNotifierProviderElement $createElement( - ProviderContainer container, + $ProviderPointer pointer, ) { - return $StreamNotifierProviderElement(this, container); + return $StreamNotifierProviderElement(this, pointer); } @mustBeOverridden diff --git a/packages/riverpod/lib/src/providers/stream_provider.dart b/packages/riverpod/lib/src/providers/stream_provider.dart index b7ddf7789..128f0e3b2 100644 --- a/packages/riverpod/lib/src/providers/stream_provider.dart +++ b/packages/riverpod/lib/src/providers/stream_provider.dart @@ -125,10 +125,8 @@ base class StreamProvider @internal @override - $StreamProviderElement $createElement( - ProviderContainer container, - ) { - return $StreamProviderElement(this, container); + $StreamProviderElement $createElement($ProviderPointer pointer) { + return $StreamProviderElement(this, pointer); } @mustBeOverridden @@ -154,7 +152,7 @@ base class StreamProvider class $StreamProviderElement extends ProviderElement> with FutureModifierElement { /// The element of [StreamProvider]. - $StreamProviderElement(this.provider, super.container); + $StreamProviderElement(this.provider, super.pointer); @override final $StreamProvider>> provider; diff --git a/packages/riverpod_annotation/lib/riverpod_annotation.dart b/packages/riverpod_annotation/lib/riverpod_annotation.dart index 3f5ca603b..fb6b71d14 100644 --- a/packages/riverpod_annotation/lib/riverpod_annotation.dart +++ b/packages/riverpod_annotation/lib/riverpod_annotation.dart @@ -23,6 +23,7 @@ export 'package:riverpod/src/internals.dart' $ValueProvider, $ProviderOverride, $RefArg, + $ProviderPointer, // Provider $Provider, diff --git a/packages/riverpod_generator/integration/build_yaml/lib/main.g.dart b/packages/riverpod_generator/integration/build_yaml/lib/main.g.dart index 3f4e17a57..0143d0d5f 100644 --- a/packages/riverpod_generator/integration/build_yaml/lib/main.g.dart +++ b/packages/riverpod_generator/integration/build_yaml/lib/main.g.dart @@ -44,8 +44,8 @@ final class CountProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CountProvider $copyWithCreate( @@ -96,8 +96,8 @@ final class CountFutureProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override CountFutureProvider $copyWithCreate( @@ -148,8 +148,8 @@ final class CountStreamProvider @$internal @override - $StreamProviderElement $createElement(ProviderContainer container) => - $StreamProviderElement(this, container); + $StreamProviderElement $createElement($ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override CountStreamProvider $copyWithCreate( @@ -225,8 +225,8 @@ final class CountNotifierProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$countNotifierHash() => r'a8dd7a66ee0002b8af657245c4affaa206fd99ec'; @@ -286,8 +286,8 @@ final class CountAsyncNotifierProvider @$internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$countAsyncNotifierHash() => @@ -348,8 +348,8 @@ final class CountStreamNotifierProvider @$internal @override $StreamNotifierProviderElement $createElement( - ProviderContainer container) => - $StreamNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $StreamNotifierProviderElement(this, pointer); } String _$countStreamNotifierHash() => @@ -409,8 +409,8 @@ final class Count2Provider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Count2Provider $copyWithCreate( @@ -480,14 +480,14 @@ final class Count2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as Count2Provider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -533,8 +533,8 @@ final class CountFuture2Provider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override CountFuture2Provider $copyWithCreate( @@ -604,14 +604,14 @@ final class CountFuture2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as CountFuture2Provider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -657,8 +657,8 @@ final class CountStream2Provider @$internal @override - $StreamProviderElement $createElement(ProviderContainer container) => - $StreamProviderElement(this, container); + $StreamProviderElement $createElement($ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override CountStream2Provider $copyWithCreate( @@ -728,14 +728,14 @@ final class CountStream2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as CountStream2Provider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -811,8 +811,8 @@ final class CountNotifier2Provider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -855,14 +855,14 @@ final class CountNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as CountNotifier2Provider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -873,14 +873,14 @@ final class CountNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as CountNotifier2Provider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -962,8 +962,8 @@ final class CountAsyncNotifier2Provider @$internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -1007,14 +1007,14 @@ final class CountAsyncNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as CountAsyncNotifier2Provider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1027,14 +1027,14 @@ final class CountAsyncNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as CountAsyncNotifier2Provider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1117,8 +1117,8 @@ final class CountStreamNotifier2Provider @$internal @override $StreamNotifierProviderElement $createElement( - ProviderContainer container) => - $StreamNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $StreamNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -1162,14 +1162,14 @@ final class CountStreamNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as CountStreamNotifier2Provider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1182,14 +1182,14 @@ final class CountStreamNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as CountStreamNotifier2Provider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/packages/riverpod_generator/lib/src/templates/family.dart b/packages/riverpod_generator/lib/src/templates/family.dart index 34bdee5d6..ef1b42da3 100644 --- a/packages/riverpod_generator/lib/src/templates/family.dart +++ b/packages/riverpod_generator/lib/src/templates/family.dart @@ -106,7 +106,7 @@ ${provider.doc} final class ${provider.familyTypeName} extends Family { Override overrideWith($createType create,) { return \$FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ${provider.providerTypeName}; '''); @@ -117,7 +117,7 @@ Override overrideWith($createType create,) { )) { case (hasParameters: false, hasGenerics: false, _): buffer.writeln( - r'return provider.$copyWithCreate(create).$createElement(container);', + r'return provider.$copyWithCreate(create).$createElement(pointer);', ); case (hasParameters: true, hasGenerics: false, _): buffer.writeln(''' @@ -126,12 +126,12 @@ Override overrideWith($createType create,) { return provider.\$copyWithCreate(${switch (provider) { FunctionalProviderDeclaration() => '(ref) => create(ref, argument)', ClassBasedProviderDeclaration() => '() => create(argument)', - }}).\$createElement(container); + }}).\$createElement(pointer); '''); case (hasParameters: false, hasGenerics: true, _): buffer.writeln( - r'return provider._copyWithCreate(create).$createElement(container);', + r'return provider._copyWithCreate(create).$createElement(pointer);', ); case ( @@ -142,7 +142,7 @@ Override overrideWith($createType create,) { buffer.writeln(''' return provider._copyWithCreate($_genericsDefinition(ref, $_parameterDefinition) { return create(ref, ${provider.argumentToRecord()}); - }).\$createElement(container); + }).\$createElement(pointer); '''); case ( hasParameters: true, @@ -154,7 +154,7 @@ Override overrideWith($createType create,) { final argument = provider.argument$_argumentCast; return create(argument); - }).\$createElement(container); + }).\$createElement(pointer); '''); } @@ -184,7 +184,7 @@ ${provider.createdTypeDisplayString} Function$_genericsDefinition( Override overrideWithBuild($runNotifierBuildType build,) { return \$FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ${provider.providerTypeName}; '''); @@ -194,18 +194,18 @@ Override overrideWithBuild($runNotifierBuildType build,) { )) { case (hasParameters: false, hasGenerics: false): buffer.writeln( - r'return provider.$copyWithBuild(build).$createElement(container);', + r'return provider.$copyWithBuild(build).$createElement(pointer);', ); case (hasParameters: true, hasGenerics: false): buffer.writeln(''' final argument = provider.argument$_argumentCast; - return provider.\$copyWithBuild((ref, notifier) => build(ref, notifier, argument)).\$createElement(container); + return provider.\$copyWithBuild((ref, notifier) => build(ref, notifier, argument)).\$createElement(pointer); '''); case (hasParameters: false, hasGenerics: true): buffer.writeln( - r'return provider._copyWithBuild(build).$createElement(container);', + r'return provider._copyWithBuild(build).$createElement(pointer);', ); case (hasParameters: true, hasGenerics: true): @@ -214,7 +214,7 @@ Override overrideWithBuild($runNotifierBuildType build,) { final argument = provider.argument$_argumentCast; return build(ref, notifier, argument); - }).\$createElement(container); + }).\$createElement(pointer); '''); } diff --git a/packages/riverpod_generator/lib/src/templates/provider.dart b/packages/riverpod_generator/lib/src/templates/provider.dart index 414c27f08..a0dec049f 100644 --- a/packages/riverpod_generator/lib/src/templates/provider.dart +++ b/packages/riverpod_generator/lib/src/templates/provider.dart @@ -164,8 +164,8 @@ ${provider.doc} final class $name$_genericsDefinition @\$internal @override ${provider.elementName}<${provider.valueTypeDisplayString}> \$createElement( - ProviderContainer container - ) => ${provider.elementName}(this, container); + \$ProviderPointer pointer + ) => ${provider.elementName}(this, pointer); @override ${provider.providerTypeName}$_generics \$copyWithCreate( @@ -213,8 +213,8 @@ ${provider.doc} final class $name$_genericsDefinition @\$internal @override ${provider.elementName}<$notifierType, ${provider.valueTypeDisplayString}> \$createElement( - ProviderContainer container - ) => ${provider.elementName}(this, container); + \$ProviderPointer pointer + ) => ${provider.elementName}(this, pointer); '''); } diff --git a/packages/riverpod_generator/test/integration/annotated.g.dart b/packages/riverpod_generator/test/integration/annotated.g.dart index a18deb4ed..c8931efeb 100644 --- a/packages/riverpod_generator/test/integration/annotated.g.dart +++ b/packages/riverpod_generator/test/integration/annotated.g.dart @@ -56,8 +56,8 @@ final class FunctionalProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FunctionalProvider $copyWithCreate( @@ -127,14 +127,14 @@ final class FunctionalFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FunctionalProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -212,8 +212,8 @@ final class ClassBasedProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -256,14 +256,14 @@ final class ClassBasedFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ClassBasedProvider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -274,14 +274,14 @@ final class ClassBasedFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ClassBasedProvider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -352,8 +352,8 @@ final class FamilyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FamilyProvider $copyWithCreate( @@ -423,14 +423,14 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -475,8 +475,8 @@ final class NotCopiedFunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override NotCopiedFunctionalProvider $copyWithCreate( @@ -553,8 +553,8 @@ final class NotCopiedClassBasedProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$notCopiedClassBasedHash() => @@ -614,8 +614,8 @@ final class NotCopiedFamilyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override NotCopiedFamilyProvider $copyWithCreate( @@ -685,14 +685,14 @@ final class NotCopiedFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as NotCopiedFamilyProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/packages/riverpod_generator/test/integration/async.g.dart b/packages/riverpod_generator/test/integration/async.g.dart index ff01b8e4f..58231d10e 100644 --- a/packages/riverpod_generator/test/integration/async.g.dart +++ b/packages/riverpod_generator/test/integration/async.g.dart @@ -53,8 +53,8 @@ final class GenericProvider @$internal @override - $FutureProviderElement> $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement> $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override GenericProvider $copyWithCreate( @@ -109,10 +109,10 @@ final class GenericFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -193,8 +193,8 @@ final class GenericClassProvider @$internal @override $AsyncNotifierProviderElement, List> $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -235,10 +235,10 @@ final class GenericClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericClassProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -251,10 +251,10 @@ final class GenericClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericClassProvider; - return provider._copyWithBuild(build).$createElement(container); + return provider._copyWithBuild(build).$createElement(pointer); }, ); } @@ -298,8 +298,8 @@ final class PublicProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override PublicProvider $copyWithCreate( @@ -350,8 +350,8 @@ final class _PrivateProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override _PrivateProvider $copyWithCreate( @@ -411,8 +411,8 @@ final class FamilyOrProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override FamilyOrProvider $copyWithCreate( @@ -482,14 +482,14 @@ final class FamilyOrFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyOrProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -550,8 +550,8 @@ final class FamilyProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override FamilyProvider $copyWithCreate( @@ -657,7 +657,7 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyProvider; final argument = provider.argument as ( @@ -670,7 +670,7 @@ final class FamilyFamily extends Family { return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -724,8 +724,8 @@ final class PublicClassProvider @$internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$publicClassHash() => r'e9bc69e44b72e8ed77d423524c0d74ad460d629d'; @@ -785,8 +785,8 @@ final class _PrivateClassProvider @$internal @override $AsyncNotifierProviderElement<_PrivateClass, String> $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$privateClassHash() => r'7e69cffe8315999710e4cb6bb3de9f179d3f2f5d'; @@ -860,8 +860,8 @@ final class FamilyOrClassProvider @$internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -904,14 +904,14 @@ final class FamilyOrClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyOrClassProvider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -924,14 +924,14 @@ final class FamilyOrClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyOrClassProvider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1032,8 +1032,8 @@ final class FamilyClassProvider @$internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -1092,7 +1092,7 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyClassProvider; final argument = provider.argument as ( @@ -1105,7 +1105,7 @@ final class FamilyClassFamily extends Family { return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1126,7 +1126,7 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyClassProvider; final argument = provider.argument as ( @@ -1139,7 +1139,7 @@ final class FamilyClassFamily extends Family { return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/packages/riverpod_generator/test/integration/auto_dispose.g.dart b/packages/riverpod_generator/test/integration/auto_dispose.g.dart index ef711fbca..dcaae6085 100644 --- a/packages/riverpod_generator/test/integration/auto_dispose.g.dart +++ b/packages/riverpod_generator/test/integration/auto_dispose.g.dart @@ -44,8 +44,8 @@ final class KeepAliveProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override KeepAliveProvider $copyWithCreate( @@ -103,8 +103,8 @@ final class NotKeepAliveProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override NotKeepAliveProvider $copyWithCreate( @@ -162,8 +162,8 @@ final class DefaultKeepAliveProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override DefaultKeepAliveProvider $copyWithCreate( @@ -230,8 +230,8 @@ final class KeepAliveFamilyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override KeepAliveFamilyProvider $copyWithCreate( @@ -301,14 +301,14 @@ final class KeepAliveFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as KeepAliveFamilyProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -361,8 +361,8 @@ final class NotKeepAliveFamilyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override NotKeepAliveFamilyProvider $copyWithCreate( @@ -433,14 +433,14 @@ final class NotKeepAliveFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as NotKeepAliveFamilyProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -493,8 +493,8 @@ final class DefaultKeepAliveFamilyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override DefaultKeepAliveFamilyProvider $copyWithCreate( @@ -566,14 +566,14 @@ final class DefaultKeepAliveFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as DefaultKeepAliveFamilyProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/packages/riverpod_generator/test/integration/dependencies.g.dart b/packages/riverpod_generator/test/integration/dependencies.g.dart index 07e91ae9d..fe55a14b9 100644 --- a/packages/riverpod_generator/test/integration/dependencies.g.dart +++ b/packages/riverpod_generator/test/integration/dependencies.g.dart @@ -44,8 +44,8 @@ final class DepProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override DepProvider $copyWithCreate( @@ -112,8 +112,8 @@ final class FamilyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FamilyProvider $copyWithCreate( @@ -183,14 +183,14 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -251,8 +251,8 @@ final class Dep2Provider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$dep2Hash() => r'2778537df77f6431148c2ce400724da3e2ab4b94'; @@ -333,8 +333,8 @@ final class Family2Provider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -377,14 +377,14 @@ final class Family2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as Family2Provider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -395,14 +395,14 @@ final class Family2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as Family2Provider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -475,8 +475,8 @@ final class ProviderProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ProviderProvider $copyWithCreate( @@ -549,8 +549,8 @@ final class Provider2Provider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Provider2Provider $copyWithCreate( @@ -640,8 +640,8 @@ final class Provider3Provider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$provider3Hash() => r'dfdd6dec6cfee543c73d99593ce98d68f4db385c'; @@ -727,8 +727,8 @@ final class Provider4Provider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -781,14 +781,14 @@ final class Provider4Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as Provider4Provider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -799,14 +799,14 @@ final class Provider4Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as Provider4Provider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -880,8 +880,8 @@ final class TransitiveDependenciesProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override TransitiveDependenciesProvider $copyWithCreate( @@ -954,8 +954,8 @@ final class SmallTransitiveDependencyCountProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override SmallTransitiveDependencyCountProvider $copyWithCreate( @@ -1016,8 +1016,8 @@ final class EmptyDependenciesFunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override EmptyDependenciesFunctionalProvider $copyWithCreate( @@ -1098,8 +1098,8 @@ final class EmptyDependenciesClassBasedProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$emptyDependenciesClassBasedHash() => @@ -1160,8 +1160,8 @@ final class ProviderWithDependenciesProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ProviderWithDependenciesProvider $copyWithCreate( @@ -1220,8 +1220,8 @@ final class _PrivateDepProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override _PrivateDepProvider $copyWithCreate( @@ -1279,8 +1279,8 @@ final class PublicDepProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override PublicDepProvider $copyWithCreate( @@ -1344,8 +1344,8 @@ final class DuplicateDependenciesProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override DuplicateDependenciesProvider $copyWithCreate( @@ -1413,8 +1413,8 @@ final class DuplicateDependencies2Provider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override DuplicateDependencies2Provider $copyWithCreate( @@ -1496,8 +1496,8 @@ final class TransitiveDuplicateDependenciesProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override TransitiveDuplicateDependenciesProvider $copyWithCreate( diff --git a/packages/riverpod_generator/test/integration/dependencies2.g.dart b/packages/riverpod_generator/test/integration/dependencies2.g.dart index c102e5359..f5102b835 100644 --- a/packages/riverpod_generator/test/integration/dependencies2.g.dart +++ b/packages/riverpod_generator/test/integration/dependencies2.g.dart @@ -63,8 +63,8 @@ final class ProviderWithDependencies2Provider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ProviderWithDependencies2Provider $copyWithCreate( @@ -141,8 +141,8 @@ final class FamilyWithDependencies2Provider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FamilyWithDependencies2Provider $copyWithCreate( @@ -224,14 +224,14 @@ final class FamilyWithDependencies2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyWithDependencies2Provider; final argument = provider.argument as int?; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -313,8 +313,8 @@ final class NotifierWithDependenciesProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$notifierWithDependenciesHash() => @@ -407,8 +407,8 @@ final class NotifierFamilyWithDependenciesProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -463,14 +463,14 @@ final class NotifierFamilyWithDependenciesFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as NotifierFamilyWithDependenciesProvider; final argument = provider.argument as int?; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -483,14 +483,14 @@ final class NotifierFamilyWithDependenciesFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as NotifierFamilyWithDependenciesProvider; final argument = provider.argument as int?; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -548,8 +548,8 @@ final class _Private2Provider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override _Private2Provider $copyWithCreate( @@ -607,8 +607,8 @@ final class Public2Provider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Public2Provider $copyWithCreate( diff --git a/packages/riverpod_generator/test/integration/documented.g.dart b/packages/riverpod_generator/test/integration/documented.g.dart index 38a0671e7..7d7131f8c 100644 --- a/packages/riverpod_generator/test/integration/documented.g.dart +++ b/packages/riverpod_generator/test/integration/documented.g.dart @@ -52,8 +52,8 @@ final class FunctionalProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FunctionalProvider $copyWithCreate( @@ -134,8 +134,8 @@ final class ClassBasedProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$classBasedHash() => r'f1139017b1fcf38017402b514c61fb32dae40c39'; @@ -202,8 +202,8 @@ final class FamilyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FamilyProvider $copyWithCreate( @@ -277,14 +277,14 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -366,8 +366,8 @@ final class ClassFamilyBasedProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -414,14 +414,14 @@ final class ClassFamilyBasedFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ClassFamilyBasedProvider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -433,14 +433,14 @@ final class ClassFamilyBasedFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ClassFamilyBasedProvider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/packages/riverpod_generator/test/integration/generated.g.dart b/packages/riverpod_generator/test/integration/generated.g.dart index 02dd815e8..1069dd857 100644 --- a/packages/riverpod_generator/test/integration/generated.g.dart +++ b/packages/riverpod_generator/test/integration/generated.g.dart @@ -44,8 +44,8 @@ final class GeneratedProvider extends $FunctionalProvider<_Test, _Test> @$internal @override - $ProviderElement<_Test> $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement<_Test> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override GeneratedProvider $copyWithCreate( @@ -112,8 +112,8 @@ final class GeneratedFamilyProvider extends $FunctionalProvider<_Test, _Test> @$internal @override - $ProviderElement<_Test> $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement<_Test> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override GeneratedFamilyProvider $copyWithCreate( @@ -183,14 +183,14 @@ final class GeneratedFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GeneratedFamilyProvider; final argument = provider.argument as _Test; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -252,8 +252,8 @@ final class GeneratedClassProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$generatedClassHash() => r'984153f97e25de687d2f19756b277aabd56f6e72'; @@ -335,8 +335,8 @@ final class GeneratedClassFamilyProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -380,14 +380,14 @@ final class GeneratedClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GeneratedClassFamilyProvider; final argument = provider.argument as _Test; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -400,14 +400,14 @@ final class GeneratedClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GeneratedClassFamilyProvider; final argument = provider.argument as _Test; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -465,8 +465,8 @@ final class $DynamicProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override $DynamicProvider $copyWithCreate( @@ -533,8 +533,8 @@ final class $DynamicFamilyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override $DynamicFamilyProvider $copyWithCreate( @@ -604,14 +604,14 @@ final class $DynamicFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as $DynamicFamilyProvider; final argument = provider.argument as dynamic; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -673,8 +673,8 @@ final class $DynamicClassProvider @$internal @override $NotifierProviderElement<$DynamicClass, Object?> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$$dynamicClassHash() => r'c6d8e5191c3f060df3ce3eee66107433fd4c3292'; @@ -756,8 +756,8 @@ final class $DynamicClassFamilyProvider @$internal @override $NotifierProviderElement<$DynamicClassFamily, Object?> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -801,14 +801,14 @@ final class $DynamicClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as $DynamicClassFamilyProvider; final argument = provider.argument as dynamic; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -821,14 +821,14 @@ final class $DynamicClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as $DynamicClassFamilyProvider; final argument = provider.argument as dynamic; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -895,8 +895,8 @@ final class _DynamicProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override _DynamicProvider $copyWithCreate( @@ -966,14 +966,14 @@ final class _DynamicFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as _DynamicProvider; final argument = provider.argument as dynamic; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1019,8 +1019,8 @@ final class AliasProvider @$internal @override $ProviderElement> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override AliasProvider $copyWithCreate( @@ -1089,8 +1089,8 @@ final class AliasFamilyProvider @$internal @override $ProviderElement> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override AliasFamilyProvider $copyWithCreate( @@ -1160,14 +1160,14 @@ final class AliasFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as AliasFamilyProvider; final argument = provider.argument as r.AsyncValue; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1229,8 +1229,8 @@ final class AliasClassProvider @$internal @override $NotifierProviderElement> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$aliasClassHash() => r'a6c6d7594ebd09ba728e42d79b12af560d09c379'; @@ -1312,8 +1312,8 @@ final class AliasClassFamilyProvider @$internal @override $NotifierProviderElement> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -1356,14 +1356,14 @@ final class AliasClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as AliasClassFamilyProvider; final argument = provider.argument as r.AsyncValue; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1376,14 +1376,14 @@ final class AliasClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as AliasClassFamilyProvider; final argument = provider.argument as r.AsyncValue; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/packages/riverpod_generator/test/integration/hash/hash1.g.dart b/packages/riverpod_generator/test/integration/hash/hash1.g.dart index 28bbfd967..5cbd372e0 100644 --- a/packages/riverpod_generator/test/integration/hash/hash1.g.dart +++ b/packages/riverpod_generator/test/integration/hash/hash1.g.dart @@ -44,8 +44,8 @@ final class SimpleProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override SimpleProvider $copyWithCreate( @@ -103,8 +103,8 @@ final class Simple2Provider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Simple2Provider $copyWithCreate( @@ -179,8 +179,8 @@ final class SimpleClassProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$simpleClassHash() => r'958123cd6179c5b88da040cfeb71eb3061765277'; diff --git a/packages/riverpod_generator/test/integration/scopes.g.dart b/packages/riverpod_generator/test/integration/scopes.g.dart index e8c77d3a1..5c8c2e63e 100644 --- a/packages/riverpod_generator/test/integration/scopes.g.dart +++ b/packages/riverpod_generator/test/integration/scopes.g.dart @@ -61,8 +61,8 @@ final class ScopedClassProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$scopedClassHash() => r'113acc46a2e61abfeb61cf4b89a1dc555e915793'; @@ -144,8 +144,8 @@ final class ScopedClassFamilyProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -188,14 +188,14 @@ final class ScopedClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ScopedClassFamilyProvider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -206,14 +206,14 @@ final class ScopedClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ScopedClassFamilyProvider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/packages/riverpod_generator/test/integration/split.g.dart b/packages/riverpod_generator/test/integration/split.g.dart index 8d6340b09..adf1cb3d6 100644 --- a/packages/riverpod_generator/test/integration/split.g.dart +++ b/packages/riverpod_generator/test/integration/split.g.dart @@ -44,8 +44,8 @@ final class Counter2Provider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Counter2Provider $copyWithCreate( @@ -103,8 +103,8 @@ final class CounterProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CounterProvider $copyWithCreate( diff --git a/packages/riverpod_generator/test/integration/stream.g.dart b/packages/riverpod_generator/test/integration/stream.g.dart index 0c5cd4284..d765dcb95 100644 --- a/packages/riverpod_generator/test/integration/stream.g.dart +++ b/packages/riverpod_generator/test/integration/stream.g.dart @@ -53,8 +53,8 @@ final class GenericProvider @$internal @override - $StreamProviderElement> $createElement(ProviderContainer container) => - $StreamProviderElement(this, container); + $StreamProviderElement> $createElement($ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override GenericProvider $copyWithCreate( @@ -109,10 +109,10 @@ final class GenericFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -193,8 +193,8 @@ final class GenericClassProvider @$internal @override $StreamNotifierProviderElement, List> $createElement( - ProviderContainer container) => - $StreamNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $StreamNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -235,10 +235,10 @@ final class GenericClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericClassProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -251,10 +251,10 @@ final class GenericClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericClassProvider; - return provider._copyWithBuild(build).$createElement(container); + return provider._copyWithBuild(build).$createElement(pointer); }, ); } @@ -298,8 +298,8 @@ final class PublicProvider @$internal @override - $StreamProviderElement $createElement(ProviderContainer container) => - $StreamProviderElement(this, container); + $StreamProviderElement $createElement($ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override PublicProvider $copyWithCreate( @@ -350,8 +350,8 @@ final class _PrivateProvider @$internal @override - $StreamProviderElement $createElement(ProviderContainer container) => - $StreamProviderElement(this, container); + $StreamProviderElement $createElement($ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override _PrivateProvider $copyWithCreate( @@ -426,8 +426,8 @@ final class FamilyProvider @$internal @override - $StreamProviderElement $createElement(ProviderContainer container) => - $StreamProviderElement(this, container); + $StreamProviderElement $createElement($ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override FamilyProvider $copyWithCreate( @@ -533,7 +533,7 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyProvider; final argument = provider.argument as ( @@ -546,7 +546,7 @@ final class FamilyFamily extends Family { return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -600,8 +600,8 @@ final class PublicClassProvider @$internal @override $StreamNotifierProviderElement $createElement( - ProviderContainer container) => - $StreamNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $StreamNotifierProviderElement(this, pointer); } String _$publicClassHash() => r'b1526943c8ff0aaa20642bf78e744e5833cf9d02'; @@ -661,8 +661,8 @@ final class _PrivateClassProvider @$internal @override $StreamNotifierProviderElement<_PrivateClass, String> $createElement( - ProviderContainer container) => - $StreamNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $StreamNotifierProviderElement(this, pointer); } String _$privateClassHash() => r'8c0d52b7ab79c0546d0c84c011bb3512609e029e'; @@ -755,8 +755,8 @@ final class FamilyClassProvider @$internal @override $StreamNotifierProviderElement $createElement( - ProviderContainer container) => - $StreamNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $StreamNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -815,7 +815,7 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyClassProvider; final argument = provider.argument as ( @@ -828,7 +828,7 @@ final class FamilyClassFamily extends Family { return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -849,7 +849,7 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyClassProvider; final argument = provider.argument as ( @@ -862,7 +862,7 @@ final class FamilyClassFamily extends Family { return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/packages/riverpod_generator/test/integration/sync.g.dart b/packages/riverpod_generator/test/integration/sync.g.dart index d5c8b1286..f9823ddf5 100644 --- a/packages/riverpod_generator/test/integration/sync.g.dart +++ b/packages/riverpod_generator/test/integration/sync.g.dart @@ -61,8 +61,8 @@ final class GenericProvider @$internal @override - $ProviderElement> $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override GenericProvider $copyWithCreate( @@ -117,10 +117,10 @@ final class GenericFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -196,8 +196,8 @@ final class ComplexGenericProvider @$internal @override - $ProviderElement> $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ComplexGenericProvider $copyWithCreate( @@ -284,7 +284,7 @@ final class ComplexGenericFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ComplexGenericProvider; return provider._copyWithCreate(( @@ -296,7 +296,7 @@ final class ComplexGenericFamily extends Family { param: param, otherParam: otherParam, )); - }).$createElement(container); + }).$createElement(pointer); }, ); } @@ -385,8 +385,8 @@ final class GenericClassProvider @$internal @override $NotifierProviderElement, List> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -427,10 +427,10 @@ final class GenericClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericClassProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -442,10 +442,10 @@ final class GenericClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericClassProvider; - return provider._copyWithBuild(build).$createElement(container); + return provider._copyWithBuild(build).$createElement(pointer); }, ); } @@ -498,8 +498,8 @@ final class RawFutureProvider @$internal @override $ProviderElement>> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RawFutureProvider $copyWithCreate( @@ -559,8 +559,8 @@ final class RawStreamProvider @$internal @override $ProviderElement>> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RawStreamProvider $copyWithCreate( @@ -636,8 +636,8 @@ final class RawFutureClassProvider @$internal @override $NotifierProviderElement>> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$rawFutureClassHash() => r'bf66f1cdbd99118b8845d206e6a2611b3101f45c'; @@ -705,8 +705,8 @@ final class RawStreamClassProvider @$internal @override $NotifierProviderElement>> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$rawStreamClassHash() => r'712cffcb2018cfb4ff45012c1aa6e43c8cbe9d5d'; @@ -767,8 +767,8 @@ final class RawFamilyFutureProvider @$internal @override $ProviderElement>> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RawFamilyFutureProvider $copyWithCreate( @@ -838,14 +838,14 @@ final class RawFamilyFutureFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as RawFamilyFutureProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -900,8 +900,8 @@ final class RawFamilyStreamProvider @$internal @override $ProviderElement>> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RawFamilyStreamProvider $copyWithCreate( @@ -971,14 +971,14 @@ final class RawFamilyStreamFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as RawFamilyStreamProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1054,8 +1054,8 @@ final class RawFamilyFutureClassProvider @$internal @override $NotifierProviderElement>> - $createElement(ProviderContainer container) => - $NotifierProviderElement(this, container); + $createElement($ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -1099,14 +1099,14 @@ final class RawFamilyFutureClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as RawFamilyFutureClassProvider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1119,14 +1119,14 @@ final class RawFamilyFutureClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as RawFamilyFutureClassProvider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1216,8 +1216,8 @@ final class RawFamilyStreamClassProvider @$internal @override $NotifierProviderElement>> - $createElement(ProviderContainer container) => - $NotifierProviderElement(this, container); + $createElement($ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -1261,14 +1261,14 @@ final class RawFamilyStreamClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as RawFamilyStreamClassProvider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1281,14 +1281,14 @@ final class RawFamilyStreamClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as RawFamilyStreamClassProvider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1350,8 +1350,8 @@ final class PublicProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override PublicProvider $copyWithCreate( @@ -1409,8 +1409,8 @@ final class Supports$inNamesProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Supports$inNamesProvider $copyWithCreate( @@ -1496,8 +1496,8 @@ final class FamilyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FamilyProvider $copyWithCreate( @@ -1605,7 +1605,7 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyProvider; final argument = provider.argument as ( @@ -1618,7 +1618,7 @@ final class FamilyFamily extends Family { return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1662,8 +1662,8 @@ final class _PrivateProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override _PrivateProvider $copyWithCreate( @@ -1741,8 +1741,8 @@ final class PublicClassProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$publicClassHash() => r'd261f9eb927ca71440a5e1bdb24558c25fae4833'; @@ -1810,8 +1810,8 @@ final class _PrivateClassProvider @$internal @override $NotifierProviderElement<_PrivateClass, String> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$privateClassHash() => r'796e16abb79d7ad77728f9288d24566e429643f2'; @@ -1914,8 +1914,8 @@ final class FamilyClassProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -1976,7 +1976,7 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyClassProvider; final argument = provider.argument as ( @@ -1989,7 +1989,7 @@ final class FamilyClassFamily extends Family { return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -2010,7 +2010,7 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyClassProvider; final argument = provider.argument as ( @@ -2023,7 +2023,7 @@ final class FamilyClassFamily extends Family { return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -2116,8 +2116,8 @@ final class Supports$InFnNameProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Supports$InFnNameProvider $copyWithCreate( @@ -2174,10 +2174,10 @@ final class Supports$InFnNameFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as Supports$InFnNameProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -2258,8 +2258,8 @@ final class Supports$InFnNameFamilyProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Supports$InFnNameFamilyProvider $copyWithCreate( @@ -2354,7 +2354,7 @@ final class Supports$InFnNameFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as Supports$InFnNameFamilyProvider; return provider._copyWithCreate(( @@ -2368,7 +2368,7 @@ final class Supports$InFnNameFamilyFamily extends Family { named$arg: named$arg, defaultArg: defaultArg, )); - }).$createElement(container); + }).$createElement(pointer); }, ); } @@ -2460,8 +2460,8 @@ final class Supports$InClassNameProvider @$internal @override $NotifierProviderElement, String> - $createElement(ProviderContainer container) => - $NotifierProviderElement(this, container); + $createElement($ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -2503,10 +2503,10 @@ final class Supports$InClassNameFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as Supports$InClassNameProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -2519,10 +2519,10 @@ final class Supports$InClassNameFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as Supports$InClassNameProvider; - return provider._copyWithBuild(build).$createElement(container); + return provider._copyWithBuild(build).$createElement(pointer); }, ); } @@ -2648,8 +2648,8 @@ final class Supports$InClassFamilyNameProvider @$internal @override $NotifierProviderElement, String> - $createElement(ProviderContainer container) => - $NotifierProviderElement(this, container); + $createElement($ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -2705,7 +2705,7 @@ final class Supports$InClassFamilyNameFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as Supports$InClassFamilyNameProvider; return provider._copyWithCreate(() { @@ -2716,7 +2716,7 @@ final class Supports$InClassFamilyNameFamily extends Family { }); return create(argument); - }).$createElement(container); + }).$createElement(pointer); }, ); } @@ -2735,7 +2735,7 @@ final class Supports$InClassFamilyNameFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as Supports$InClassFamilyNameProvider; return provider._copyWithBuild((ref, notifier) { @@ -2746,7 +2746,7 @@ final class Supports$InClassFamilyNameFamily extends Family { }); return build(ref, notifier, argument); - }).$createElement(container); + }).$createElement(pointer); }, ); } @@ -2814,8 +2814,8 @@ final class GeneratedProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override GeneratedProvider $copyWithCreate( @@ -2882,8 +2882,8 @@ final class UnnecessaryCastProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override UnnecessaryCastProvider $copyWithCreate( @@ -2953,14 +2953,14 @@ final class UnnecessaryCastFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as UnnecessaryCastProvider; final argument = provider.argument; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -3036,8 +3036,8 @@ final class UnnecessaryCastClassProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -3081,14 +3081,14 @@ final class UnnecessaryCastClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as UnnecessaryCastClassProvider; final argument = provider.argument; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -3101,14 +3101,14 @@ final class UnnecessaryCastClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as UnnecessaryCastClassProvider; final argument = provider.argument; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -3183,8 +3183,8 @@ final class ManyDataStreamProvider @$internal @override - $StreamProviderElement> $createElement(ProviderContainer container) => - $StreamProviderElement(this, container); + $StreamProviderElement> $createElement($ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override ManyDataStreamProvider $copyWithCreate( @@ -3256,7 +3256,7 @@ final class ManyDataStreamFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ManyDataStreamProvider; return provider._copyWithCreate(( @@ -3264,7 +3264,7 @@ final class ManyDataStreamFamily extends Family { ManyProviderData pData, ) { return create(ref, pData); - }).$createElement(container); + }).$createElement(pointer); }, ); } diff --git a/packages/riverpod_graph/test/integration/generated/golden/lib/sync.g.dart b/packages/riverpod_graph/test/integration/generated/golden/lib/sync.g.dart index e41fd73d7..486c545c8 100644 --- a/packages/riverpod_graph/test/integration/generated/golden/lib/sync.g.dart +++ b/packages/riverpod_graph/test/integration/generated/golden/lib/sync.g.dart @@ -48,8 +48,8 @@ final class PublicProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override PublicProvider $copyWithCreate( @@ -111,8 +111,8 @@ final class Supports$inNamesProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Supports$inNamesProvider $copyWithCreate( @@ -198,8 +198,8 @@ final class FamilyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FamilyProvider $copyWithCreate( @@ -307,7 +307,7 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyProvider; final argument = provider.argument as ( @@ -320,7 +320,7 @@ final class FamilyFamily extends Family { return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -364,8 +364,8 @@ final class _PrivateProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override _PrivateProvider $copyWithCreate( @@ -443,8 +443,8 @@ final class PublicClassProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$publicClassHash() => r'c27eae39f455b986e570abb84f1471de7445ef3b'; @@ -512,8 +512,8 @@ final class _PrivateClassProvider @$internal @override $NotifierProviderElement<_PrivateClass, String> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$privateClassHash() => r'3b08af72c6d4f24aed264efcf181572525b75603'; @@ -616,8 +616,8 @@ final class FamilyClassProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -678,7 +678,7 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyClassProvider; final argument = provider.argument as ( @@ -691,7 +691,7 @@ final class FamilyClassFamily extends Family { return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -712,7 +712,7 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyClassProvider; final argument = provider.argument as ( @@ -725,7 +725,7 @@ final class FamilyClassFamily extends Family { return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -822,8 +822,8 @@ final class Supports$InClassNameProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$supports$InClassNameHash() => diff --git a/packages/riverpod_lint_flutter_test/test/assists/convert_class_based_provider_to_functional/convert_class_based_provider_to_functional.g.dart b/packages/riverpod_lint_flutter_test/test/assists/convert_class_based_provider_to_functional/convert_class_based_provider_to_functional.g.dart index 87ea2f25b..6c93d9b3a 100644 --- a/packages/riverpod_lint_flutter_test/test/assists/convert_class_based_provider_to_functional/convert_class_based_provider_to_functional.g.dart +++ b/packages/riverpod_lint_flutter_test/test/assists/convert_class_based_provider_to_functional/convert_class_based_provider_to_functional.g.dart @@ -64,8 +64,8 @@ final class ExampleProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$exampleHash() => r'081776126bafed3e1583bba9c1fadef798215ad7'; @@ -160,8 +160,8 @@ final class ExampleFamilyProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -213,7 +213,7 @@ final class ExampleFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ExampleFamilyProvider; final argument = provider.argument as ({ @@ -223,7 +223,7 @@ final class ExampleFamilyFamily extends Family { return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -241,7 +241,7 @@ final class ExampleFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ExampleFamilyProvider; final argument = provider.argument as ({ @@ -251,7 +251,7 @@ final class ExampleFamilyFamily extends Family { return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -360,8 +360,8 @@ final class GenericProvider @$internal @override $NotifierProviderElement, int> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -401,10 +401,10 @@ final class GenericFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -415,10 +415,10 @@ final class GenericFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericProvider; - return provider._copyWithBuild(build).$createElement(container); + return provider._copyWithBuild(build).$createElement(pointer); }, ); } diff --git a/packages/riverpod_lint_flutter_test/test/assists/convert_functional_provider_to_class_based/convert_functional_provider_to_class_based.g.dart b/packages/riverpod_lint_flutter_test/test/assists/convert_functional_provider_to_class_based/convert_functional_provider_to_class_based.g.dart index c7f65123d..fdb38120f 100644 --- a/packages/riverpod_lint_flutter_test/test/assists/convert_functional_provider_to_class_based/convert_functional_provider_to_class_based.g.dart +++ b/packages/riverpod_lint_flutter_test/test/assists/convert_functional_provider_to_class_based/convert_functional_provider_to_class_based.g.dart @@ -48,8 +48,8 @@ final class ExampleProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( @@ -126,8 +126,8 @@ final class ExampleFamilyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ExampleFamilyProvider $copyWithCreate( @@ -214,7 +214,7 @@ final class ExampleFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ExampleFamilyProvider; final argument = provider.argument as ({ @@ -224,7 +224,7 @@ final class ExampleFamilyFamily extends Family { return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/packages/riverpod_lint_flutter_test/test/lints/avoid_build_context_in_providers.g.dart b/packages/riverpod_lint_flutter_test/test/lints/avoid_build_context_in_providers.g.dart index 155715e30..1895adefc 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/avoid_build_context_in_providers.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/avoid_build_context_in_providers.g.dart @@ -59,8 +59,8 @@ final class FnProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FnProvider $copyWithCreate( @@ -145,7 +145,7 @@ final class FnFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FnProvider; final argument = provider.argument as ( @@ -155,7 +155,7 @@ final class FnFamily extends Family { return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -240,8 +240,8 @@ final class MyNotifierProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -291,7 +291,7 @@ final class MyNotifierFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as MyNotifierProvider; final argument = provider.argument as ( @@ -301,7 +301,7 @@ final class MyNotifierFamily extends Family { return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -319,7 +319,7 @@ final class MyNotifierFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as MyNotifierProvider; final argument = provider.argument as ( @@ -329,7 +329,7 @@ final class MyNotifierFamily extends Family { return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -413,8 +413,8 @@ final class Regresion2959Provider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$regresion2959Hash() => r'bcf9a829ce75026a78569de680451d157c7d90a2'; diff --git a/packages/riverpod_lint_flutter_test/test/lints/avoid_public_notifier_properties.g.dart b/packages/riverpod_lint_flutter_test/test/lints/avoid_public_notifier_properties.g.dart index 6fb430fa5..c866b556d 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/avoid_public_notifier_properties.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/avoid_public_notifier_properties.g.dart @@ -76,8 +76,8 @@ final class GeneratedNotifierProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -120,14 +120,14 @@ final class GeneratedNotifierFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GeneratedNotifierProvider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -138,14 +138,14 @@ final class GeneratedNotifierFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GeneratedNotifierProvider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/packages/riverpod_lint_flutter_test/test/lints/functional_ref/functional_ref.g.dart b/packages/riverpod_lint_flutter_test/test/lints/functional_ref/functional_ref.g.dart index 54d167633..063cfc520 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/functional_ref/functional_ref.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/functional_ref/functional_ref.g.dart @@ -44,8 +44,8 @@ final class NamelessProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override NamelessProvider $copyWithCreate( @@ -120,8 +120,8 @@ final class GenericsProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override GenericsProvider $copyWithCreate( @@ -178,10 +178,10 @@ final class GenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericsProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -242,8 +242,8 @@ final class NoGenericsProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override NoGenericsProvider $copyWithCreate( @@ -300,10 +300,10 @@ final class NoGenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as NoGenericsProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -363,8 +363,8 @@ final class MissingGenericsProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override MissingGenericsProvider $copyWithCreate( @@ -421,10 +421,10 @@ final class MissingGenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as MissingGenericsProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -484,8 +484,8 @@ final class WrongOrderProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override WrongOrderProvider $copyWithCreate( @@ -542,10 +542,10 @@ final class WrongOrderFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as WrongOrderProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } diff --git a/packages/riverpod_lint_flutter_test/test/lints/notifier_extends.g.dart b/packages/riverpod_lint_flutter_test/test/lints/notifier_extends.g.dart index d648120df..096a36980 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/notifier_extends.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/notifier_extends.g.dart @@ -61,8 +61,8 @@ final class MyNotifierProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$myNotifierHash() => r'58f5439a3b1036ba7804f63a5a6ebe0114125039'; @@ -129,8 +129,8 @@ final class NoExtendsProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$noExtendsHash() => r'3f1276999a9a6d3676c628c25ed853cbefb21ce9'; @@ -197,8 +197,8 @@ final class WrongExtendsProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$wrongExtendsHash() => r'6479055793af10a34e225373a67f7eaac4d7c0de'; @@ -266,8 +266,8 @@ final class _PrivateClassProvider @$internal @override $NotifierProviderElement<_PrivateClass, String> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$privateClassHash() => r'ba68a29a609566bb8bc0792391f842762356e124'; @@ -362,8 +362,8 @@ final class GenericsProvider @$internal @override $NotifierProviderElement, int> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -404,10 +404,10 @@ final class GenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericsProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -418,10 +418,10 @@ final class GenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GenericsProvider; - return provider._copyWithBuild(build).$createElement(container); + return provider._copyWithBuild(build).$createElement(pointer); }, ); } @@ -517,8 +517,8 @@ final class NoGenericsProvider @$internal @override $NotifierProviderElement, int> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -559,10 +559,10 @@ final class NoGenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as NoGenericsProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -574,10 +574,10 @@ final class NoGenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as NoGenericsProvider; - return provider._copyWithBuild(build).$createElement(container); + return provider._copyWithBuild(build).$createElement(pointer); }, ); } @@ -675,8 +675,8 @@ final class MissingGenericsProvider @$internal @override $NotifierProviderElement, int> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -717,10 +717,10 @@ final class MissingGenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as MissingGenericsProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -731,10 +731,10 @@ final class MissingGenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as MissingGenericsProvider; - return provider._copyWithBuild(build).$createElement(container); + return provider._copyWithBuild(build).$createElement(pointer); }, ); } @@ -830,8 +830,8 @@ final class WrongOrderProvider @$internal @override $NotifierProviderElement, int> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -872,10 +872,10 @@ final class WrongOrderFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as WrongOrderProvider; - return provider._copyWithCreate(create).$createElement(container); + return provider._copyWithCreate(create).$createElement(pointer); }, ); } @@ -886,10 +886,10 @@ final class WrongOrderFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as WrongOrderProvider; - return provider._copyWithBuild(build).$createElement(container); + return provider._copyWithBuild(build).$createElement(pointer); }, ); } diff --git a/packages/riverpod_lint_flutter_test/test/lints/only_use_keep_alive_inside_keep_alive.g.dart b/packages/riverpod_lint_flutter_test/test/lints/only_use_keep_alive_inside_keep_alive.g.dart index 2c7c5ba80..1688bdb84 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/only_use_keep_alive_inside_keep_alive.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/only_use_keep_alive_inside_keep_alive.g.dart @@ -44,8 +44,8 @@ final class KeepAliveProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override KeepAliveProvider $copyWithCreate( @@ -121,8 +121,8 @@ final class KeepAliveClassProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$keepAliveClassHash() => r'e2fffa4d14837dfef71f6a2cc230b826b82541ea'; @@ -172,8 +172,8 @@ final class AutoDisposeProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override AutoDisposeProvider $copyWithCreate( @@ -249,8 +249,8 @@ final class AutoDisposeClassProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$autoDisposeClassHash() => r'5127ab94f7ab4ccf90deb3fca90d7a3c3c4c83f5'; @@ -300,8 +300,8 @@ final class FnProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FnProvider $copyWithCreate( diff --git a/packages/riverpod_lint_flutter_test/test/lints/protected_notifier_properties.g.dart b/packages/riverpod_lint_flutter_test/test/lints/protected_notifier_properties.g.dart index a4b79dace..f64001270 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/protected_notifier_properties.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/protected_notifier_properties.g.dart @@ -59,9 +59,8 @@ final class AProvider extends $NotifierProvider { @$internal @override - $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $NotifierProviderElement $createElement($ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$aHash() => r'9bf449b010f4dd5800e78f9f5b8a431b1a79c8b7'; @@ -126,9 +125,8 @@ final class A2Provider extends $NotifierProvider { @$internal @override - $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $NotifierProviderElement $createElement($ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$a2Hash() => r'898d46cbcec03233c7b8b0754810a6903226aa2e'; @@ -206,9 +204,8 @@ final class A3Provider extends $NotifierProvider { @$internal @override - $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $NotifierProviderElement $createElement($ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -251,14 +248,14 @@ final class A3Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as A3Provider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -269,14 +266,14 @@ final class A3Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as A3Provider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -362,9 +359,8 @@ final class A4Provider extends $NotifierProvider { @$internal @override - $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $NotifierProviderElement $createElement($ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -407,14 +403,14 @@ final class A4Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as A4Provider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -425,14 +421,14 @@ final class A4Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as A4Provider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -511,8 +507,8 @@ final class A5Provider extends $AsyncNotifierProvider { @$internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -555,14 +551,14 @@ final class A5Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as A5Provider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -574,14 +570,14 @@ final class A5Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as A5Provider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -660,8 +656,8 @@ final class A6Provider extends $AsyncNotifierProvider { @$internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -704,14 +700,14 @@ final class A6Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as A6Provider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -723,14 +719,14 @@ final class A6Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as A6Provider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -809,8 +805,8 @@ final class A7Provider extends $StreamNotifierProvider { @$internal @override $StreamNotifierProviderElement $createElement( - ProviderContainer container) => - $StreamNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $StreamNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -853,14 +849,14 @@ final class A7Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as A7Provider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -872,14 +868,14 @@ final class A7Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as A7Provider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -958,8 +954,8 @@ final class A8Provider extends $StreamNotifierProvider { @$internal @override $StreamNotifierProviderElement $createElement( - ProviderContainer container) => - $StreamNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $StreamNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -1002,14 +998,14 @@ final class A8Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as A8Provider; final argument = provider.argument as int; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1021,14 +1017,14 @@ final class A8Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as A8Provider; final argument = provider.argument as int; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1101,9 +1097,8 @@ final class BProvider extends $NotifierProvider { @$internal @override - $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $NotifierProviderElement $createElement($ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$bHash() => r'44288285e9c28f846d609ba892520f577ecf7867'; @@ -1168,9 +1163,8 @@ final class B2Provider extends $NotifierProvider { @$internal @override - $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $NotifierProviderElement $createElement($ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$b2Hash() => r'292925c285c6975ed6585d541c5a9ae18977d73c'; diff --git a/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/another.g.dart b/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/another.g.dart index a51582bb3..4d7d226ce 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/another.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/another.g.dart @@ -44,8 +44,8 @@ final class BProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override BProvider $copyWithCreate( @@ -103,8 +103,8 @@ final class AnotherScopedProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override AnotherScopedProvider $copyWithCreate( @@ -166,8 +166,8 @@ final class AnotherNonEmptyScopedProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override AnotherNonEmptyScopedProvider $copyWithCreate( diff --git a/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies.g.dart b/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies.g.dart index ada784e5f..eb1a0a8a9 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies.g.dart @@ -44,8 +44,8 @@ final class DepProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override DepProvider $copyWithCreate( @@ -107,8 +107,8 @@ final class TransitiveDepProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override TransitiveDepProvider $copyWithCreate( @@ -166,8 +166,8 @@ final class Dep2Provider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Dep2Provider $copyWithCreate( @@ -234,8 +234,8 @@ final class DepFamilyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override DepFamilyProvider $copyWithCreate( @@ -305,14 +305,14 @@ final class DepFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as DepFamilyProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -364,8 +364,8 @@ final class PlainAnnotationProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override PlainAnnotationProvider $copyWithCreate( @@ -423,8 +423,8 @@ final class CustomAnnotationProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CustomAnnotationProvider $copyWithCreate( @@ -485,8 +485,8 @@ final class CustomAnnotationWithTrailingCommaProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CustomAnnotationWithTrailingCommaProvider $copyWithCreate( @@ -545,8 +545,8 @@ final class ExistingDepProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ExistingDepProvider $copyWithCreate( @@ -604,8 +604,8 @@ final class MultipleDepsProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override MultipleDepsProvider $copyWithCreate( @@ -671,8 +671,8 @@ final class ProviderWithDartDocProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ProviderWithDartDocProvider $copyWithCreate( diff --git a/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies2.g.dart b/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies2.g.dart index 8be01020e..bdb43a8b0 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies2.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies2.g.dart @@ -44,8 +44,8 @@ final class DepProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override DepProvider $copyWithCreate( @@ -103,8 +103,8 @@ final class GeneratedScopedProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override GeneratedScopedProvider $copyWithCreate( @@ -162,8 +162,8 @@ final class GeneratedRootProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override GeneratedRootProvider $copyWithCreate( @@ -223,8 +223,8 @@ final class WatchScopedButNoDependenciesProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override WatchScopedButNoDependenciesProvider $copyWithCreate( @@ -286,8 +286,8 @@ final class WatchGeneratedScopedButNoDependenciesProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override WatchGeneratedScopedButNoDependenciesProvider $copyWithCreate( @@ -348,8 +348,8 @@ final class WatchRootButNoDependenciesProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override WatchRootButNoDependenciesProvider $copyWithCreate( @@ -411,8 +411,8 @@ final class WatchGeneratedRootButNoDependenciesProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override WatchGeneratedRootButNoDependenciesProvider $copyWithCreate( @@ -473,8 +473,8 @@ final class WatchScopedButEmptyDependenciesProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override WatchScopedButEmptyDependenciesProvider $copyWithCreate( @@ -536,8 +536,8 @@ final class WatchGeneratedScopedButEmptyDependenciesProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override WatchGeneratedScopedButEmptyDependenciesProvider $copyWithCreate( @@ -598,8 +598,8 @@ final class WatchRootButEmptyDependenciesProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override WatchRootButEmptyDependenciesProvider $copyWithCreate( @@ -661,8 +661,8 @@ final class WatchGeneratedRootButEmptyDependenciesProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override WatchGeneratedRootButEmptyDependenciesProvider $copyWithCreate( @@ -729,8 +729,8 @@ final class WatchGeneratedScopedAndContainsDependencyProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override WatchGeneratedScopedAndContainsDependencyProvider $copyWithCreate( @@ -814,8 +814,8 @@ final class ClassWatchGeneratedRootButMissingDependenciesProvider @$internal @override $NotifierProviderElement - $createElement(ProviderContainer container) => - $NotifierProviderElement(this, container); + $createElement($ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$classWatchGeneratedRootButMissingDependenciesHash() => @@ -871,8 +871,8 @@ final class Regression2348Provider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Regression2348Provider $copyWithCreate( @@ -952,8 +952,8 @@ final class Regression2417Provider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$regression2417Hash() => r'c9ac0ba44e849ea1460c79c1f676feba1b5400da'; @@ -1014,8 +1014,8 @@ final class FamilyDepProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FamilyDepProvider $copyWithCreate( @@ -1087,14 +1087,14 @@ final class FamilyDepFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyDepProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1151,8 +1151,8 @@ final class FamilyDep2Provider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FamilyDep2Provider $copyWithCreate( @@ -1225,14 +1225,14 @@ final class FamilyDep2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FamilyDep2Provider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -1276,8 +1276,8 @@ final class AliasProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override AliasProvider $copyWithCreate( @@ -1352,8 +1352,8 @@ final class AliasClassProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$aliasClassHash() => r'f5c1f43e7541638274ca7dc334a713763c9c8071'; @@ -1425,8 +1425,8 @@ final class RiverpodDependenciesProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$riverpodDependenciesHash() => @@ -1477,8 +1477,8 @@ final class FooProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FooProvider $copyWithCreate( @@ -1536,8 +1536,8 @@ final class CrossFileDependencyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CrossFileDependencyProvider $copyWithCreate( diff --git a/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/unused_dependency.g.dart b/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/unused_dependency.g.dart index 76c293ef8..18acd29fa 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/unused_dependency.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/unused_dependency.g.dart @@ -44,8 +44,8 @@ final class RootProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RootProvider $copyWithCreate( @@ -103,8 +103,8 @@ final class DepProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override DepProvider $copyWithCreate( @@ -162,8 +162,8 @@ final class Dep2Provider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Dep2Provider $copyWithCreate( @@ -231,8 +231,8 @@ final class ExtraDepProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ExtraDepProvider $copyWithCreate( @@ -294,8 +294,8 @@ final class NoDepProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override NoDepProvider $copyWithCreate( @@ -359,8 +359,8 @@ final class DependenciesFirstThenKeepAliveProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override DependenciesFirstThenKeepAliveProvider $copyWithCreate( @@ -423,8 +423,8 @@ final class NoDepNoParamProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override NoDepNoParamProvider $copyWithCreate( @@ -486,8 +486,8 @@ final class NoDepWithoutCommaProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override NoDepWithoutCommaProvider $copyWithCreate( @@ -549,8 +549,8 @@ final class RootDepProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RootDepProvider $copyWithCreate( diff --git a/packages/riverpod_lint_flutter_test/test/lints/provider_parameters.g.dart b/packages/riverpod_lint_flutter_test/test/lints/provider_parameters.g.dart index 09f56f89b..11870007b 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/provider_parameters.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/provider_parameters.g.dart @@ -53,8 +53,8 @@ final class GeneratorProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override GeneratorProvider $copyWithCreate( @@ -124,14 +124,14 @@ final class GeneratorFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as GeneratorProvider; final argument = provider.argument; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/packages/riverpod_lint_flutter_test/test/lints/scoped_providers_should_specify_dependencies.g.dart b/packages/riverpod_lint_flutter_test/test/lints/scoped_providers_should_specify_dependencies.g.dart index cac255ada..55f4712a4 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/scoped_providers_should_specify_dependencies.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/scoped_providers_should_specify_dependencies.g.dart @@ -62,8 +62,8 @@ final class UnimplementedScopedProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$unimplementedScopedHash() => @@ -114,8 +114,8 @@ final class ScopedProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ScopedProvider $copyWithCreate( @@ -173,8 +173,8 @@ final class RootProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RootProvider $copyWithCreate( diff --git a/packages/riverpod_lint_flutter_test/test/lints/unknown_scoped_usage.g.dart b/packages/riverpod_lint_flutter_test/test/lints/unknown_scoped_usage.g.dart index 05e7e9945..039f3aba2 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/unknown_scoped_usage.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/unknown_scoped_usage.g.dart @@ -44,8 +44,8 @@ final class ScopedProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ScopedProvider $copyWithCreate( @@ -103,8 +103,8 @@ final class RootProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RootProvider $copyWithCreate( diff --git a/packages/riverpod_lint_flutter_test/test/lints/unsupported_provider_value.g.dart b/packages/riverpod_lint_flutter_test/test/lints/unsupported_provider_value.g.dart index 3abdda32e..c2ea21a9d 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/unsupported_provider_value.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/unsupported_provider_value.g.dart @@ -44,8 +44,8 @@ final class IntegerProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override IntegerProvider $copyWithCreate( @@ -104,9 +104,8 @@ final class StateNotifierProvider @$internal @override - $ProviderElement $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override StateNotifierProvider $copyWithCreate( @@ -160,8 +159,8 @@ final class AsyncStateNotifierProvider extends $FunctionalProvider< @$internal @override $FutureProviderElement $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override AsyncStateNotifierProvider $copyWithCreate( @@ -238,8 +237,8 @@ final class StateNotifierClassProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$stateNotifierClassHash() => @@ -286,8 +285,8 @@ final class StateNotifierAsyncProvider extends $FunctionalProvider< @$internal @override $FutureProviderElement $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override StateNotifierAsyncProvider $copyWithCreate( @@ -356,8 +355,8 @@ final class SelfNotifierProvider @$internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$selfNotifierHash() => r'5a857f5c92a9b7a35daa4e527bd333cf3d8d19ac'; @@ -425,8 +424,8 @@ final class SyncSelfNotifierProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$syncSelfNotifierHash() => r'4f3a2463cb5693a5c8d7e772b4d7c9774b9ba637'; @@ -486,8 +485,8 @@ final class StreamSelfNotifierProvider @$internal @override $StreamNotifierProviderElement - $createElement(ProviderContainer container) => - $StreamNotifierProviderElement(this, container); + $createElement($ProviderPointer pointer) => + $StreamNotifierProviderElement(this, pointer); } String _$streamSelfNotifierHash() => @@ -551,8 +550,8 @@ final class StateNotifierClassAsyncProvider @$internal @override $AsyncNotifierProviderElement - $createElement(ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $createElement($ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$stateNotifierClassAsyncHash() => @@ -605,9 +604,8 @@ final class ChangeNotifierProvider @$internal @override - $ProviderElement $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ChangeNotifierProvider $copyWithCreate( @@ -683,8 +681,8 @@ final class ChangeNotifierClassProvider @$internal @override $NotifierProviderElement - $createElement(ProviderContainer container) => - $NotifierProviderElement(this, container); + $createElement($ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$changeNotifierClassHash() => @@ -735,8 +733,8 @@ final class NotifierProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override NotifierProvider $copyWithCreate( @@ -796,8 +794,8 @@ final class AutoDisposeNotifierProvider @$internal @override $ProviderElement $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override AutoDisposeNotifierProvider $copyWithCreate( @@ -874,8 +872,8 @@ final class NotifierClassProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$notifierClassHash() => r'e7eefebec2fca4f982582449e7ec14322932b748'; @@ -926,9 +924,8 @@ final class AsyncNotifierProvider @$internal @override - $ProviderElement $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override AsyncNotifierProvider $copyWithCreate( @@ -1004,8 +1001,8 @@ final class AsyncNotifierClassProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$asyncNotifierClassHash() => @@ -1058,8 +1055,8 @@ final class RawNotifierProvider @$internal @override $ProviderElement> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RawNotifierProvider $copyWithCreate( @@ -1119,8 +1116,8 @@ final class RawFutureNotifierProvider extends $FunctionalProvider< @$internal @override $ProviderElement>> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RawFutureNotifierProvider $copyWithCreate( @@ -1180,8 +1177,8 @@ final class RawStreamNotifierProvider extends $FunctionalProvider< @$internal @override $ProviderElement>> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RawStreamNotifierProvider $copyWithCreate( @@ -1235,8 +1232,8 @@ final class FutureRawNotifierProvider extends $FunctionalProvider< @$internal @override $FutureProviderElement> $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override FutureRawNotifierProvider $copyWithCreate( @@ -1290,8 +1287,8 @@ final class StreamRawNotifierProvider extends $FunctionalProvider< @$internal @override $StreamProviderElement> $createElement( - ProviderContainer container) => - $StreamProviderElement(this, container); + $ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override StreamRawNotifierProvider $copyWithCreate( diff --git a/website/docs/advanced/select/select/codegen.g.dart b/website/docs/advanced/select/select/codegen.g.dart index 5bc5686f4..7be2b2f33 100644 --- a/website/docs/advanced/select/select/codegen.g.dart +++ b/website/docs/advanced/select/select/codegen.g.dart @@ -46,8 +46,8 @@ final class ExampleProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/advanced/select/select_async/codegen.g.dart b/website/docs/advanced/select/select_async/codegen.g.dart index ba1f4f5d7..08b777520 100644 --- a/website/docs/advanced/select/select_async/codegen.g.dart +++ b/website/docs/advanced/select/select_async/codegen.g.dart @@ -39,8 +39,8 @@ final class UserProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override UserProvider $copyWithCreate( @@ -98,8 +98,8 @@ final class ExampleProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/case_studies/cancel/detail_screen/codegen.g.dart b/website/docs/case_studies/cancel/detail_screen/codegen.g.dart index 434acec61..db79245a3 100644 --- a/website/docs/case_studies/cancel/detail_screen/codegen.g.dart +++ b/website/docs/case_studies/cancel/detail_screen/codegen.g.dart @@ -59,9 +59,8 @@ final class ActivityProvider @$internal @override - $FutureProviderElement $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ActivityProvider $copyWithCreate( diff --git a/website/docs/case_studies/cancel/detail_screen_cancel/codegen.g.dart b/website/docs/case_studies/cancel/detail_screen_cancel/codegen.g.dart index 089de5441..b86b18b0e 100644 --- a/website/docs/case_studies/cancel/detail_screen_cancel/codegen.g.dart +++ b/website/docs/case_studies/cancel/detail_screen_cancel/codegen.g.dart @@ -39,9 +39,8 @@ final class ActivityProvider @$internal @override - $FutureProviderElement $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ActivityProvider $copyWithCreate( diff --git a/website/docs/case_studies/cancel/detail_screen_debounce/codegen.g.dart b/website/docs/case_studies/cancel/detail_screen_debounce/codegen.g.dart index b6cdd724b..2cef845c2 100644 --- a/website/docs/case_studies/cancel/detail_screen_debounce/codegen.g.dart +++ b/website/docs/case_studies/cancel/detail_screen_debounce/codegen.g.dart @@ -39,9 +39,8 @@ final class ActivityProvider @$internal @override - $FutureProviderElement $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ActivityProvider $copyWithCreate( diff --git a/website/docs/case_studies/cancel/provider_with_extension/codegen.g.dart b/website/docs/case_studies/cancel/provider_with_extension/codegen.g.dart index b211d3340..9581f6014 100644 --- a/website/docs/case_studies/cancel/provider_with_extension/codegen.g.dart +++ b/website/docs/case_studies/cancel/provider_with_extension/codegen.g.dart @@ -39,9 +39,8 @@ final class ActivityProvider @$internal @override - $FutureProviderElement $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ActivityProvider $copyWithCreate( diff --git a/website/docs/case_studies/pull_to_refresh/fetch_activity/codegen.g.dart b/website/docs/case_studies/pull_to_refresh/fetch_activity/codegen.g.dart index cdf5cdbac..aef5ca20d 100644 --- a/website/docs/case_studies/pull_to_refresh/fetch_activity/codegen.g.dart +++ b/website/docs/case_studies/pull_to_refresh/fetch_activity/codegen.g.dart @@ -39,9 +39,8 @@ final class ActivityProvider @$internal @override - $FutureProviderElement $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ActivityProvider $copyWithCreate( diff --git a/website/docs/case_studies/pull_to_refresh/full_app/codegen.g.dart b/website/docs/case_studies/pull_to_refresh/full_app/codegen.g.dart index 434acec61..db79245a3 100644 --- a/website/docs/case_studies/pull_to_refresh/full_app/codegen.g.dart +++ b/website/docs/case_studies/pull_to_refresh/full_app/codegen.g.dart @@ -59,9 +59,8 @@ final class ActivityProvider @$internal @override - $FutureProviderElement $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ActivityProvider $copyWithCreate( diff --git a/website/docs/concepts/about_codegen/main.g.dart b/website/docs/concepts/about_codegen/main.g.dart index 3dead3ea9..7a59fb2ff 100644 --- a/website/docs/concepts/about_codegen/main.g.dart +++ b/website/docs/concepts/about_codegen/main.g.dart @@ -48,8 +48,8 @@ final class FetchUserProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override FetchUserProvider $copyWithCreate( @@ -119,14 +119,14 @@ final class FetchUserFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FetchUserProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/website/docs/concepts/about_codegen/provider_type/async_class_future.g.dart b/website/docs/concepts/about_codegen/provider_type/async_class_future.g.dart index 1fc29d4ba..f996c8037 100644 --- a/website/docs/concepts/about_codegen/provider_type/async_class_future.g.dart +++ b/website/docs/concepts/about_codegen/provider_type/async_class_future.g.dart @@ -55,8 +55,8 @@ final class ExampleProvider extends $AsyncNotifierProvider { @$internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$exampleHash() => r'8a906741b8ea4b9b0d3f0b924779704b3e1773a1'; diff --git a/website/docs/concepts/about_codegen/provider_type/async_class_stream.g.dart b/website/docs/concepts/about_codegen/provider_type/async_class_stream.g.dart index 696e8e575..a85924ca2 100644 --- a/website/docs/concepts/about_codegen/provider_type/async_class_stream.g.dart +++ b/website/docs/concepts/about_codegen/provider_type/async_class_stream.g.dart @@ -55,8 +55,8 @@ final class ExampleProvider extends $StreamNotifierProvider { @$internal @override $StreamNotifierProviderElement $createElement( - ProviderContainer container) => - $StreamNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $StreamNotifierProviderElement(this, pointer); } String _$exampleHash() => r'4bca936132b77a9a804549f086f33571724b4804'; diff --git a/website/docs/concepts/about_codegen/provider_type/async_fn_future.g.dart b/website/docs/concepts/about_codegen/provider_type/async_fn_future.g.dart index 1f5444b57..91b2227ef 100644 --- a/website/docs/concepts/about_codegen/provider_type/async_fn_future.g.dart +++ b/website/docs/concepts/about_codegen/provider_type/async_fn_future.g.dart @@ -39,8 +39,8 @@ final class ExampleProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/concepts/about_codegen/provider_type/async_fn_stream.g.dart b/website/docs/concepts/about_codegen/provider_type/async_fn_stream.g.dart index 7951bd7a2..1eaed5598 100644 --- a/website/docs/concepts/about_codegen/provider_type/async_fn_stream.g.dart +++ b/website/docs/concepts/about_codegen/provider_type/async_fn_stream.g.dart @@ -39,8 +39,8 @@ final class ExampleProvider @$internal @override - $StreamProviderElement $createElement(ProviderContainer container) => - $StreamProviderElement(this, container); + $StreamProviderElement $createElement($ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/concepts/about_codegen/provider_type/auto_dispose.g.dart b/website/docs/concepts/about_codegen/provider_type/auto_dispose.g.dart index 83c6377aa..5f74738ac 100644 --- a/website/docs/concepts/about_codegen/provider_type/auto_dispose.g.dart +++ b/website/docs/concepts/about_codegen/provider_type/auto_dispose.g.dart @@ -46,8 +46,8 @@ final class Example1Provider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Example1Provider $copyWithCreate( @@ -105,8 +105,8 @@ final class Example2Provider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override Example2Provider $copyWithCreate( diff --git a/website/docs/concepts/about_codegen/provider_type/family.g.dart b/website/docs/concepts/about_codegen/provider_type/family.g.dart index 69a1976c2..f19235fe6 100644 --- a/website/docs/concepts/about_codegen/provider_type/family.g.dart +++ b/website/docs/concepts/about_codegen/provider_type/family.g.dart @@ -55,8 +55,8 @@ final class ExampleProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( @@ -126,14 +126,14 @@ final class ExampleFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ExampleProvider; final argument = provider.argument as int; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/website/docs/concepts/about_codegen/provider_type/family_class.g.dart b/website/docs/concepts/about_codegen/provider_type/family_class.g.dart index 0fbebd59f..d31b7afef 100644 --- a/website/docs/concepts/about_codegen/provider_type/family_class.g.dart +++ b/website/docs/concepts/about_codegen/provider_type/family_class.g.dart @@ -87,8 +87,8 @@ final class ExampleProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -138,7 +138,7 @@ final class ExampleFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ExampleProvider; final argument = provider.argument as ( @@ -148,7 +148,7 @@ final class ExampleFamily extends Family { return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -166,7 +166,7 @@ final class ExampleFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ExampleProvider; final argument = provider.argument as ( @@ -176,7 +176,7 @@ final class ExampleFamily extends Family { return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/website/docs/concepts/about_codegen/provider_type/family_fn.g.dart b/website/docs/concepts/about_codegen/provider_type/family_fn.g.dart index 33d057344..abf99703a 100644 --- a/website/docs/concepts/about_codegen/provider_type/family_fn.g.dart +++ b/website/docs/concepts/about_codegen/provider_type/family_fn.g.dart @@ -61,8 +61,8 @@ final class ExampleProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( @@ -147,7 +147,7 @@ final class ExampleFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ExampleProvider; final argument = provider.argument as ( @@ -157,7 +157,7 @@ final class ExampleFamily extends Family { return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/website/docs/concepts/about_codegen/provider_type/sync_class.g.dart b/website/docs/concepts/about_codegen/provider_type/sync_class.g.dart index d3ae7d304..ed3932ac4 100644 --- a/website/docs/concepts/about_codegen/provider_type/sync_class.g.dart +++ b/website/docs/concepts/about_codegen/provider_type/sync_class.g.dart @@ -63,8 +63,8 @@ final class ExampleProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$exampleHash() => r'c237193ab6d57674973aaa02eb73db6f6822eb26'; diff --git a/website/docs/concepts/about_codegen/provider_type/sync_fn.g.dart b/website/docs/concepts/about_codegen/provider_type/sync_fn.g.dart index b928978c5..c765c99fc 100644 --- a/website/docs/concepts/about_codegen/provider_type/sync_fn.g.dart +++ b/website/docs/concepts/about_codegen/provider_type/sync_fn.g.dart @@ -46,8 +46,8 @@ final class ExampleProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/concepts/combining_provider_states/characters_provider/codegen.g.dart b/website/docs/concepts/combining_provider_states/characters_provider/codegen.g.dart index 950b74bc2..4d34ff6f9 100644 --- a/website/docs/concepts/combining_provider_states/characters_provider/codegen.g.dart +++ b/website/docs/concepts/combining_provider_states/characters_provider/codegen.g.dart @@ -46,8 +46,8 @@ final class SearchProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override SearchProvider $copyWithCreate( @@ -101,8 +101,8 @@ final class ConfigsProvider extends $FunctionalProvider< @$internal @override $StreamProviderElement $createElement( - ProviderContainer container) => - $StreamProviderElement(this, container); + $ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override ConfigsProvider $copyWithCreate( @@ -156,8 +156,8 @@ final class CharactersProvider extends $FunctionalProvider< @$internal @override $FutureProviderElement> $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override CharactersProvider $copyWithCreate( diff --git a/website/docs/concepts/combining_provider_states/city_provider/codegen.g.dart b/website/docs/concepts/combining_provider_states/city_provider/codegen.g.dart index 3bea31389..a7a071efe 100644 --- a/website/docs/concepts/combining_provider_states/city_provider/codegen.g.dart +++ b/website/docs/concepts/combining_provider_states/city_provider/codegen.g.dart @@ -46,8 +46,8 @@ final class CityProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CityProvider $copyWithCreate( diff --git a/website/docs/concepts/combining_provider_states/filtered_todo_list_provider/codegen.g.dart b/website/docs/concepts/combining_provider_states/filtered_todo_list_provider/codegen.g.dart index f55659935..b0b793401 100644 --- a/website/docs/concepts/combining_provider_states/filtered_todo_list_provider/codegen.g.dart +++ b/website/docs/concepts/combining_provider_states/filtered_todo_list_provider/codegen.g.dart @@ -46,8 +46,8 @@ final class FilterProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FilterProvider $copyWithCreate( @@ -106,8 +106,8 @@ final class FilteredTodoListProvider @$internal @override - $ProviderElement> $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FilteredTodoListProvider $copyWithCreate( diff --git a/website/docs/concepts/combining_provider_states/read_in_provider/codegen.g.dart b/website/docs/concepts/combining_provider_states/read_in_provider/codegen.g.dart index b2807a870..0123f0ce2 100644 --- a/website/docs/concepts/combining_provider_states/read_in_provider/codegen.g.dart +++ b/website/docs/concepts/combining_provider_states/read_in_provider/codegen.g.dart @@ -46,8 +46,8 @@ final class AnotherProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override AnotherProvider $copyWithCreate( @@ -105,8 +105,8 @@ final class MyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override MyProvider $copyWithCreate( diff --git a/website/docs/concepts/combining_provider_states/select_async_provider/codegen.g.dart b/website/docs/concepts/combining_provider_states/select_async_provider/codegen.g.dart index 8b6b58514..147e10802 100644 --- a/website/docs/concepts/combining_provider_states/select_async_provider/codegen.g.dart +++ b/website/docs/concepts/combining_provider_states/select_async_provider/codegen.g.dart @@ -42,8 +42,8 @@ final class ConfigProvider extends $FunctionalProvider< @$internal @override $StreamProviderElement $createElement( - ProviderContainer container) => - $StreamProviderElement(this, container); + $ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override ConfigProvider $copyWithCreate( @@ -97,8 +97,8 @@ final class ProductsProvider extends $FunctionalProvider< @$internal @override $FutureProviderElement> $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ProductsProvider $copyWithCreate( diff --git a/website/docs/concepts/combining_provider_states/todo_list_provider/codegen.g.dart b/website/docs/concepts/combining_provider_states/todo_list_provider/codegen.g.dart index 845454d13..ba4c58ad4 100644 --- a/website/docs/concepts/combining_provider_states/todo_list_provider/codegen.g.dart +++ b/website/docs/concepts/combining_provider_states/todo_list_provider/codegen.g.dart @@ -63,8 +63,8 @@ final class TodoListProvider extends $NotifierProvider> { @$internal @override $NotifierProviderElement> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$todoListHash() => r'6c965beb867ffeee119133f0ae2e6ebeb68e6f7e'; diff --git a/website/docs/concepts/combining_provider_states/weather_provider/codegen.g.dart b/website/docs/concepts/combining_provider_states/weather_provider/codegen.g.dart index 1a81ae8c1..4713ee02c 100644 --- a/website/docs/concepts/combining_provider_states/weather_provider/codegen.g.dart +++ b/website/docs/concepts/combining_provider_states/weather_provider/codegen.g.dart @@ -46,8 +46,8 @@ final class CityProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CityProvider $copyWithCreate( @@ -98,8 +98,8 @@ final class WeatherProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override WeatherProvider $copyWithCreate( diff --git a/website/docs/concepts/combining_provider_states/whole_object_provider/codegen.g.dart b/website/docs/concepts/combining_provider_states/whole_object_provider/codegen.g.dart index 0392538e3..53612e54e 100644 --- a/website/docs/concepts/combining_provider_states/whole_object_provider/codegen.g.dart +++ b/website/docs/concepts/combining_provider_states/whole_object_provider/codegen.g.dart @@ -42,8 +42,8 @@ final class ConfigProvider extends $FunctionalProvider< @$internal @override $StreamProviderElement $createElement( - ProviderContainer container) => - $StreamProviderElement(this, container); + $ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override ConfigProvider $copyWithCreate( @@ -97,8 +97,8 @@ final class ProductsProvider extends $FunctionalProvider< @$internal @override $FutureProviderElement> $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ProductsProvider $copyWithCreate( diff --git a/website/docs/concepts/lifecycle_on_dispose/codegen.g.dart b/website/docs/concepts/lifecycle_on_dispose/codegen.g.dart index ecf188ef6..aca468f3b 100644 --- a/website/docs/concepts/lifecycle_on_dispose/codegen.g.dart +++ b/website/docs/concepts/lifecycle_on_dispose/codegen.g.dart @@ -39,8 +39,8 @@ final class ExampleProvider @$internal @override - $StreamProviderElement $createElement(ProviderContainer container) => - $StreamProviderElement(this, container); + $StreamProviderElement $createElement($ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/concepts/providers/creating_a_provider/codegen.g.dart b/website/docs/concepts/providers/creating_a_provider/codegen.g.dart index 4a64af46a..0a10a1b81 100644 --- a/website/docs/concepts/providers/creating_a_provider/codegen.g.dart +++ b/website/docs/concepts/providers/creating_a_provider/codegen.g.dart @@ -46,8 +46,8 @@ final class MyProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override MyProvider $copyWithCreate( diff --git a/website/docs/concepts/providers/declaring_many_providers/codegen.g.dart b/website/docs/concepts/providers/declaring_many_providers/codegen.g.dart index caf0995be..bcff72444 100644 --- a/website/docs/concepts/providers/declaring_many_providers/codegen.g.dart +++ b/website/docs/concepts/providers/declaring_many_providers/codegen.g.dart @@ -46,8 +46,8 @@ final class CityProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CityProvider $copyWithCreate( @@ -105,8 +105,8 @@ final class CountryProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CountryProvider $copyWithCreate( diff --git a/website/docs/concepts/reading/counter/codegen.g.dart b/website/docs/concepts/reading/counter/codegen.g.dart index 0dfd30fc6..9dafc37bf 100644 --- a/website/docs/concepts/reading/counter/codegen.g.dart +++ b/website/docs/concepts/reading/counter/codegen.g.dart @@ -47,8 +47,8 @@ final class RepositoryProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RepositoryProvider $copyWithCreate( @@ -123,8 +123,8 @@ final class CounterProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$counterHash() => r'6bd7806869af024b3288645da03c077af9478083'; diff --git a/website/docs/concepts/reading/listen/codegen.g.dart b/website/docs/concepts/reading/listen/codegen.g.dart index 2c1f4b273..cc31620cc 100644 --- a/website/docs/concepts/reading/listen/codegen.g.dart +++ b/website/docs/concepts/reading/listen/codegen.g.dart @@ -46,8 +46,8 @@ final class AnotherProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override AnotherProvider $copyWithCreate( diff --git a/website/docs/concepts/reading/listen_build/codegen.g.dart b/website/docs/concepts/reading/listen_build/codegen.g.dart index 9bfbb449c..82e3d501c 100644 --- a/website/docs/concepts/reading/listen_build/codegen.g.dart +++ b/website/docs/concepts/reading/listen_build/codegen.g.dart @@ -63,8 +63,8 @@ final class CounterProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$counterHash() => r'4320f811608c7a6e7342b83e3031965a34f7cb8e'; diff --git a/website/docs/concepts/reading/listen_build/codegen_hooks.g.dart b/website/docs/concepts/reading/listen_build/codegen_hooks.g.dart index 56d4702b1..1d0961dfa 100644 --- a/website/docs/concepts/reading/listen_build/codegen_hooks.g.dart +++ b/website/docs/concepts/reading/listen_build/codegen_hooks.g.dart @@ -63,8 +63,8 @@ final class CounterProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$counterHash() => r'4320f811608c7a6e7342b83e3031965a34f7cb8e'; diff --git a/website/docs/concepts/reading/provider/codegen.g.dart b/website/docs/concepts/reading/provider/codegen.g.dart index cd68e7820..3c1c9ffa9 100644 --- a/website/docs/concepts/reading/provider/codegen.g.dart +++ b/website/docs/concepts/reading/provider/codegen.g.dart @@ -47,8 +47,8 @@ final class RepositoryProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RepositoryProvider $copyWithCreate( @@ -106,8 +106,8 @@ final class ValueProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ValueProvider $copyWithCreate( diff --git a/website/docs/concepts/reading/read/codegen.g.dart b/website/docs/concepts/reading/read/codegen.g.dart index 9867e786b..881b5249c 100644 --- a/website/docs/concepts/reading/read/codegen.g.dart +++ b/website/docs/concepts/reading/read/codegen.g.dart @@ -63,8 +63,8 @@ final class CounterProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$counterHash() => r'600c6beb47b3732049b6955a9e49d7eef30c741a'; diff --git a/website/docs/concepts/reading/read/codegen_hooks.g.dart b/website/docs/concepts/reading/read/codegen_hooks.g.dart index 0e2b3d9b6..fe6b3d615 100644 --- a/website/docs/concepts/reading/read/codegen_hooks.g.dart +++ b/website/docs/concepts/reading/read/codegen_hooks.g.dart @@ -63,8 +63,8 @@ final class CounterProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$counterHash() => r'600c6beb47b3732049b6955a9e49d7eef30c741a'; diff --git a/website/docs/concepts/reading/read_build/codegen.g.dart b/website/docs/concepts/reading/read_build/codegen.g.dart index 9867e786b..881b5249c 100644 --- a/website/docs/concepts/reading/read_build/codegen.g.dart +++ b/website/docs/concepts/reading/read_build/codegen.g.dart @@ -63,8 +63,8 @@ final class CounterProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$counterHash() => r'600c6beb47b3732049b6955a9e49d7eef30c741a'; diff --git a/website/docs/concepts/reading/read_notifier_build/codegen.g.dart b/website/docs/concepts/reading/read_notifier_build/codegen.g.dart index 9867e786b..881b5249c 100644 --- a/website/docs/concepts/reading/read_notifier_build/codegen.g.dart +++ b/website/docs/concepts/reading/read_notifier_build/codegen.g.dart @@ -63,8 +63,8 @@ final class CounterProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$counterHash() => r'600c6beb47b3732049b6955a9e49d7eef30c741a'; diff --git a/website/docs/concepts/reading/watch/codegen.g.dart b/website/docs/concepts/reading/watch/codegen.g.dart index af2d9d36f..2a1f73ce1 100644 --- a/website/docs/concepts/reading/watch/codegen.g.dart +++ b/website/docs/concepts/reading/watch/codegen.g.dart @@ -47,8 +47,8 @@ final class FilterTypeProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FilterTypeProvider $copyWithCreate( @@ -123,8 +123,8 @@ final class TodosProvider extends $NotifierProvider> { @$internal @override $NotifierProviderElement> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$todosHash() => r'b66ac2b1e5cf7ac7957d25864cfdffad1af233a6'; @@ -175,8 +175,8 @@ final class FilteredTodoListProvider @$internal @override - $ProviderElement> $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FilteredTodoListProvider $copyWithCreate( diff --git a/website/docs/concepts/reading/watch_build/codegen.g.dart b/website/docs/concepts/reading/watch_build/codegen.g.dart index 51d85de22..38d3c5550 100644 --- a/website/docs/concepts/reading/watch_build/codegen.g.dart +++ b/website/docs/concepts/reading/watch_build/codegen.g.dart @@ -63,8 +63,8 @@ final class TodoListProvider extends $NotifierProvider> { @$internal @override $NotifierProviderElement> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$todoListHash() => r'77f007cd4f5105330a4c2ab8555ea0d1716945c1'; @@ -114,8 +114,8 @@ final class CounterProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CounterProvider $copyWithCreate( diff --git a/website/docs/concepts/reading/watch_build/codegen_hooks.g.dart b/website/docs/concepts/reading/watch_build/codegen_hooks.g.dart index 1bc192195..d40df19a7 100644 --- a/website/docs/concepts/reading/watch_build/codegen_hooks.g.dart +++ b/website/docs/concepts/reading/watch_build/codegen_hooks.g.dart @@ -63,8 +63,8 @@ final class TodoListProvider extends $NotifierProvider> { @$internal @override $NotifierProviderElement> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$todoListHash() => r'77f007cd4f5105330a4c2ab8555ea0d1716945c1'; @@ -114,8 +114,8 @@ final class CounterProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CounterProvider $copyWithCreate( diff --git a/website/docs/concepts/reading/watch_notifier_build/codegen.g.dart b/website/docs/concepts/reading/watch_notifier_build/codegen.g.dart index 9867e786b..881b5249c 100644 --- a/website/docs/concepts/reading/watch_notifier_build/codegen.g.dart +++ b/website/docs/concepts/reading/watch_notifier_build/codegen.g.dart @@ -63,8 +63,8 @@ final class CounterProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$counterHash() => r'600c6beb47b3732049b6955a9e49d7eef30c741a'; diff --git a/website/docs/concepts/why_immutability/codegen.g.dart b/website/docs/concepts/why_immutability/codegen.g.dart index 9e365d289..475118f0d 100644 --- a/website/docs/concepts/why_immutability/codegen.g.dart +++ b/website/docs/concepts/why_immutability/codegen.g.dart @@ -64,8 +64,8 @@ final class ThemeNotifierProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$themeNotifierHash() => r'e119d56d9bf8b8d7c19624997f99d116098b45e9'; diff --git a/website/docs/essentials/auto_dispose/cache_for_usage/codegen.g.dart b/website/docs/essentials/auto_dispose/cache_for_usage/codegen.g.dart index ed70e46f9..40d68df62 100644 --- a/website/docs/essentials/auto_dispose/cache_for_usage/codegen.g.dart +++ b/website/docs/essentials/auto_dispose/cache_for_usage/codegen.g.dart @@ -39,8 +39,8 @@ final class ExampleProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/essentials/auto_dispose/codegen_keep_alive.g.dart b/website/docs/essentials/auto_dispose/codegen_keep_alive.g.dart index 910016c97..c648c1a45 100644 --- a/website/docs/essentials/auto_dispose/codegen_keep_alive.g.dart +++ b/website/docs/essentials/auto_dispose/codegen_keep_alive.g.dart @@ -46,8 +46,8 @@ final class ExampleProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/essentials/auto_dispose/invalidate_family_example/codegen.g.dart b/website/docs/essentials/auto_dispose/invalidate_family_example/codegen.g.dart index 34032c995..cf3ac7964 100644 --- a/website/docs/essentials/auto_dispose/invalidate_family_example/codegen.g.dart +++ b/website/docs/essentials/auto_dispose/invalidate_family_example/codegen.g.dart @@ -55,8 +55,8 @@ final class LabelProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override LabelProvider $copyWithCreate( @@ -126,14 +126,14 @@ final class LabelFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as LabelProvider; final argument = provider.argument as String; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/website/docs/essentials/auto_dispose/keep_alive/codegen.g.dart b/website/docs/essentials/auto_dispose/keep_alive/codegen.g.dart index 1ee57c762..5f3a37cd0 100644 --- a/website/docs/essentials/auto_dispose/keep_alive/codegen.g.dart +++ b/website/docs/essentials/auto_dispose/keep_alive/codegen.g.dart @@ -39,8 +39,8 @@ final class ExampleProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/essentials/auto_dispose/on_dispose_example/codegen.g.dart b/website/docs/essentials/auto_dispose/on_dispose_example/codegen.g.dart index 1c1f5756d..b9f105c59 100644 --- a/website/docs/essentials/auto_dispose/on_dispose_example/codegen.g.dart +++ b/website/docs/essentials/auto_dispose/on_dispose_example/codegen.g.dart @@ -46,8 +46,8 @@ final class OtherProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override OtherProvider $copyWithCreate( @@ -98,8 +98,8 @@ final class ExampleProvider @$internal @override - $StreamProviderElement $createElement(ProviderContainer container) => - $StreamProviderElement(this, container); + $StreamProviderElement $createElement($ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/essentials/combining_requests/functional_ref/codegen.g.dart b/website/docs/essentials/combining_requests/functional_ref/codegen.g.dart index 5da2a0d71..720bf282b 100644 --- a/website/docs/essentials/combining_requests/functional_ref/codegen.g.dart +++ b/website/docs/essentials/combining_requests/functional_ref/codegen.g.dart @@ -46,8 +46,8 @@ final class OtherProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override OtherProvider $copyWithCreate( @@ -105,8 +105,8 @@ final class ExampleProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/essentials/combining_requests/listen_example/codegen.g.dart b/website/docs/essentials/combining_requests/listen_example/codegen.g.dart index 5b9b38e0f..5b473f416 100644 --- a/website/docs/essentials/combining_requests/listen_example/codegen.g.dart +++ b/website/docs/essentials/combining_requests/listen_example/codegen.g.dart @@ -46,8 +46,8 @@ final class OtherProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override OtherProvider $copyWithCreate( @@ -105,8 +105,8 @@ final class ExampleProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/essentials/combining_requests/notifier_ref/codegen.g.dart b/website/docs/essentials/combining_requests/notifier_ref/codegen.g.dart index 7d3d83817..0a59e96ad 100644 --- a/website/docs/essentials/combining_requests/notifier_ref/codegen.g.dart +++ b/website/docs/essentials/combining_requests/notifier_ref/codegen.g.dart @@ -46,8 +46,8 @@ final class OtherProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override OtherProvider $copyWithCreate( @@ -122,8 +122,8 @@ final class ExampleProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$exampleHash() => r'893db991b377b8e314e60c429043e5e81f1fd526'; diff --git a/website/docs/essentials/combining_requests/read_example/codegen.g.dart b/website/docs/essentials/combining_requests/read_example/codegen.g.dart index f95fd7890..9ff8950cc 100644 --- a/website/docs/essentials/combining_requests/read_example/codegen.g.dart +++ b/website/docs/essentials/combining_requests/read_example/codegen.g.dart @@ -46,8 +46,8 @@ final class OtherProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override OtherProvider $copyWithCreate( @@ -122,8 +122,8 @@ final class MyNotifierProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$myNotifierHash() => r'353efe22dd5a91b2d036286211ac9e60c9de5f6d'; diff --git a/website/docs/essentials/combining_requests/watch_example/codegen.g.dart b/website/docs/essentials/combining_requests/watch_example/codegen.g.dart index f31f1664c..3889af056 100644 --- a/website/docs/essentials/combining_requests/watch_example/codegen.g.dart +++ b/website/docs/essentials/combining_requests/watch_example/codegen.g.dart @@ -43,8 +43,8 @@ final class LocationProvider extends $FunctionalProvider< @$internal @override $StreamProviderElement<({double longitude, double latitude})> $createElement( - ProviderContainer container) => - $StreamProviderElement(this, container); + $ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override LocationProvider $copyWithCreate( @@ -98,8 +98,8 @@ final class RestaurantsNearMeProvider extends $FunctionalProvider< @$internal @override $FutureProviderElement> $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override RestaurantsNearMeProvider $copyWithCreate( diff --git a/website/docs/essentials/combining_requests/watch_placement/codegen.g.dart b/website/docs/essentials/combining_requests/watch_placement/codegen.g.dart index f50439720..5ba090e2d 100644 --- a/website/docs/essentials/combining_requests/watch_placement/codegen.g.dart +++ b/website/docs/essentials/combining_requests/watch_placement/codegen.g.dart @@ -46,8 +46,8 @@ final class OtherProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override OtherProvider $copyWithCreate( @@ -105,8 +105,8 @@ final class ExampleProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( @@ -181,8 +181,8 @@ final class MyNotifierProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$myNotifierHash() => r'ad79fdb5b0e72a800fa03efc1e7157f0d1524844'; diff --git a/website/docs/essentials/eager_initialization/require_value/codegen.g.dart b/website/docs/essentials/eager_initialization/require_value/codegen.g.dart index 3332824a0..9247cd8a0 100644 --- a/website/docs/essentials/eager_initialization/require_value/codegen.g.dart +++ b/website/docs/essentials/eager_initialization/require_value/codegen.g.dart @@ -39,8 +39,8 @@ final class ExampleProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/essentials/first_request/codegen/provider.g.dart b/website/docs/essentials/first_request/codegen/provider.g.dart index 694d37af9..4a14abb62 100644 --- a/website/docs/essentials/first_request/codegen/provider.g.dart +++ b/website/docs/essentials/first_request/codegen/provider.g.dart @@ -47,9 +47,8 @@ final class ActivityProvider @$internal @override - $FutureProviderElement $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ActivityProvider $copyWithCreate( diff --git a/website/docs/essentials/passing_args/family/codegen.g.dart b/website/docs/essentials/passing_args/family/codegen.g.dart index 4ce4498dd..cb2ba3594 100644 --- a/website/docs/essentials/passing_args/family/codegen.g.dart +++ b/website/docs/essentials/passing_args/family/codegen.g.dart @@ -48,9 +48,8 @@ final class ActivityProvider @$internal @override - $FutureProviderElement $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ActivityProvider $copyWithCreate( @@ -120,14 +119,14 @@ final class ActivityFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ActivityProvider; final argument = provider.argument as String; return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -195,8 +194,8 @@ final class ActivityNotifier2Provider @$internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -239,14 +238,14 @@ final class ActivityNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ActivityNotifier2Provider; final argument = provider.argument as String; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -259,14 +258,14 @@ final class ActivityNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as ActivityNotifier2Provider; final argument = provider.argument as String; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/website/docs/essentials/passing_args/no_arg_provider/codegen.g.dart b/website/docs/essentials/passing_args/no_arg_provider/codegen.g.dart index 220d83a3f..bc3d1dcf9 100644 --- a/website/docs/essentials/passing_args/no_arg_provider/codegen.g.dart +++ b/website/docs/essentials/passing_args/no_arg_provider/codegen.g.dart @@ -39,9 +39,8 @@ final class ActivityProvider @$internal @override - $FutureProviderElement $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ActivityProvider $copyWithCreate( @@ -109,8 +108,8 @@ final class ActivityNotifier2Provider @$internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$activityNotifier2Hash() => r'280f4d82a186cfb62827f4d7c74f5349bb0a9e4a'; diff --git a/website/docs/essentials/side_effects/codegen/todo_list_notifier.g.dart b/website/docs/essentials/side_effects/codegen/todo_list_notifier.g.dart index 86137df46..0e519aeaa 100644 --- a/website/docs/essentials/side_effects/codegen/todo_list_notifier.g.dart +++ b/website/docs/essentials/side_effects/codegen/todo_list_notifier.g.dart @@ -71,8 +71,8 @@ final class TodoListProvider @$internal @override $AsyncNotifierProviderElement> $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$todoListHash() => r'c939d438b07da6065dbbcfab86c27ef363bdb76c'; diff --git a/website/docs/essentials/side_effects/codegen/todo_list_notifier_add_todo.g.dart b/website/docs/essentials/side_effects/codegen/todo_list_notifier_add_todo.g.dart index 41d7a91b3..ddf51af2b 100644 --- a/website/docs/essentials/side_effects/codegen/todo_list_notifier_add_todo.g.dart +++ b/website/docs/essentials/side_effects/codegen/todo_list_notifier_add_todo.g.dart @@ -56,8 +56,8 @@ final class TodoListProvider @$internal @override $AsyncNotifierProviderElement> $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$todoListHash() => r'4008395aaca8f55312f668c0b2a32e7599f82349'; diff --git a/website/docs/essentials/side_effects/codegen/todo_list_provider.g.dart b/website/docs/essentials/side_effects/codegen/todo_list_provider.g.dart index 07a96e522..69dd50b2b 100644 --- a/website/docs/essentials/side_effects/codegen/todo_list_provider.g.dart +++ b/website/docs/essentials/side_effects/codegen/todo_list_provider.g.dart @@ -39,9 +39,8 @@ final class TodoListProvider @$internal @override - $FutureProviderElement> $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement> $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override TodoListProvider $copyWithCreate( diff --git a/website/docs/essentials/testing/notifier_mock/codegen.g.dart b/website/docs/essentials/testing/notifier_mock/codegen.g.dart index 73b4a4036..bb8a55697 100644 --- a/website/docs/essentials/testing/notifier_mock/codegen.g.dart +++ b/website/docs/essentials/testing/notifier_mock/codegen.g.dart @@ -63,8 +63,8 @@ final class MyNotifierProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$myNotifierHash() => r'912fa35c2296626fc0825bcbcfc6b6c85958be02'; diff --git a/website/docs/essentials/testing/provider_to_mock/codegen.g.dart b/website/docs/essentials/testing/provider_to_mock/codegen.g.dart index 3332824a0..9247cd8a0 100644 --- a/website/docs/essentials/testing/provider_to_mock/codegen.g.dart +++ b/website/docs/essentials/testing/provider_to_mock/codegen.g.dart @@ -39,8 +39,8 @@ final class ExampleProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ExampleProvider $copyWithCreate( diff --git a/website/docs/essentials/websockets_sync/pipe_change_notifier.g.dart b/website/docs/essentials/websockets_sync/pipe_change_notifier.g.dart index 91ba4046b..18cb6f9a5 100644 --- a/website/docs/essentials/websockets_sync/pipe_change_notifier.g.dart +++ b/website/docs/essentials/websockets_sync/pipe_change_notifier.g.dart @@ -56,8 +56,8 @@ final class MyListenableProvider extends $FunctionalProvider< @$internal @override $ProviderElement>> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override MyListenableProvider $copyWithCreate( diff --git a/website/docs/essentials/websockets_sync/raw_usage.g.dart b/website/docs/essentials/websockets_sync/raw_usage.g.dart index 39a826e81..2abb6e174 100644 --- a/website/docs/essentials/websockets_sync/raw_usage.g.dart +++ b/website/docs/essentials/websockets_sync/raw_usage.g.dart @@ -47,9 +47,8 @@ final class RawStreamProvider @$internal @override - $ProviderElement>> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement>> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RawStreamProvider $copyWithCreate( diff --git a/website/docs/essentials/websockets_sync/shared_pipe_change_notifier.g.dart b/website/docs/essentials/websockets_sync/shared_pipe_change_notifier.g.dart index d819bbf92..b238ebb66 100644 --- a/website/docs/essentials/websockets_sync/shared_pipe_change_notifier.g.dart +++ b/website/docs/essentials/websockets_sync/shared_pipe_change_notifier.g.dart @@ -48,8 +48,8 @@ final class MyListenableProvider extends $FunctionalProvider< @$internal @override $ProviderElement>> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override MyListenableProvider $copyWithCreate( @@ -109,8 +109,8 @@ final class AnotherListenableProvider extends $FunctionalProvider< @$internal @override $ProviderElement>> $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderPointer pointer) => + $ProviderElement(this, pointer); @override AnotherListenableProvider $copyWithCreate( diff --git a/website/docs/essentials/websockets_sync/stream_provider/codegen.g.dart b/website/docs/essentials/websockets_sync/stream_provider/codegen.g.dart index d2a75745b..a15bce177 100644 --- a/website/docs/essentials/websockets_sync/stream_provider/codegen.g.dart +++ b/website/docs/essentials/websockets_sync/stream_provider/codegen.g.dart @@ -39,8 +39,8 @@ final class StreamExampleProvider @$internal @override - $StreamProviderElement $createElement(ProviderContainer container) => - $StreamProviderElement(this, container); + $StreamProviderElement $createElement($ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override StreamExampleProvider $copyWithCreate( diff --git a/website/docs/essentials/websockets_sync/sync_definition/codegen.g.dart b/website/docs/essentials/websockets_sync/sync_definition/codegen.g.dart index e601efd26..9d76fdbb8 100644 --- a/website/docs/essentials/websockets_sync/sync_definition/codegen.g.dart +++ b/website/docs/essentials/websockets_sync/sync_definition/codegen.g.dart @@ -46,8 +46,8 @@ final class SynchronousExampleProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override SynchronousExampleProvider $copyWithCreate( diff --git a/website/docs/from_provider/family/family.g.dart b/website/docs/from_provider/family/family.g.dart index 5195726c4..1ed93a3ec 100644 --- a/website/docs/from_provider/family/family.g.dart +++ b/website/docs/from_provider/family/family.g.dart @@ -61,8 +61,8 @@ final class RandomProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RandomProvider $copyWithCreate( @@ -147,7 +147,7 @@ final class RandomFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as RandomProvider; final argument = provider.argument as ({ @@ -157,7 +157,7 @@ final class RandomFamily extends Family { return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/website/docs/from_provider/motivation/async_values/async_values.g.dart b/website/docs/from_provider/motivation/async_values/async_values.g.dart index 13a80aeba..7f7ac9ac7 100644 --- a/website/docs/from_provider/motivation/async_values/async_values.g.dart +++ b/website/docs/from_provider/motivation/async_values/async_values.g.dart @@ -39,9 +39,8 @@ final class ItemsApiProvider @$internal @override - $FutureProviderElement> $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement> $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ItemsApiProvider $copyWithCreate( @@ -100,8 +99,8 @@ final class EvenItemsProvider @$internal @override - $ProviderElement> $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override EvenItemsProvider $copyWithCreate( diff --git a/website/docs/from_provider/motivation/auto_dispose/auto_dispose.g.dart b/website/docs/from_provider/motivation/auto_dispose/auto_dispose.g.dart index 00b5a80b6..f41b8a2eb 100644 --- a/website/docs/from_provider/motivation/auto_dispose/auto_dispose.g.dart +++ b/website/docs/from_provider/motivation/auto_dispose/auto_dispose.g.dart @@ -46,8 +46,8 @@ final class DiceRollProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override DiceRollProvider $copyWithCreate( @@ -105,8 +105,8 @@ final class CachedDiceRollProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CachedDiceRollProvider $copyWithCreate( diff --git a/website/docs/from_provider/motivation/combine/combine.g.dart b/website/docs/from_provider/motivation/combine/combine.g.dart index 97d1c5027..24857d12f 100644 --- a/website/docs/from_provider/motivation/combine/combine.g.dart +++ b/website/docs/from_provider/motivation/combine/combine.g.dart @@ -46,8 +46,8 @@ final class NumberProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override NumberProvider $copyWithCreate( @@ -105,8 +105,8 @@ final class DoubledProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override DoubledProvider $copyWithCreate( diff --git a/website/docs/from_provider/motivation/same_type/same_type.g.dart b/website/docs/from_provider/motivation/same_type/same_type.g.dart index d5c781dc9..efc4eeed9 100644 --- a/website/docs/from_provider/motivation/same_type/same_type.g.dart +++ b/website/docs/from_provider/motivation/same_type/same_type.g.dart @@ -46,8 +46,8 @@ final class ItemsProvider extends $FunctionalProvider, List> @$internal @override - $ProviderElement> $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override ItemsProvider $copyWithCreate( @@ -106,8 +106,8 @@ final class EvenItemsProvider @$internal @override - $ProviderElement> $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override EvenItemsProvider $copyWithCreate( diff --git a/website/docs/introduction/getting_started/dart_hello_world/main.g.dart b/website/docs/introduction/getting_started/dart_hello_world/main.g.dart index 8ea69b222..56da860ef 100644 --- a/website/docs/introduction/getting_started/dart_hello_world/main.g.dart +++ b/website/docs/introduction/getting_started/dart_hello_world/main.g.dart @@ -46,8 +46,8 @@ final class HelloWorldProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override HelloWorldProvider $copyWithCreate( diff --git a/website/docs/introduction/getting_started/hello_world/hooks_codegen/main.g.dart b/website/docs/introduction/getting_started/hello_world/hooks_codegen/main.g.dart index 8ea69b222..56da860ef 100644 --- a/website/docs/introduction/getting_started/hello_world/hooks_codegen/main.g.dart +++ b/website/docs/introduction/getting_started/hello_world/hooks_codegen/main.g.dart @@ -46,8 +46,8 @@ final class HelloWorldProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override HelloWorldProvider $copyWithCreate( diff --git a/website/docs/introduction/getting_started/hello_world/main.g.dart b/website/docs/introduction/getting_started/hello_world/main.g.dart index 8ea69b222..56da860ef 100644 --- a/website/docs/introduction/getting_started/hello_world/main.g.dart +++ b/website/docs/introduction/getting_started/hello_world/main.g.dart @@ -46,8 +46,8 @@ final class HelloWorldProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override HelloWorldProvider $copyWithCreate( diff --git a/website/docs/introduction/why_riverpod/codegen.g.dart b/website/docs/introduction/why_riverpod/codegen.g.dart index 63dac5337..ac257888d 100644 --- a/website/docs/introduction/why_riverpod/codegen.g.dart +++ b/website/docs/introduction/why_riverpod/codegen.g.dart @@ -57,8 +57,8 @@ final class FetchPackagesProvider extends $FunctionalProvider< @$internal @override $FutureProviderElement> $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override FetchPackagesProvider $copyWithCreate( @@ -143,7 +143,7 @@ final class FetchPackagesFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as FetchPackagesProvider; final argument = provider.argument as ({ @@ -153,7 +153,7 @@ final class FetchPackagesFamily extends Family { return provider .$copyWithCreate((ref) => create(ref, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/website/docs/migration/from_change_notifier/declaration/declaration.g.dart b/website/docs/migration/from_change_notifier/declaration/declaration.g.dart index 89fde15c5..d2ad608bb 100644 --- a/website/docs/migration/from_change_notifier/declaration/declaration.g.dart +++ b/website/docs/migration/from_change_notifier/declaration/declaration.g.dart @@ -56,8 +56,8 @@ final class MyNotifierProvider @$internal @override $AsyncNotifierProviderElement> $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$myNotifierHash() => r'fc9a07f8ef9f792da2ac660d76ea0a809335ba18'; diff --git a/website/docs/migration/from_change_notifier/initialization/initialization.g.dart b/website/docs/migration/from_change_notifier/initialization/initialization.g.dart index 7ba06bab0..e90ca97c4 100644 --- a/website/docs/migration/from_change_notifier/initialization/initialization.g.dart +++ b/website/docs/migration/from_change_notifier/initialization/initialization.g.dart @@ -56,8 +56,8 @@ final class MyNotifierProvider @$internal @override $AsyncNotifierProviderElement> $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$myNotifierHash() => r'1c67c12443102cf8c43efbf6c630d3028d9847c3'; diff --git a/website/docs/migration/from_change_notifier/migrated/migrated.g.dart b/website/docs/migration/from_change_notifier/migrated/migrated.g.dart index 155265ea9..4fb397aa3 100644 --- a/website/docs/migration/from_change_notifier/migrated/migrated.g.dart +++ b/website/docs/migration/from_change_notifier/migrated/migrated.g.dart @@ -56,8 +56,8 @@ final class MyNotifierProvider @$internal @override $AsyncNotifierProviderElement> $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$myNotifierHash() => r'bde95c56aa12eff7c8c01ede57ae4ad2b616c225'; diff --git a/website/docs/migration/from_state_notifier/add_listener/add_listener.g.dart b/website/docs/migration/from_state_notifier/add_listener/add_listener.g.dart index 3421fa239..5c74f4073 100644 --- a/website/docs/migration/from_state_notifier/add_listener/add_listener.g.dart +++ b/website/docs/migration/from_state_notifier/add_listener/add_listener.g.dart @@ -63,8 +63,8 @@ final class MyNotifierProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$myNotifierHash() => r'9acd382ed579c545ace755687b155e28eba01d22'; diff --git a/website/docs/migration/from_state_notifier/async_notifier/async_notifier.g.dart b/website/docs/migration/from_state_notifier/async_notifier/async_notifier.g.dart index 6354391c1..d4cbac605 100644 --- a/website/docs/migration/from_state_notifier/async_notifier/async_notifier.g.dart +++ b/website/docs/migration/from_state_notifier/async_notifier/async_notifier.g.dart @@ -56,8 +56,8 @@ final class AsyncTodosNotifierProvider @$internal @override $AsyncNotifierProviderElement> $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$asyncTodosNotifierHash() => diff --git a/website/docs/migration/from_state_notifier/build_init/build_init.g.dart b/website/docs/migration/from_state_notifier/build_init/build_init.g.dart index 5c2954920..0f50958bd 100644 --- a/website/docs/migration/from_state_notifier/build_init/build_init.g.dart +++ b/website/docs/migration/from_state_notifier/build_init/build_init.g.dart @@ -64,8 +64,8 @@ final class CounterNotifierProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$counterNotifierHash() => r'8d4e4011da15a0ef79af9622336839a0c9e406ab'; diff --git a/website/docs/migration/from_state_notifier/family_and_dispose/family_and_dispose.g.dart b/website/docs/migration/from_state_notifier/family_and_dispose/family_and_dispose.g.dart index 40794adb0..466508708 100644 --- a/website/docs/migration/from_state_notifier/family_and_dispose/family_and_dispose.g.dart +++ b/website/docs/migration/from_state_notifier/family_and_dispose/family_and_dispose.g.dart @@ -47,9 +47,8 @@ final class TaskTrackerProvider @$internal @override - $ProviderElement $createElement( - ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override TaskTrackerProvider $copyWithCreate( @@ -132,8 +131,8 @@ final class BugsEncounteredNotifierProvider @$internal @override $AsyncNotifierProviderElement $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); @override bool operator ==(Object other) { @@ -178,14 +177,14 @@ final class BugsEncounteredNotifierFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as BugsEncounteredNotifierProvider; final argument = provider.argument as String; return provider .$copyWithCreate(() => create(argument)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -198,14 +197,14 @@ final class BugsEncounteredNotifierFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (container, provider) { + createElement: (pointer, provider) { provider as BugsEncounteredNotifierProvider; final argument = provider.argument as String; return provider .$copyWithBuild((ref, notifier) => build(ref, notifier, argument)) - .$createElement(container); + .$createElement(pointer); }, ); } diff --git a/website/docs/migration/from_state_notifier/from_state_provider/from_state_provider.g.dart b/website/docs/migration/from_state_notifier/from_state_provider/from_state_provider.g.dart index 414240d7b..641c46461 100644 --- a/website/docs/migration/from_state_notifier/from_state_provider/from_state_provider.g.dart +++ b/website/docs/migration/from_state_notifier/from_state_provider/from_state_provider.g.dart @@ -64,8 +64,8 @@ final class CounterNotifierProvider @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$counterNotifierHash() => r'b32033040f0fff627f1a6dfd9cfb4e93a842390b'; diff --git a/website/docs/migration/from_state_notifier/old_lifecycles/old_lifecycles.g.dart b/website/docs/migration/from_state_notifier/old_lifecycles/old_lifecycles.g.dart index ebeae7b8b..33760654e 100644 --- a/website/docs/migration/from_state_notifier/old_lifecycles/old_lifecycles.g.dart +++ b/website/docs/migration/from_state_notifier/old_lifecycles/old_lifecycles.g.dart @@ -63,8 +63,8 @@ final class MyNotifierProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$myNotifierHash() => r'0495c52ce893ee0304d4d5ac5648c634ed4a241e'; diff --git a/website/docs/migration/from_state_notifier/old_lifecycles_final/old_lifecycles_final.g.dart b/website/docs/migration/from_state_notifier/old_lifecycles_final/old_lifecycles_final.g.dart index d7770bbed..6f98f75ea 100644 --- a/website/docs/migration/from_state_notifier/old_lifecycles_final/old_lifecycles_final.g.dart +++ b/website/docs/migration/from_state_notifier/old_lifecycles_final/old_lifecycles_final.g.dart @@ -46,8 +46,8 @@ final class DurationProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override DurationProvider $copyWithCreate( @@ -105,8 +105,8 @@ final class RepositoryProvider extends $FunctionalProvider<_MyRepo, _MyRepo> @$internal @override - $ProviderElement<_MyRepo> $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement<_MyRepo> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override RepositoryProvider $copyWithCreate( @@ -181,8 +181,8 @@ final class MyNotifierProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$myNotifierHash() => r'8ea2586ea29d12306efd4b8b847142136dd20338'; diff --git a/website/docs/providers/future_provider/config_provider/codegen.g.dart b/website/docs/providers/future_provider/config_provider/codegen.g.dart index 031ff1c2c..cb4e4bf72 100644 --- a/website/docs/providers/future_provider/config_provider/codegen.g.dart +++ b/website/docs/providers/future_provider/config_provider/codegen.g.dart @@ -42,8 +42,8 @@ final class FetchConfigurationProvider extends $FunctionalProvider< @$internal @override $FutureProviderElement $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override FetchConfigurationProvider $copyWithCreate( diff --git a/website/docs/providers/notifier_provider/remote_todos/codegen.g.dart b/website/docs/providers/notifier_provider/remote_todos/codegen.g.dart index cca3e35a9..57c8b0876 100644 --- a/website/docs/providers/notifier_provider/remote_todos/codegen.g.dart +++ b/website/docs/providers/notifier_provider/remote_todos/codegen.g.dart @@ -73,8 +73,8 @@ final class AsyncTodosProvider @$internal @override $AsyncNotifierProviderElement> $createElement( - ProviderContainer container) => - $AsyncNotifierProviderElement(this, container); + $ProviderPointer pointer) => + $AsyncNotifierProviderElement(this, pointer); } String _$asyncTodosHash() => r'fd0d7502a1c17b7cedd2350519649dd680fc48cd'; diff --git a/website/docs/providers/notifier_provider/todos/codegen.g.dart b/website/docs/providers/notifier_provider/todos/codegen.g.dart index 60d92b5cc..2998db847 100644 --- a/website/docs/providers/notifier_provider/todos/codegen.g.dart +++ b/website/docs/providers/notifier_provider/todos/codegen.g.dart @@ -63,8 +63,8 @@ final class TodosProvider extends $NotifierProvider> { @$internal @override $NotifierProviderElement> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$todosHash() => r'3485c14ec4db07efe5fe52243258a66e6f99b2b4'; diff --git a/website/docs/providers/provider/completed_todos/completed_todos.g.dart b/website/docs/providers/provider/completed_todos/completed_todos.g.dart index f34527681..4e2282ab4 100644 --- a/website/docs/providers/provider/completed_todos/completed_todos.g.dart +++ b/website/docs/providers/provider/completed_todos/completed_todos.g.dart @@ -47,8 +47,8 @@ final class CompletedTodosProvider @$internal @override - $ProviderElement> $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CompletedTodosProvider $copyWithCreate( diff --git a/website/docs/providers/provider/optimized_previous_button/optimized_previous_button.g.dart b/website/docs/providers/provider/optimized_previous_button/optimized_previous_button.g.dart index f2097adaa..8e2628485 100644 --- a/website/docs/providers/provider/optimized_previous_button/optimized_previous_button.g.dart +++ b/website/docs/providers/provider/optimized_previous_button/optimized_previous_button.g.dart @@ -63,8 +63,8 @@ final class PageIndexProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$pageIndexHash() => r'59307ecf23b5b2432833da5ad6b312bf36435d0e'; @@ -114,8 +114,8 @@ final class CanGoToPreviousPageProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override CanGoToPreviousPageProvider $copyWithCreate( diff --git a/website/docs/providers/provider/todo/todo.g.dart b/website/docs/providers/provider/todo/todo.g.dart index a7227a1fe..481c5f893 100644 --- a/website/docs/providers/provider/todo/todo.g.dart +++ b/website/docs/providers/provider/todo/todo.g.dart @@ -63,8 +63,8 @@ final class TodosProvider extends $NotifierProvider> { @$internal @override $NotifierProviderElement> $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$todosHash() => r'4bd25c3c15bfff56ad6e733bd17ecb7284c4ceb2'; diff --git a/website/docs/providers/provider/unoptimized_previous_button/unoptimized_previous_button.g.dart b/website/docs/providers/provider/unoptimized_previous_button/unoptimized_previous_button.g.dart index bba8f6a42..a88febd27 100644 --- a/website/docs/providers/provider/unoptimized_previous_button/unoptimized_previous_button.g.dart +++ b/website/docs/providers/provider/unoptimized_previous_button/unoptimized_previous_button.g.dart @@ -63,8 +63,8 @@ final class PageIndexProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$pageIndexHash() => r'59307ecf23b5b2432833da5ad6b312bf36435d0e'; diff --git a/website/docs/providers/stream_provider/live_stream_chat_provider/codegen.g.dart b/website/docs/providers/stream_provider/live_stream_chat_provider/codegen.g.dart index 42b8a04e3..77c926ef8 100644 --- a/website/docs/providers/stream_provider/live_stream_chat_provider/codegen.g.dart +++ b/website/docs/providers/stream_provider/live_stream_chat_provider/codegen.g.dart @@ -40,8 +40,8 @@ final class ChatProvider @$internal @override $StreamProviderElement> $createElement( - ProviderContainer container) => - $StreamProviderElement(this, container); + $ProviderPointer pointer) => + $StreamProviderElement(this, pointer); @override ChatProvider $copyWithCreate( diff --git a/website/static/snippets/async.g.dart b/website/static/snippets/async.g.dart index 9ae204722..3860c3c0d 100644 --- a/website/static/snippets/async.g.dart +++ b/website/static/snippets/async.g.dart @@ -42,8 +42,8 @@ final class ConfigurationsProvider extends $FunctionalProvider< @$internal @override $FutureProviderElement $createElement( - ProviderContainer container) => - $FutureProviderElement(this, container); + $ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override ConfigurationsProvider $copyWithCreate( diff --git a/website/static/snippets/combine.g.dart b/website/static/snippets/combine.g.dart index 6bd564c8b..2218f9e04 100644 --- a/website/static/snippets/combine.g.dart +++ b/website/static/snippets/combine.g.dart @@ -46,8 +46,8 @@ final class TodosProvider extends $FunctionalProvider, List> @$internal @override - $ProviderElement> $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override TodosProvider $copyWithCreate( @@ -105,8 +105,8 @@ final class FilterProvider extends $FunctionalProvider @$internal @override - $ProviderElement $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FilterProvider $copyWithCreate( @@ -165,8 +165,8 @@ final class FilteredTodosProvider @$internal @override - $ProviderElement> $createElement(ProviderContainer container) => - $ProviderElement(this, container); + $ProviderElement> $createElement($ProviderPointer pointer) => + $ProviderElement(this, pointer); @override FilteredTodosProvider $copyWithCreate( diff --git a/website/static/snippets/create.g.dart b/website/static/snippets/create.g.dart index 1d8e99c83..5165235ea 100644 --- a/website/static/snippets/create.g.dart +++ b/website/static/snippets/create.g.dart @@ -39,8 +39,8 @@ final class BoredSuggestionProvider @$internal @override - $FutureProviderElement $createElement(ProviderContainer container) => - $FutureProviderElement(this, container); + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(this, pointer); @override BoredSuggestionProvider $copyWithCreate( diff --git a/website/static/snippets/declare.g.dart b/website/static/snippets/declare.g.dart index c23869086..857d151a3 100644 --- a/website/static/snippets/declare.g.dart +++ b/website/static/snippets/declare.g.dart @@ -63,8 +63,8 @@ final class CountProvider extends $NotifierProvider { @$internal @override $NotifierProviderElement $createElement( - ProviderContainer container) => - $NotifierProviderElement(this, container); + $ProviderPointer pointer) => + $NotifierProviderElement(this, pointer); } String _$countHash() => r'6fc5f8ad4bbd390899dd0d14c7b902407d4413bd'; From ea394c64204eb600138ba6ae70aa5855d59a70bc Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Fri, 15 Mar 2024 18:24:18 +0100 Subject: [PATCH 04/13] W --- .../test/src/core/provider_container_test.dart | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/riverpod/test/src/core/provider_container_test.dart b/packages/riverpod/test/src/core/provider_container_test.dart index 4366d4bb9..385c26da4 100644 --- a/packages/riverpod/test/src/core/provider_container_test.dart +++ b/packages/riverpod/test/src/core/provider_container_test.dart @@ -10,12 +10,12 @@ import '../utils.dart'; const _sentinel = Object(); -TypeMatcher isPointer({ +TypeMatcher<$ProviderPointer> isPointer({ Object? override = _sentinel, Object? element = _sentinel, Object? targetContainer = _sentinel, }) { - var matcher = isA(); + var matcher = isA<$ProviderPointer>(); if (override != _sentinel) { matcher = matcher.having((p) => p.providerOverride, 'override', override); @@ -706,11 +706,7 @@ void main() { expect( pointer, - isPointer( - targetContainer: container, - override: null, - element: isNotNull, - ), + isPointer(targetContainer: container, override: null), ); }); From b95250d46e629db06eef32ac37d4d08fafa14b77 Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Fri, 15 Mar 2024 18:32:45 +0100 Subject: [PATCH 05/13] W --- packages/riverpod/lib/src/core/element.dart | 115 ++++++++++-------- packages/riverpod/lib/src/core/family.dart | 18 +-- .../riverpod/lib/src/core/foundation.dart | 1 - .../lib/src/core/modifiers/select.dart | 59 +++++++-- .../lib/src/core/modifiers/select_async.dart | 2 - packages/riverpod/lib/src/core/override.dart | 34 ++---- .../lib/src/core/override_with_value.dart | 12 +- .../src/core/provider/notifier_provider.dart | 4 +- .../lib/src/core/provider/provider.dart | 5 +- .../lib/src/core/provider_container.dart | 45 +++---- .../lib/src/core/provider_subscription.dart | 22 +++- .../src/core/proxy_provider_listenable.dart | 2 - packages/riverpod/lib/src/core/scheduler.dart | 2 +- .../test/src/core/provider_element_test.dart | 74 +++++++++++ 14 files changed, 250 insertions(+), 145 deletions(-) diff --git a/packages/riverpod/lib/src/core/element.dart b/packages/riverpod/lib/src/core/element.dart index 565d1de12..bed929f28 100644 --- a/packages/riverpod/lib/src/core/element.dart +++ b/packages/riverpod/lib/src/core/element.dart @@ -42,9 +42,9 @@ void Function()? debugCanModifyProviders; /// {@endtemplate} @internal @optionalTypeArgs -abstract class ProviderElement implements Node { +abstract class ProviderElement implements WrappedNode { /// {@macro riverpod.provider_element_base} - ProviderElement(this.container); + ProviderElement(this.pointer); static ProviderElement? _debugCurrentlyBuildingElement; @@ -56,14 +56,16 @@ abstract class ProviderElement implements Node { /// The provider associated with this [ProviderElement], before applying overrides. // Not typed as because of https://github.com/rrousselGit/riverpod/issues/1100 - ProviderBase get origin => _origin; - late final ProviderBase _origin; + ProviderBase get origin => pointer.origin; /// The provider associated with this [ProviderElement], after applying overrides. ProviderBase get provider; + /// The [$ProviderPointer] associated with this [ProviderElement]. + final $ProviderPointer pointer; + /// The [ProviderContainer] that owns this [ProviderElement]. - final ProviderContainer container; + ProviderContainer get container => pointer.targetContainer; Ref? ref; @@ -77,6 +79,15 @@ abstract class ProviderElement implements Node { bool get isActive => (_dependents?.isNotEmpty ?? false) || _watchDependents.isNotEmpty; + /// Whether this [ProviderElement] is currently listened to or not. + /// + /// This maps to listeners added with `listen` and `watch`, + /// excluding `listen(weak: true)`. + bool get hasListeners => + (_dependents?.isNotEmpty ?? false) || + _watchDependents.isNotEmpty || + _weakDependents.isNotEmpty; + var _dependencies = HashMap(); HashMap? _previousDependencies; List? _subscriptions; @@ -84,12 +95,11 @@ abstract class ProviderElement implements Node { /// "listen(weak: true)" pointing to this provider. /// - /// Those subscriptions are separate from [_dependents] for a few reasons: - /// - They do not count towards [isActive]. + /// Those subscriptions are separate from [ProviderElement._dependents] for a few reasons: + /// - They do not count towards [ProviderElement.isActive]. /// - They may be reused between two instances of a [ProviderElement]. - /// - /// The list is passed by reference before [_mount] by [ProviderPointer]. - late final List _weakDependents; + // TODO keep the pointer alive until all weak dependents are disposed + final _weakDependents = []; /// The element of the providers that depends on this provider. final _watchDependents = []; @@ -232,17 +242,15 @@ This could mean a few things: } } - final listeners = _dependents?.toList(growable: false); - if (listeners != null) { - for (var i = 0; i < listeners.length; i++) { - final listener = listeners[i]; - if (listener is _ProviderStateSubscription) { - Zone.current.runBinaryGuarded( - listener.listener, - null, - newState.state, - ); - } + final listeners = _weakDependents.toList(growable: false); + for (var i = 0; i < listeners.length; i++) { + final listener = listeners[i]; + if (listener is _ProviderStateSubscription) { + Zone.current.runBinaryGuarded( + listener.listener, + null, + newState.state, + ); } } @@ -496,32 +504,28 @@ The provider ${_debugCurrentlyBuildingElement!.origin} modified $origin while bu return; } - final listeners = _dependents?.toList(growable: false); + final listeners = [..._weakDependents, ...?_dependents]; switch (newState) { case final ResultData newState: - if (listeners != null) { - for (var i = 0; i < listeners.length; i++) { - final listener = listeners[i]; - if (listener is _ProviderStateSubscription) { - Zone.current.runBinaryGuarded( - listener.listener, - previousState, - newState.state, - ); - } + for (var i = 0; i < listeners.length; i++) { + final listener = listeners[i]; + if (listener is _ProviderStateSubscription) { + Zone.current.runBinaryGuarded( + listener.listener, + previousState, + newState.state, + ); } } case final ResultError newState: - if (listeners != null) { - for (var i = 0; i < listeners.length; i++) { - final listener = listeners[i]; - if (listener is _ProviderStateSubscription) { - Zone.current.runBinaryGuarded( - listener.onError, - newState.error, - newState.stackTrace, - ); - } + for (var i = 0; i < listeners.length; i++) { + final listener = listeners[i]; + if (listener is _ProviderStateSubscription) { + Zone.current.runBinaryGuarded( + listener.onError, + newState.error, + newState.stackTrace, + ); } } default: @@ -585,9 +589,9 @@ The provider ${_debugCurrentlyBuildingElement!.origin} modified $origin while bu ref._throwIfInvalidUsage(); final result = listenable.addListener( - this, + // TODO assert weak listeners are removed on dispose + weak ? WeakNode(this) : this, listener, - weak: weak, fireImmediately: fireImmediately, onError: onError, onDependencyMayHaveChanged: onDependencyMayHaveChanged, @@ -659,11 +663,7 @@ The provider ${_debugCurrentlyBuildingElement!.origin} modified $origin while bu ref._onDisposeListeners?.forEach(runGuarded); for (final observer in container.observers) { - runBinaryGuarded( - observer.didDisposeProvider, - _origin, - container, - ); + runBinaryGuarded(observer.didDisposeProvider, origin, container); } ref._keepAliveLinks = null; @@ -746,11 +746,18 @@ The provider ${_debugCurrentlyBuildingElement!.origin} modified $origin while bu elementVisitor(_watchDependents[i]); } - final dependents = _dependents; - if (dependents != null) { - for (var i = 0; i < dependents.length; i++) { - final dependent = dependents[i].source; - if (dependent is ProviderElement) elementVisitor(dependent); + Iterable children = _weakDependents; + if (_dependents case final dependents?) { + children = children.followedBy(dependents); + } + + for (final child in children) { + switch (child.source) { + case final ProviderElement dependent: + case WeakNode(inner: final ProviderElement dependent): + elementVisitor(dependent); + case _: + break; } } } diff --git a/packages/riverpod/lib/src/core/family.dart b/packages/riverpod/lib/src/core/family.dart index 12488b073..16473c72b 100644 --- a/packages/riverpod/lib/src/core/family.dart +++ b/packages/riverpod/lib/src/core/family.dart @@ -122,12 +122,12 @@ class FunctionalFamily< // ) { return $FamilyOverride( from: this, - createElement: (container, provider) { - provider as ProviderT; + createElement: (pointer) { + final provider = pointer.origin as ProviderT; return provider .$copyWithCreate((ref) => create(ref, provider.argument as ArgT)) - .$createElement(container); + .$createElement(pointer); }, ); } @@ -191,10 +191,10 @@ class ClassFamily< // Override overrideWith(NotifierT Function() create) { return $FamilyOverride( from: this, - createElement: (container, provider) { - provider as ProviderT; + createElement: (pointer) { + final provider = pointer.origin as ProviderT; - return provider.$copyWithCreate(create).$createElement(container); + return provider.$copyWithCreate(create).$createElement(pointer); }, ); } @@ -205,10 +205,10 @@ class ClassFamily< // ) { return $FamilyOverride( from: this, - createElement: (container, provider) { - provider as ProviderT; + createElement: (pointer) { + final provider = pointer.origin as ProviderT; - return provider.$copyWithBuild(build).$createElement(container); + return provider.$copyWithBuild(build).$createElement(pointer); }, ); } diff --git a/packages/riverpod/lib/src/core/foundation.dart b/packages/riverpod/lib/src/core/foundation.dart index 0c014cd84..17b26f39c 100644 --- a/packages/riverpod/lib/src/core/foundation.dart +++ b/packages/riverpod/lib/src/core/foundation.dart @@ -176,7 +176,6 @@ mixin ProviderListenable implements ProviderListenableOrFamily { ProviderSubscription addListener( Node node, void Function(StateT? previous, StateT next) listener, { - required bool weak, required void Function(Object error, StackTrace stackTrace)? onError, required void Function()? onDependencyMayHaveChanged, required bool fireImmediately, diff --git a/packages/riverpod/lib/src/core/modifiers/select.dart b/packages/riverpod/lib/src/core/modifiers/select.dart index 15d21dc21..5878093e6 100644 --- a/packages/riverpod/lib/src/core/modifiers/select.dart +++ b/packages/riverpod/lib/src/core/modifiers/select.dart @@ -1,28 +1,67 @@ part of '../../framework.dart'; +extension on Node { + bool get weak => this is WeakNode; +} + /// An abstraction of both [ProviderContainer] and [$ProviderElement] used by /// [ProviderListenable]. -abstract class Node { +sealed class Node { /// Starts listening to this transformer ProviderSubscription listen( ProviderListenable listenable, void Function(StateT? previous, StateT next) listener, { required void Function(Object error, StackTrace stackTrace)? onError, required bool fireImmediately, - required bool weak, }); - /// Reads the state of a provider, potentially creating it in the process. - /// - /// It may throw if the provider requested threw when it was built. - /// - /// Do not use this in production code. This is exposed only for testing - /// and devtools, to be able to test if a provider has listeners or similar. + /// Obtain the [ProviderElement] of a provider, creating it if necessary. + @internal ProviderElement readProviderElement( ProviderBase provider, ); } +sealed class WrappedNode implements Node { + @override + ProviderSubscription listen( + ProviderListenable listenable, + void Function(StateT? previous, StateT next) listener, { + required void Function(Object error, StackTrace stackTrace)? onError, + required bool fireImmediately, + bool weak = false, + }); +} + +@internal +final class WeakNode implements Node { + WeakNode(this.inner); + final WrappedNode inner; + + @override + ProviderSubscription listen( + ProviderListenable listenable, + void Function(StateT? previous, StateT next) listener, { + required void Function(Object error, StackTrace stackTrace)? onError, + required bool fireImmediately, + }) { + return inner.listen( + listenable, + listener, + onError: onError, + weak: true, + fireImmediately: fireImmediately, + ); + } + + @override + ProviderElement readProviderElement( + ProviderBase provider, + ) { + return inner.readProviderElement(provider); + } +} + var _debugIsRunningSelector = false; /// An internal class for `ProviderBase.select`. @@ -88,7 +127,6 @@ class _ProviderSelector with ProviderListenable { required void Function(Object error, StackTrace stackTrace)? onError, required void Function()? onDependencyMayHaveChanged, required bool fireImmediately, - required bool weak, }) { onError ??= Zone.current.handleUncaughtError; @@ -104,12 +142,11 @@ class _ProviderSelector with ProviderListenable { onChange: (newState) => lastSelectedValue = newState, ); }, - weak: weak, fireImmediately: false, onError: onError, ); - if (!weak) lastSelectedValue = _select(Result.guard(sub.read)); + if (!node.weak) lastSelectedValue = _select(Result.guard(sub.read)); if (fireImmediately) { _handleFireImmediately( diff --git a/packages/riverpod/lib/src/core/modifiers/select_async.dart b/packages/riverpod/lib/src/core/modifiers/select_async.dart index 5981cc432..7356b11cf 100644 --- a/packages/riverpod/lib/src/core/modifiers/select_async.dart +++ b/packages/riverpod/lib/src/core/modifiers/select_async.dart @@ -38,7 +38,6 @@ class _AsyncSelector with ProviderListenable> { required void Function(Object error, StackTrace stackTrace)? onError, required void Function()? onDependencyMayHaveChanged, required bool fireImmediately, - required bool weak, }) { Result? lastSelectedValue; Completer? selectedCompleter; @@ -136,7 +135,6 @@ class _AsyncSelector with ProviderListenable> { provider, (prev, input) => playValue(input), onError: onError, - weak: weak, fireImmediately: false, ); diff --git a/packages/riverpod/lib/src/core/override.dart b/packages/riverpod/lib/src/core/override.dart index fc8aaa1bc..6b7e862bd 100644 --- a/packages/riverpod/lib/src/core/override.dart +++ b/packages/riverpod/lib/src/core/override.dart @@ -96,10 +96,7 @@ abstract class $FamilyOverride implements _FamilyOverride { /// Do not use: Internal object to used by [ProviderContainer]/`ProviderScope` /// to override the behavior of a "family" for part of the application. factory $FamilyOverride({ - required ProviderElement Function( - ProviderContainer container, - ProviderBase provider, - ) createElement, + required ProviderElement Function($ProviderPointer pointer) createElement, required Family from, }) = _FamilyOverrideImpl; @@ -107,10 +104,7 @@ abstract class $FamilyOverride implements _FamilyOverride { Family get from; /// The overridden [ProviderBase.$createElement]. - ProviderElement createElement( - ProviderContainer container, - ProviderBase provider, - ); + ProviderElement createElement($ProviderPointer pointer); @mustBeOverridden @override @@ -125,11 +119,8 @@ class TransitiveFamilyOverride implements $FamilyOverride { final Family from; @override - ProviderElement createElement( - ProviderContainer container, - ProviderBase provider, - ) { - return provider.$createElement(container); + ProviderElement createElement($ProviderPointer pointer) { + return pointer.origin.$createElement(pointer); } @override @@ -141,27 +132,18 @@ class _FamilyOverrideImpl implements $FamilyOverride { /// An [Override] for families // ignore: library_private_types_in_public_api _FamilyOverrideImpl({ - required ProviderElement Function( - ProviderContainer container, - ProviderBase provider, - ) createElement, + required ProviderElement Function($ProviderPointer pointer) createElement, required this.from, }) : _createElement = createElement; @override final Family from; - final ProviderElement Function( - ProviderContainer container, - ProviderBase provider, - ) _createElement; + final ProviderElement Function($ProviderPointer pointer) _createElement; @override - ProviderElement createElement( - ProviderContainer container, - ProviderBase provider, - ) { - return _createElement(container, provider); + ProviderElement createElement($ProviderPointer pointer) { + return _createElement(pointer); } @mustBeOverridden diff --git a/packages/riverpod/lib/src/core/override_with_value.dart b/packages/riverpod/lib/src/core/override_with_value.dart index 3b4760f97..e795d5f9a 100644 --- a/packages/riverpod/lib/src/core/override_with_value.dart +++ b/packages/riverpod/lib/src/core/override_with_value.dart @@ -27,15 +27,15 @@ final class $ValueProvider extends ProviderBase @internal @override // ignore: library_private_types_in_public_api, not public API - _ValueProviderElement $createElement(ProviderContainer container) { - return _ValueProviderElement(this, container); + _ValueProviderElement $createElement($ProviderPointer pointer) { + return _ValueProviderElement(this, pointer); } } /// The [ProviderElement] of a [$ValueProvider] class _ValueProviderElement extends ProviderElement { /// The [ProviderElement] of a [$ValueProvider] - _ValueProviderElement(this.provider, super.container); + _ValueProviderElement(this.provider, super.pointer); /// A custom listener called when `overrideWithValue` changes /// with a different value. @@ -89,16 +89,16 @@ final class $AsyncValueProvider @override // ignore: library_private_types_in_public_api, not public API _AsyncValueProviderElement $createElement( - ProviderContainer container, + $ProviderPointer pointer, ) { - return _AsyncValueProviderElement(this, container); + return _AsyncValueProviderElement(this, pointer); } } class _AsyncValueProviderElement extends _ValueProviderElement> with FutureModifierElement { - _AsyncValueProviderElement(super.provider, super.container); + _AsyncValueProviderElement(super.provider, super.pointer); @override void _setValue(AsyncValue value) { diff --git a/packages/riverpod/lib/src/core/provider/notifier_provider.dart b/packages/riverpod/lib/src/core/provider/notifier_provider.dart index 3eac52cf8..1d07a643e 100644 --- a/packages/riverpod/lib/src/core/provider/notifier_provider.dart +++ b/packages/riverpod/lib/src/core/provider/notifier_provider.dart @@ -152,7 +152,7 @@ abstract base class $ClassProvider< // ClassProviderElement< // NotifierT, StateT, - CreatedT> $createElement(ProviderContainer container); + CreatedT> $createElement($ProviderPointer pointer); } @internal @@ -163,7 +163,7 @@ abstract class ClassProviderElement< // StateT, CreatedT> // extends ProviderElement { - ClassProviderElement(super.container); + ClassProviderElement(super.pointer); @override $ClassProvider> get provider; diff --git a/packages/riverpod/lib/src/core/provider/provider.dart b/packages/riverpod/lib/src/core/provider/provider.dart index ac9a2b2d2..2a0e16e12 100644 --- a/packages/riverpod/lib/src/core/provider/provider.dart +++ b/packages/riverpod/lib/src/core/provider/provider.dart @@ -56,14 +56,13 @@ abstract base class ProviderBase extends ProviderOrFamily void Function(StateT? previous, StateT next) listener, { required void Function(Object error, StackTrace stackTrace)? onError, required void Function()? onDependencyMayHaveChanged, - required bool weak, required bool fireImmediately, }) { onError ??= Zone.current.handleUncaughtError; final element = node.readProviderElement(this); - if (!weak) element.flush(); + if (!node.weak) element.flush(); if (fireImmediately) { _handleFireImmediately( @@ -100,7 +99,7 @@ abstract base class ProviderBase extends ProviderOrFamily /// An internal method that defines how a provider behaves. @visibleForOverriding - ProviderElement $createElement(ProviderContainer container); + ProviderElement $createElement($ProviderPointer pointer); @override String toString() { diff --git a/packages/riverpod/lib/src/core/provider_container.dart b/packages/riverpod/lib/src/core/provider_container.dart index 9d55f91e2..4f1fe72b4 100644 --- a/packages/riverpod/lib/src/core/provider_container.dart +++ b/packages/riverpod/lib/src/core/provider_container.dart @@ -15,16 +15,19 @@ abstract class _PointerBase { } @internal -class ProviderPointer implements _PointerBase { - ProviderPointer({ +class $ProviderPointer implements _PointerBase { + $ProviderPointer({ required this.providerOverride, required this.targetContainer, + required this.origin, }); @override bool get isTransitiveOverride => providerOverride is TransitiveProviderOverride; + final ProviderBase origin; + /// The override associated with this provider, if any. /// /// If non-null, this pointer should **never** be removed. @@ -125,7 +128,7 @@ class ProviderDirectory implements _PointerBase { /// This override may be implicitly created by [ProviderOrFamily.allTransitiveDependencies]. // ignore: library_private_types_in_public_api, not public API _FamilyOverride? familyOverride; - final HashMap, ProviderPointer> pointers; + final HashMap, $ProviderPointer> pointers; @override ProviderContainer targetContainer; @@ -136,13 +139,14 @@ class ProviderDirectory implements _PointerBase { }) { final origin = override.origin; - pointers[origin] = ProviderPointer( + pointers[origin] = $ProviderPointer( targetContainer: targetContainer, providerOverride: override, + origin: origin, ); } - ProviderPointer upsertPointer( + $ProviderPointer upsertPointer( ProviderBase provider, { required ProviderContainer currentContainer, }) { @@ -151,11 +155,12 @@ class ProviderDirectory implements _PointerBase { currentContainer: currentContainer, targetContainer: targetContainer, inherit: (target) => target._pointerManager.upsertPointer(provider), - scope: ({override}) => ProviderPointer( + scope: ({override}) => $ProviderPointer( targetContainer: currentContainer, providerOverride: override == null || provider.from != null // ? null : TransitiveProviderOverride(override), + origin: provider, ), ); } @@ -166,7 +171,7 @@ class ProviderDirectory implements _PointerBase { /// are mounted in the current container. /// /// Non-overridden providers are mounted in the root container. - ProviderPointer mount( + $ProviderPointer mount( ProviderBase origin, { required ProviderContainer currentContainer, }) { @@ -181,16 +186,15 @@ class ProviderDirectory implements _PointerBase { switch ((pointer.providerOverride, familyOverride)) { // The provider is overridden. This takes over any family override case (final override?, _): - element = - override.providerOverride.$createElement(pointer.targetContainer); + element = override.providerOverride.$createElement(pointer); // The family was overridden using overrideWith & co. case (null, final $FamilyOverride override): - element = override.createElement(pointer.targetContainer, origin); + element = override.createElement(pointer); // Either the provider wasn't overridden or it was scoped. case (null, _FamilyOverride() || null): - element = origin.$createElement(pointer.targetContainer); + element = origin.$createElement(pointer); } /// Assigning the element before calling "mount" to guarantee @@ -199,8 +203,6 @@ class ProviderDirectory implements _PointerBase { /// initialize the provider again. /// This has otherwise no impact unless there is a bug. pointer.element = element; - - element._origin = origin; } return pointer; @@ -240,7 +242,7 @@ class ProviderDirectory implements _PointerBase { /// introduce a level of indirection by storing a [Map]. /// /// Then, when overriding a provider, it is guaranteed that the [ProviderContainer] -/// and all of its children have the same [ProviderPointer] for a overridden provider. +/// and all of its children have the same [$ProviderPointer] for a overridden provider. /// /// This way, we can read an overridden provider from any of the [ProviderContainer]s. /// And no-matter where the first read is made, all [ProviderContainer]s will @@ -440,7 +442,7 @@ class ProviderPointerManager { } } - ProviderPointer? readPointer(ProviderBase provider) { + $ProviderPointer? readPointer(ProviderBase provider) { return readDirectory(provider)?.pointers[provider]; } @@ -458,7 +460,7 @@ class ProviderPointerManager { } } - ProviderPointer upsertPointer(ProviderBase provider) { + $ProviderPointer upsertPointer(ProviderBase provider) { return upsertDirectory(provider).mount( provider, currentContainer: container, @@ -470,7 +472,7 @@ class ProviderPointerManager { } /// Traverse the [ProviderElement]s associated with this [ProviderContainer]. - Iterable listProviderPointers() { + Iterable<$ProviderPointer> listProviderPointers() { return orphanPointers.pointers.values .where((pointer) => pointer.targetContainer == container) .followedBy( @@ -493,7 +495,7 @@ class ProviderPointerManager { /// Noop if the provider is from an override or doesn't exist. /// /// Returns the associated pointer, even if it was not removed. - ProviderPointer? remove(ProviderBase provider) { + $ProviderPointer? remove(ProviderBase provider) { final directory = readDirectory(provider); if (directory == null) return null; @@ -562,7 +564,7 @@ class ProviderPointerManager { /// This will automatically dispose the container at the end of the test. /// {@endtemplate} @sealed -class ProviderContainer implements Node { +class ProviderContainer implements WrappedNode { /// {@macro riverpod.provider_container} ProviderContainer({ ProviderContainer? parent, @@ -754,11 +756,10 @@ class ProviderContainer implements Node { void Function(Object error, StackTrace stackTrace)? onError, }) { return provider.addListener( - this, + weak ? WeakNode(this) : this, listener, fireImmediately: fireImmediately, onError: onError, - weak: weak, onDependencyMayHaveChanged: null, ); } @@ -797,7 +798,7 @@ class ProviderContainer implements Node { void _recursivePointerRemoval( ProviderBase provider, - ProviderPointer pointer, + $ProviderPointer pointer, ) { for (final child in _children) { final childPointer = child._pointerManager.readPointer(provider); diff --git a/packages/riverpod/lib/src/core/provider_subscription.dart b/packages/riverpod/lib/src/core/provider_subscription.dart index fd422971f..c555e20ca 100644 --- a/packages/riverpod/lib/src/core/provider_subscription.dart +++ b/packages/riverpod/lib/src/core/provider_subscription.dart @@ -5,9 +5,9 @@ part of '../framework.dart'; abstract base class ProviderSubscription { /// Represents the subscription to a [ProviderListenable] ProviderSubscription(this.source) { - final Object listener = source; - if (listener is ProviderElement) { - final subs = listener._subscriptions ??= []; + final source = this.source; + if (source is ProviderElement) { + final subs = source._subscriptions ??= []; subs.add(this); } } @@ -52,8 +52,13 @@ final class _ProviderStateSubscription required this.listener, required this.onError, }) { - final dependents = listenedElement._dependents ??= []; - dependents.add(this); + switch (source) { + case WeakNode(): + listenedElement._weakDependents.add(this); + case _: + final dependents = listenedElement._dependents ??= []; + dependents.add(this); + } } // Why can't this be typed correctly? @@ -74,7 +79,12 @@ final class _ProviderStateSubscription @override void close() { if (!closed) { - listenedElement._dependents?.remove(this); + switch (source) { + case WeakNode(): + listenedElement._weakDependents.remove(this); + case _: + listenedElement._dependents?.remove(this); + } listenedElement._onRemoveListener(); } diff --git a/packages/riverpod/lib/src/core/proxy_provider_listenable.dart b/packages/riverpod/lib/src/core/proxy_provider_listenable.dart index f4ef10ba6..0ae223b57 100644 --- a/packages/riverpod/lib/src/core/proxy_provider_listenable.dart +++ b/packages/riverpod/lib/src/core/proxy_provider_listenable.dart @@ -81,7 +81,6 @@ class ProviderElementProxy required void Function(Object error, StackTrace stackTrace)? onError, required void Function()? onDependencyMayHaveChanged, required bool fireImmediately, - required bool weak, }) { final element = node.readProviderElement(provider); @@ -94,7 +93,6 @@ class ProviderElementProxy final innerSub = node.listen( provider, (prev, next) {}, - weak: weak, fireImmediately: false, onError: null, ); diff --git a/packages/riverpod/lib/src/core/scheduler.dart b/packages/riverpod/lib/src/core/scheduler.dart index 27ed24a74..38a4fa33a 100644 --- a/packages/riverpod/lib/src/core/scheduler.dart +++ b/packages/riverpod/lib/src/core/scheduler.dart @@ -128,7 +128,7 @@ class ProviderScheduler { element.container._disposed) { continue; } - element.container._disposeProvider(element._origin); + element.container._disposeProvider(element.origin); } } diff --git a/packages/riverpod/test/src/core/provider_element_test.dart b/packages/riverpod/test/src/core/provider_element_test.dart index 7d83f92e9..631820e92 100644 --- a/packages/riverpod/test/src/core/provider_element_test.dart +++ b/packages/riverpod/test/src/core/provider_element_test.dart @@ -98,9 +98,13 @@ void main() { final dependent2 = Provider((ref) { ref.listen(provider, (_, __) {}); }); + final dependent3 = Provider((ref) { + ref.listen(provider, (_, __) {}, weak: true); + }); container.read(dependent); container.read(dependent2); + container.read(dependent3); final children = []; @@ -108,6 +112,7 @@ void main() { elementVisitor: children.add, listenableVisitor: (_) {}, ); + expect( children, unorderedMatches([ @@ -115,12 +120,81 @@ void main() { .having((e) => e.provider, 'provider', dependent), isA() .having((e) => e.provider, 'provider', dependent2), + isA() + .having((e) => e.provider, 'provider', dependent3), ]), ); }); }); + group('isActive', () { + test('rejects weak listeners', () { + final provider = Provider((ref) => 0); + final container = ProviderContainer.test(); + + final element = container.readProviderElement(provider); + + expect(element.isActive, false); + + container.listen(provider, weak: true, (_, __) {}); + + expect(element.isActive, false); + }); + + test('includes provider listeners', () async { + final provider = Provider((ref) => 0); + final dep = Provider((ref) { + ref.listen(provider, (prev, value) {}); + }); + final container = ProviderContainer.test(); + + expect(container.readProviderElement(provider).isActive, false); + + container.read(dep); + + expect(container.readProviderElement(provider).isActive, true); + }); + + test('includes provider dependents', () async { + final provider = Provider((ref) => 0); + final dep = Provider((ref) { + ref.watch(provider); + }); + final container = ProviderContainer.test(); + + expect(container.readProviderElement(provider).isActive, false); + + container.read(dep); + + expect(container.readProviderElement(provider).isActive, true); + }); + + test('includes container listeners', () async { + final provider = Provider((ref) => 0); + final container = ProviderContainer.test(); + + expect(container.readProviderElement(provider).isActive, false); + + container.listen(provider, (_, __) {}); + + expect(container.readProviderElement(provider).isActive, true); + }); + }); + group('hasListeners', () { + test('includes weak listeners', () { + final provider = Provider((ref) => 0); + final container = ProviderContainer.test(); + + final element = container.readProviderElement(provider); + + expect(element.hasListeners, false); + + container.listen(provider, weak: true, (_, __) {}); + + expect(element.hasListeners, true); + }); + test('includes provider listeners', () async { final provider = Provider((ref) => 0); final dep = Provider((ref) { From d8001c12f8479365a3546777317f1679b232c08d Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Sat, 16 Mar 2024 12:47:59 +0100 Subject: [PATCH 06/13] Fix --- examples/pub/lib/detail.g.dart | 12 +-- examples/pub/lib/search.g.dart | 4 +- .../legacy/change_notifier_provider.dart | 6 +- packages/riverpod/lib/src/core/element.dart | 2 + .../lib/src/core/provider_subscription.dart | 1 + packages/riverpod/lib/src/core/scheduler.dart | 12 ++- .../test/src/core/auto_dispose_test.dart | 40 +++++++- .../test/src/core/modifiers/future_test.dart | 26 ++++++ .../test/src/core/modifiers/select_test.dart | 26 ++++++ packages/riverpod/test/src/core/ref_test.dart | 16 +++- .../integration/build_yaml/lib/main.g.dart | 36 ++++---- .../lib/src/templates/family.dart | 8 +- .../test/integration/annotated.g.dart | 20 ++-- .../test/integration/async.g.dart | 36 ++++---- .../test/integration/auto_dispose.g.dart | 12 +-- .../test/integration/dependencies.g.dart | 20 ++-- .../test/integration/dependencies2.g.dart | 14 +-- .../test/integration/documented.g.dart | 12 +-- .../test/integration/generated.g.dart | 40 ++++---- .../test/integration/scopes.g.dart | 8 +- .../test/integration/stream.g.dart | 24 ++--- .../test/integration/sync.g.dart | 92 +++++++++---------- .../generated/golden/lib/sync.g.dart | 12 +-- ..._class_based_provider_to_functional.g.dart | 16 ++-- ..._functional_provider_to_class_based.g.dart | 4 +- .../avoid_build_context_in_providers.g.dart | 12 +-- .../avoid_public_notifier_properties.g.dart | 8 +- .../functional_ref/functional_ref.g.dart | 16 ++-- .../test/lints/notifier_extends.g.dart | 32 +++---- .../protected_notifier_properties.g.dart | 48 +++++----- .../missing_dependencies.g.dart | 4 +- .../missing_dependencies2.g.dart | 8 +- .../test/lints/provider_parameters.g.dart | 4 +- .../docs/concepts/about_codegen/main.g.dart | 4 +- .../about_codegen/provider_type/family.g.dart | 4 +- .../provider_type/family_class.g.dart | 8 +- .../provider_type/family_fn.g.dart | 4 +- .../invalidate_family_example/codegen.g.dart | 4 +- .../passing_args/family/codegen.g.dart | 12 +-- .../docs/from_provider/family/family.g.dart | 4 +- .../introduction/why_riverpod/codegen.g.dart | 4 +- .../family_and_dispose.g.dart | 8 +- 42 files changed, 393 insertions(+), 290 deletions(-) diff --git a/examples/pub/lib/detail.g.dart b/examples/pub/lib/detail.g.dart index 56f66131e..a01951ab3 100644 --- a/examples/pub/lib/detail.g.dart +++ b/examples/pub/lib/detail.g.dart @@ -122,8 +122,8 @@ final class FetchPackageDetailsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FetchPackageDetailsProvider; + createElement: (pointer) { + final provider = pointer.origin as FetchPackageDetailsProvider; final argument = provider.argument as String; @@ -381,8 +381,8 @@ final class PackageMetricsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as PackageMetricsProvider; + createElement: (pointer) { + final provider = pointer.origin as PackageMetricsProvider; final argument = provider.argument as String; @@ -403,8 +403,8 @@ final class PackageMetricsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as PackageMetricsProvider; + createElement: (pointer) { + final provider = pointer.origin as PackageMetricsProvider; final argument = provider.argument as String; diff --git a/examples/pub/lib/search.g.dart b/examples/pub/lib/search.g.dart index 7f1bff945..9dbe12eac 100644 --- a/examples/pub/lib/search.g.dart +++ b/examples/pub/lib/search.g.dart @@ -143,8 +143,8 @@ final class FetchPackagesFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FetchPackagesProvider; + createElement: (pointer) { + final provider = pointer.origin as FetchPackagesProvider; final argument = provider.argument as ({ int page, diff --git a/packages/flutter_riverpod/lib/src/providers/legacy/change_notifier_provider.dart b/packages/flutter_riverpod/lib/src/providers/legacy/change_notifier_provider.dart index 15fd2be27..b2d83848e 100644 --- a/packages/flutter_riverpod/lib/src/providers/legacy/change_notifier_provider.dart +++ b/packages/flutter_riverpod/lib/src/providers/legacy/change_notifier_provider.dart @@ -240,8 +240,8 @@ class ChangeNotifierProviderFamily ) { return $FamilyOverride( from: this, - createElement: (container, provider) { - provider as ChangeNotifierProvider; + createElement: (pointer) { + final provider = pointer.origin as ChangeNotifierProvider; return ChangeNotifierProvider.internal( (ref) => create(ref, provider.argument as Arg), @@ -251,7 +251,7 @@ class ChangeNotifierProviderFamily dependencies: null, allTransitiveDependencies: null, name: null, - ).$createElement(container); + ).$createElement(pointer); }, ); } diff --git a/packages/riverpod/lib/src/core/element.dart b/packages/riverpod/lib/src/core/element.dart index bed929f28..08f4764d4 100644 --- a/packages/riverpod/lib/src/core/element.dart +++ b/packages/riverpod/lib/src/core/element.dart @@ -697,6 +697,8 @@ The provider ${_debugCurrentlyBuildingElement!.origin} modified $origin while bu @mustCallSuper void dispose() { runOnDispose(); + _didMount = false; + _stateResult = null; ref = null; for (final sub in _dependencies.entries) { diff --git a/packages/riverpod/lib/src/core/provider_subscription.dart b/packages/riverpod/lib/src/core/provider_subscription.dart index c555e20ca..ec31da396 100644 --- a/packages/riverpod/lib/src/core/provider_subscription.dart +++ b/packages/riverpod/lib/src/core/provider_subscription.dart @@ -73,6 +73,7 @@ final class _ProviderStateSubscription 'called ProviderSubscription.read on a subscription that was closed', ); } + listenedElement._mayNeedDispose(); return listenedElement.readSelf(); } diff --git a/packages/riverpod/lib/src/core/scheduler.dart b/packages/riverpod/lib/src/core/scheduler.dart index 38a4fa33a..dcba47849 100644 --- a/packages/riverpod/lib/src/core/scheduler.dart +++ b/packages/riverpod/lib/src/core/scheduler.dart @@ -124,11 +124,17 @@ class ProviderScheduler { final links = element.ref?._keepAliveLinks; if ((links != null && links.isNotEmpty) || - element.isActive || - element.container._disposed) { + element.container._disposed || + element.isActive) { continue; } - element.container._disposeProvider(element.origin); + + if (!element.hasListeners) { + element.container._disposeProvider(element.origin); + } else { + // Don't delete the pointer if there are some "weak" listeners active. + element.dispose(); + } } } diff --git a/packages/riverpod/test/src/core/auto_dispose_test.dart b/packages/riverpod/test/src/core/auto_dispose_test.dart index 6eb4b7c07..9bb044106 100644 --- a/packages/riverpod/test/src/core/auto_dispose_test.dart +++ b/packages/riverpod/test/src/core/auto_dispose_test.dart @@ -1,7 +1,5 @@ import 'package:mockito/mockito.dart'; -import 'package:riverpod/legacy.dart'; -import 'package:riverpod/riverpod.dart'; -import 'package:riverpod/src/framework.dart'; +import 'package:riverpod/src/internals.dart'; import 'package:test/test.dart'; import '../utils.dart'; @@ -9,6 +7,42 @@ import 'provider_container_test.dart'; void main() { group('AutoDispose', () { + test('Supports clearing the state of elements with only weak listeners', + () async { + final container = ProviderContainer.test(); + final onDispose = OnDisposeMock(); + var buildCount = 0; + final provider = Provider.autoDispose((ref) { + buildCount++; + ref.onDispose(onDispose.call); + return 0; + }); + + final element = container.readProviderElement(provider); + + final sub = container.listen( + provider, + weak: true, + (previous, value) {}, + ); + + expect(sub.read(), 0); + expect(buildCount, 1); + verifyZeroInteractions(onDispose); + + await container.pump(); + + verifyOnly(onDispose, onDispose()); + + expect(buildCount, 1); + expect(container.readProviderElement(provider), same(element)); + expect(element.stateResult, null); + + expect(sub.read(), 0); + expect(element.stateResult, ResultData(0)); + expect(buildCount, 2); + }); + test( 'onDispose is triggered only once if within autoDispose unmount, a dependency changed', () async { diff --git a/packages/riverpod/test/src/core/modifiers/future_test.dart b/packages/riverpod/test/src/core/modifiers/future_test.dart index db961a56d..e9c259c36 100644 --- a/packages/riverpod/test/src/core/modifiers/future_test.dart +++ b/packages/riverpod/test/src/core/modifiers/future_test.dart @@ -7,6 +7,32 @@ import '../../utils.dart'; void main() { group('provider.future', () { group('handles listen(weak: true)', () { + test( + 'calls mayNeedDispose in ProviderSubscription.read for the sake of listen(weak: true)', + () async { + final container = ProviderContainer.test(); + final onDispose = OnDisposeMock(); + final provider = FutureProvider.autoDispose((ref) { + ref.onDispose(onDispose.call); + return 0; + }); + + final element = container.readProviderElement(provider); + + final sub = container.listen( + provider.future, + weak: true, + (previous, value) {}, + ); + + expect(sub.read(), completion(0)); + verifyZeroInteractions(onDispose); + + await container.pump(); + + verifyOnly(onDispose, onDispose()); + }); + test('common use-case ', () async { var buildCount = 0; final provider = FutureProvider((ref) { diff --git a/packages/riverpod/test/src/core/modifiers/select_test.dart b/packages/riverpod/test/src/core/modifiers/select_test.dart index b55e50a9d..015e831c7 100644 --- a/packages/riverpod/test/src/core/modifiers/select_test.dart +++ b/packages/riverpod/test/src/core/modifiers/select_test.dart @@ -29,6 +29,32 @@ void main() { }); group('handles listen(weak: true)', () { + test( + 'calls mayNeedDispose in ProviderSubscription.read for the sake of listen(weak: true)', + () async { + final container = ProviderContainer.test(); + final onDispose = OnDisposeMock(); + final provider = Provider.autoDispose((ref) { + ref.onDispose(onDispose.call); + return 0; + }); + + final element = container.readProviderElement(provider); + + final sub = container.listen( + provider.select((value) => value), + weak: true, + (previous, value) {}, + ); + + expect(sub.read(), 0); + verifyZeroInteractions(onDispose); + + await container.pump(); + + verifyOnly(onDispose, onDispose()); + }); + test('common use-case ', () { final provider = StateProvider((ref) => 'Hello'); final container = ProviderContainer.test(); diff --git a/packages/riverpod/test/src/core/ref_test.dart b/packages/riverpod/test/src/core/ref_test.dart index 3ffc0921e..2534b194d 100644 --- a/packages/riverpod/test/src/core/ref_test.dart +++ b/packages/riverpod/test/src/core/ref_test.dart @@ -924,12 +924,18 @@ void main() { throw UnimplementedError(); }); - test('does not count towards the pause mechanism', () { - throw UnimplementedError(); - }); + test('does not count towards the pause mechanism', () async { + final container = ProviderContainer.test(); - test('does not interfere with autoDispose', () { - throw UnimplementedError(); + final listener = Listener(); + final provider = Provider((ref) => Object()); + + container.listen(provider, weak: true, listener.call); + container.invalidate(provider); + + await container.pump(); + + verifyZeroInteractions(listener); }); }); diff --git a/packages/riverpod_generator/integration/build_yaml/lib/main.g.dart b/packages/riverpod_generator/integration/build_yaml/lib/main.g.dart index 0143d0d5f..d3ca39a5b 100644 --- a/packages/riverpod_generator/integration/build_yaml/lib/main.g.dart +++ b/packages/riverpod_generator/integration/build_yaml/lib/main.g.dart @@ -480,8 +480,8 @@ final class Count2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as Count2Provider; + createElement: (pointer) { + final provider = pointer.origin as Count2Provider; final argument = provider.argument as int; @@ -604,8 +604,8 @@ final class CountFuture2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as CountFuture2Provider; + createElement: (pointer) { + final provider = pointer.origin as CountFuture2Provider; final argument = provider.argument as int; @@ -728,8 +728,8 @@ final class CountStream2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as CountStream2Provider; + createElement: (pointer) { + final provider = pointer.origin as CountStream2Provider; final argument = provider.argument as int; @@ -855,8 +855,8 @@ final class CountNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as CountNotifier2Provider; + createElement: (pointer) { + final provider = pointer.origin as CountNotifier2Provider; final argument = provider.argument as int; @@ -873,8 +873,8 @@ final class CountNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as CountNotifier2Provider; + createElement: (pointer) { + final provider = pointer.origin as CountNotifier2Provider; final argument = provider.argument as int; @@ -1007,8 +1007,8 @@ final class CountAsyncNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as CountAsyncNotifier2Provider; + createElement: (pointer) { + final provider = pointer.origin as CountAsyncNotifier2Provider; final argument = provider.argument as int; @@ -1027,8 +1027,8 @@ final class CountAsyncNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as CountAsyncNotifier2Provider; + createElement: (pointer) { + final provider = pointer.origin as CountAsyncNotifier2Provider; final argument = provider.argument as int; @@ -1162,8 +1162,8 @@ final class CountStreamNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as CountStreamNotifier2Provider; + createElement: (pointer) { + final provider = pointer.origin as CountStreamNotifier2Provider; final argument = provider.argument as int; @@ -1182,8 +1182,8 @@ final class CountStreamNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as CountStreamNotifier2Provider; + createElement: (pointer) { + final provider = pointer.origin as CountStreamNotifier2Provider; final argument = provider.argument as int; diff --git a/packages/riverpod_generator/lib/src/templates/family.dart b/packages/riverpod_generator/lib/src/templates/family.dart index ef1b42da3..b26c13581 100644 --- a/packages/riverpod_generator/lib/src/templates/family.dart +++ b/packages/riverpod_generator/lib/src/templates/family.dart @@ -106,8 +106,8 @@ ${provider.doc} final class ${provider.familyTypeName} extends Family { Override overrideWith($createType create,) { return \$FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ${provider.providerTypeName}; + createElement: (pointer) { + final provider = pointer.origin as ${provider.providerTypeName}; '''); switch (( @@ -184,8 +184,8 @@ ${provider.createdTypeDisplayString} Function$_genericsDefinition( Override overrideWithBuild($runNotifierBuildType build,) { return \$FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ${provider.providerTypeName}; + createElement: (pointer) { + final provider = pointer.origin as ${provider.providerTypeName}; '''); switch (( diff --git a/packages/riverpod_generator/test/integration/annotated.g.dart b/packages/riverpod_generator/test/integration/annotated.g.dart index c8931efeb..0803875a4 100644 --- a/packages/riverpod_generator/test/integration/annotated.g.dart +++ b/packages/riverpod_generator/test/integration/annotated.g.dart @@ -127,8 +127,8 @@ final class FunctionalFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FunctionalProvider; + createElement: (pointer) { + final provider = pointer.origin as FunctionalProvider; final argument = provider.argument as int; @@ -256,8 +256,8 @@ final class ClassBasedFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ClassBasedProvider; + createElement: (pointer) { + final provider = pointer.origin as ClassBasedProvider; final argument = provider.argument as int; @@ -274,8 +274,8 @@ final class ClassBasedFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ClassBasedProvider; + createElement: (pointer) { + final provider = pointer.origin as ClassBasedProvider; final argument = provider.argument as int; @@ -423,8 +423,8 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyProvider; final argument = provider.argument as int; @@ -685,8 +685,8 @@ final class NotCopiedFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as NotCopiedFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as NotCopiedFamilyProvider; final argument = provider.argument as int; diff --git a/packages/riverpod_generator/test/integration/async.g.dart b/packages/riverpod_generator/test/integration/async.g.dart index 58231d10e..b3125e6e2 100644 --- a/packages/riverpod_generator/test/integration/async.g.dart +++ b/packages/riverpod_generator/test/integration/async.g.dart @@ -109,8 +109,8 @@ final class GenericFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -235,8 +235,8 @@ final class GenericClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericClassProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericClassProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -251,8 +251,8 @@ final class GenericClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericClassProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericClassProvider; return provider._copyWithBuild(build).$createElement(pointer); }, @@ -482,8 +482,8 @@ final class FamilyOrFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyOrProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyOrProvider; final argument = provider.argument as int; @@ -657,8 +657,8 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyProvider; final argument = provider.argument as ( int, { @@ -904,8 +904,8 @@ final class FamilyOrClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyOrClassProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyOrClassProvider; final argument = provider.argument as int; @@ -924,8 +924,8 @@ final class FamilyOrClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyOrClassProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyOrClassProvider; final argument = provider.argument as int; @@ -1092,8 +1092,8 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyClassProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyClassProvider; final argument = provider.argument as ( int, { @@ -1126,8 +1126,8 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyClassProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyClassProvider; final argument = provider.argument as ( int, { diff --git a/packages/riverpod_generator/test/integration/auto_dispose.g.dart b/packages/riverpod_generator/test/integration/auto_dispose.g.dart index dcaae6085..57fe545af 100644 --- a/packages/riverpod_generator/test/integration/auto_dispose.g.dart +++ b/packages/riverpod_generator/test/integration/auto_dispose.g.dart @@ -301,8 +301,8 @@ final class KeepAliveFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as KeepAliveFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as KeepAliveFamilyProvider; final argument = provider.argument as int; @@ -433,8 +433,8 @@ final class NotKeepAliveFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as NotKeepAliveFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as NotKeepAliveFamilyProvider; final argument = provider.argument as int; @@ -566,8 +566,8 @@ final class DefaultKeepAliveFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as DefaultKeepAliveFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as DefaultKeepAliveFamilyProvider; final argument = provider.argument as int; diff --git a/packages/riverpod_generator/test/integration/dependencies.g.dart b/packages/riverpod_generator/test/integration/dependencies.g.dart index fe55a14b9..ac5166c0d 100644 --- a/packages/riverpod_generator/test/integration/dependencies.g.dart +++ b/packages/riverpod_generator/test/integration/dependencies.g.dart @@ -183,8 +183,8 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyProvider; final argument = provider.argument as int; @@ -377,8 +377,8 @@ final class Family2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as Family2Provider; + createElement: (pointer) { + final provider = pointer.origin as Family2Provider; final argument = provider.argument as int; @@ -395,8 +395,8 @@ final class Family2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as Family2Provider; + createElement: (pointer) { + final provider = pointer.origin as Family2Provider; final argument = provider.argument as int; @@ -781,8 +781,8 @@ final class Provider4Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as Provider4Provider; + createElement: (pointer) { + final provider = pointer.origin as Provider4Provider; final argument = provider.argument as int; @@ -799,8 +799,8 @@ final class Provider4Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as Provider4Provider; + createElement: (pointer) { + final provider = pointer.origin as Provider4Provider; final argument = provider.argument as int; diff --git a/packages/riverpod_generator/test/integration/dependencies2.g.dart b/packages/riverpod_generator/test/integration/dependencies2.g.dart index f5102b835..11bf3d57c 100644 --- a/packages/riverpod_generator/test/integration/dependencies2.g.dart +++ b/packages/riverpod_generator/test/integration/dependencies2.g.dart @@ -224,8 +224,8 @@ final class FamilyWithDependencies2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyWithDependencies2Provider; + createElement: (pointer) { + final provider = pointer.origin as FamilyWithDependencies2Provider; final argument = provider.argument as int?; @@ -463,8 +463,9 @@ final class NotifierFamilyWithDependenciesFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as NotifierFamilyWithDependenciesProvider; + createElement: (pointer) { + final provider = + pointer.origin as NotifierFamilyWithDependenciesProvider; final argument = provider.argument as int?; @@ -483,8 +484,9 @@ final class NotifierFamilyWithDependenciesFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as NotifierFamilyWithDependenciesProvider; + createElement: (pointer) { + final provider = + pointer.origin as NotifierFamilyWithDependenciesProvider; final argument = provider.argument as int?; diff --git a/packages/riverpod_generator/test/integration/documented.g.dart b/packages/riverpod_generator/test/integration/documented.g.dart index 7d7131f8c..6a03f56d3 100644 --- a/packages/riverpod_generator/test/integration/documented.g.dart +++ b/packages/riverpod_generator/test/integration/documented.g.dart @@ -277,8 +277,8 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyProvider; final argument = provider.argument as int; @@ -414,8 +414,8 @@ final class ClassFamilyBasedFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ClassFamilyBasedProvider; + createElement: (pointer) { + final provider = pointer.origin as ClassFamilyBasedProvider; final argument = provider.argument as int; @@ -433,8 +433,8 @@ final class ClassFamilyBasedFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ClassFamilyBasedProvider; + createElement: (pointer) { + final provider = pointer.origin as ClassFamilyBasedProvider; final argument = provider.argument as int; diff --git a/packages/riverpod_generator/test/integration/generated.g.dart b/packages/riverpod_generator/test/integration/generated.g.dart index 1069dd857..487a05e10 100644 --- a/packages/riverpod_generator/test/integration/generated.g.dart +++ b/packages/riverpod_generator/test/integration/generated.g.dart @@ -183,8 +183,8 @@ final class GeneratedFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GeneratedFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as GeneratedFamilyProvider; final argument = provider.argument as _Test; @@ -380,8 +380,8 @@ final class GeneratedClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GeneratedClassFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as GeneratedClassFamilyProvider; final argument = provider.argument as _Test; @@ -400,8 +400,8 @@ final class GeneratedClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GeneratedClassFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as GeneratedClassFamilyProvider; final argument = provider.argument as _Test; @@ -604,8 +604,8 @@ final class $DynamicFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as $DynamicFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as $DynamicFamilyProvider; final argument = provider.argument as dynamic; @@ -801,8 +801,8 @@ final class $DynamicClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as $DynamicClassFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as $DynamicClassFamilyProvider; final argument = provider.argument as dynamic; @@ -821,8 +821,8 @@ final class $DynamicClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as $DynamicClassFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as $DynamicClassFamilyProvider; final argument = provider.argument as dynamic; @@ -966,8 +966,8 @@ final class _DynamicFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as _DynamicProvider; + createElement: (pointer) { + final provider = pointer.origin as _DynamicProvider; final argument = provider.argument as dynamic; @@ -1160,8 +1160,8 @@ final class AliasFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as AliasFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as AliasFamilyProvider; final argument = provider.argument as r.AsyncValue; @@ -1356,8 +1356,8 @@ final class AliasClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as AliasClassFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as AliasClassFamilyProvider; final argument = provider.argument as r.AsyncValue; @@ -1376,8 +1376,8 @@ final class AliasClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as AliasClassFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as AliasClassFamilyProvider; final argument = provider.argument as r.AsyncValue; diff --git a/packages/riverpod_generator/test/integration/scopes.g.dart b/packages/riverpod_generator/test/integration/scopes.g.dart index 5c8c2e63e..79d772a15 100644 --- a/packages/riverpod_generator/test/integration/scopes.g.dart +++ b/packages/riverpod_generator/test/integration/scopes.g.dart @@ -188,8 +188,8 @@ final class ScopedClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ScopedClassFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as ScopedClassFamilyProvider; final argument = provider.argument as int; @@ -206,8 +206,8 @@ final class ScopedClassFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ScopedClassFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as ScopedClassFamilyProvider; final argument = provider.argument as int; diff --git a/packages/riverpod_generator/test/integration/stream.g.dart b/packages/riverpod_generator/test/integration/stream.g.dart index d765dcb95..e7c2a5a83 100644 --- a/packages/riverpod_generator/test/integration/stream.g.dart +++ b/packages/riverpod_generator/test/integration/stream.g.dart @@ -109,8 +109,8 @@ final class GenericFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -235,8 +235,8 @@ final class GenericClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericClassProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericClassProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -251,8 +251,8 @@ final class GenericClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericClassProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericClassProvider; return provider._copyWithBuild(build).$createElement(pointer); }, @@ -533,8 +533,8 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyProvider; final argument = provider.argument as ( int, { @@ -815,8 +815,8 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyClassProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyClassProvider; final argument = provider.argument as ( int, { @@ -849,8 +849,8 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyClassProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyClassProvider; final argument = provider.argument as ( int, { diff --git a/packages/riverpod_generator/test/integration/sync.g.dart b/packages/riverpod_generator/test/integration/sync.g.dart index f9823ddf5..37d8308a4 100644 --- a/packages/riverpod_generator/test/integration/sync.g.dart +++ b/packages/riverpod_generator/test/integration/sync.g.dart @@ -117,8 +117,8 @@ final class GenericFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -284,8 +284,8 @@ final class ComplexGenericFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ComplexGenericProvider; + createElement: (pointer) { + final provider = pointer.origin as ComplexGenericProvider; return provider._copyWithCreate(( ref, { @@ -427,8 +427,8 @@ final class GenericClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericClassProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericClassProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -442,8 +442,8 @@ final class GenericClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericClassProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericClassProvider; return provider._copyWithBuild(build).$createElement(pointer); }, @@ -838,8 +838,8 @@ final class RawFamilyFutureFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as RawFamilyFutureProvider; + createElement: (pointer) { + final provider = pointer.origin as RawFamilyFutureProvider; final argument = provider.argument as int; @@ -971,8 +971,8 @@ final class RawFamilyStreamFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as RawFamilyStreamProvider; + createElement: (pointer) { + final provider = pointer.origin as RawFamilyStreamProvider; final argument = provider.argument as int; @@ -1099,8 +1099,8 @@ final class RawFamilyFutureClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as RawFamilyFutureClassProvider; + createElement: (pointer) { + final provider = pointer.origin as RawFamilyFutureClassProvider; final argument = provider.argument as int; @@ -1119,8 +1119,8 @@ final class RawFamilyFutureClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as RawFamilyFutureClassProvider; + createElement: (pointer) { + final provider = pointer.origin as RawFamilyFutureClassProvider; final argument = provider.argument as int; @@ -1261,8 +1261,8 @@ final class RawFamilyStreamClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as RawFamilyStreamClassProvider; + createElement: (pointer) { + final provider = pointer.origin as RawFamilyStreamClassProvider; final argument = provider.argument as int; @@ -1281,8 +1281,8 @@ final class RawFamilyStreamClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as RawFamilyStreamClassProvider; + createElement: (pointer) { + final provider = pointer.origin as RawFamilyStreamClassProvider; final argument = provider.argument as int; @@ -1605,8 +1605,8 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyProvider; final argument = provider.argument as ( int, { @@ -1976,8 +1976,8 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyClassProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyClassProvider; final argument = provider.argument as ( int, { @@ -2010,8 +2010,8 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyClassProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyClassProvider; final argument = provider.argument as ( int, { @@ -2174,8 +2174,8 @@ final class Supports$InFnNameFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as Supports$InFnNameProvider; + createElement: (pointer) { + final provider = pointer.origin as Supports$InFnNameProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -2354,8 +2354,8 @@ final class Supports$InFnNameFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as Supports$InFnNameFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as Supports$InFnNameFamilyProvider; return provider._copyWithCreate(( ref, @@ -2503,8 +2503,8 @@ final class Supports$InClassNameFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as Supports$InClassNameProvider; + createElement: (pointer) { + final provider = pointer.origin as Supports$InClassNameProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -2519,8 +2519,8 @@ final class Supports$InClassNameFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as Supports$InClassNameProvider; + createElement: (pointer) { + final provider = pointer.origin as Supports$InClassNameProvider; return provider._copyWithBuild(build).$createElement(pointer); }, @@ -2705,8 +2705,8 @@ final class Supports$InClassFamilyNameFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as Supports$InClassFamilyNameProvider; + createElement: (pointer) { + final provider = pointer.origin as Supports$InClassFamilyNameProvider; return provider._copyWithCreate(() { final argument = provider.argument as ( @@ -2735,8 +2735,8 @@ final class Supports$InClassFamilyNameFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as Supports$InClassFamilyNameProvider; + createElement: (pointer) { + final provider = pointer.origin as Supports$InClassFamilyNameProvider; return provider._copyWithBuild((ref, notifier) { final argument = provider.argument as ( @@ -2953,8 +2953,8 @@ final class UnnecessaryCastFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as UnnecessaryCastProvider; + createElement: (pointer) { + final provider = pointer.origin as UnnecessaryCastProvider; final argument = provider.argument; @@ -3081,8 +3081,8 @@ final class UnnecessaryCastClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as UnnecessaryCastClassProvider; + createElement: (pointer) { + final provider = pointer.origin as UnnecessaryCastClassProvider; final argument = provider.argument; @@ -3101,8 +3101,8 @@ final class UnnecessaryCastClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as UnnecessaryCastClassProvider; + createElement: (pointer) { + final provider = pointer.origin as UnnecessaryCastClassProvider; final argument = provider.argument; @@ -3256,8 +3256,8 @@ final class ManyDataStreamFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ManyDataStreamProvider; + createElement: (pointer) { + final provider = pointer.origin as ManyDataStreamProvider; return provider._copyWithCreate(( ref, diff --git a/packages/riverpod_graph/test/integration/generated/golden/lib/sync.g.dart b/packages/riverpod_graph/test/integration/generated/golden/lib/sync.g.dart index 486c545c8..2ebe44d3a 100644 --- a/packages/riverpod_graph/test/integration/generated/golden/lib/sync.g.dart +++ b/packages/riverpod_graph/test/integration/generated/golden/lib/sync.g.dart @@ -307,8 +307,8 @@ final class FamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyProvider; final argument = provider.argument as ( int, { @@ -678,8 +678,8 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyClassProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyClassProvider; final argument = provider.argument as ( int, { @@ -712,8 +712,8 @@ final class FamilyClassFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyClassProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyClassProvider; final argument = provider.argument as ( int, { diff --git a/packages/riverpod_lint_flutter_test/test/assists/convert_class_based_provider_to_functional/convert_class_based_provider_to_functional.g.dart b/packages/riverpod_lint_flutter_test/test/assists/convert_class_based_provider_to_functional/convert_class_based_provider_to_functional.g.dart index 6c93d9b3a..de8818050 100644 --- a/packages/riverpod_lint_flutter_test/test/assists/convert_class_based_provider_to_functional/convert_class_based_provider_to_functional.g.dart +++ b/packages/riverpod_lint_flutter_test/test/assists/convert_class_based_provider_to_functional/convert_class_based_provider_to_functional.g.dart @@ -213,8 +213,8 @@ final class ExampleFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ExampleFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as ExampleFamilyProvider; final argument = provider.argument as ({ int a, @@ -241,8 +241,8 @@ final class ExampleFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ExampleFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as ExampleFamilyProvider; final argument = provider.argument as ({ int a, @@ -401,8 +401,8 @@ final class GenericFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -415,8 +415,8 @@ final class GenericFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericProvider; return provider._copyWithBuild(build).$createElement(pointer); }, diff --git a/packages/riverpod_lint_flutter_test/test/assists/convert_functional_provider_to_class_based/convert_functional_provider_to_class_based.g.dart b/packages/riverpod_lint_flutter_test/test/assists/convert_functional_provider_to_class_based/convert_functional_provider_to_class_based.g.dart index fdb38120f..f304e4a6a 100644 --- a/packages/riverpod_lint_flutter_test/test/assists/convert_functional_provider_to_class_based/convert_functional_provider_to_class_based.g.dart +++ b/packages/riverpod_lint_flutter_test/test/assists/convert_functional_provider_to_class_based/convert_functional_provider_to_class_based.g.dart @@ -214,8 +214,8 @@ final class ExampleFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ExampleFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as ExampleFamilyProvider; final argument = provider.argument as ({ int a, diff --git a/packages/riverpod_lint_flutter_test/test/lints/avoid_build_context_in_providers.g.dart b/packages/riverpod_lint_flutter_test/test/lints/avoid_build_context_in_providers.g.dart index 1895adefc..8016ee4ef 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/avoid_build_context_in_providers.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/avoid_build_context_in_providers.g.dart @@ -145,8 +145,8 @@ final class FnFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FnProvider; + createElement: (pointer) { + final provider = pointer.origin as FnProvider; final argument = provider.argument as ( BuildContext, { @@ -291,8 +291,8 @@ final class MyNotifierFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as MyNotifierProvider; + createElement: (pointer) { + final provider = pointer.origin as MyNotifierProvider; final argument = provider.argument as ( BuildContext, { @@ -319,8 +319,8 @@ final class MyNotifierFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as MyNotifierProvider; + createElement: (pointer) { + final provider = pointer.origin as MyNotifierProvider; final argument = provider.argument as ( BuildContext, { diff --git a/packages/riverpod_lint_flutter_test/test/lints/avoid_public_notifier_properties.g.dart b/packages/riverpod_lint_flutter_test/test/lints/avoid_public_notifier_properties.g.dart index c866b556d..8fea76279 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/avoid_public_notifier_properties.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/avoid_public_notifier_properties.g.dart @@ -120,8 +120,8 @@ final class GeneratedNotifierFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GeneratedNotifierProvider; + createElement: (pointer) { + final provider = pointer.origin as GeneratedNotifierProvider; final argument = provider.argument as int; @@ -138,8 +138,8 @@ final class GeneratedNotifierFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GeneratedNotifierProvider; + createElement: (pointer) { + final provider = pointer.origin as GeneratedNotifierProvider; final argument = provider.argument as int; diff --git a/packages/riverpod_lint_flutter_test/test/lints/functional_ref/functional_ref.g.dart b/packages/riverpod_lint_flutter_test/test/lints/functional_ref/functional_ref.g.dart index 063cfc520..c8bea0cd4 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/functional_ref/functional_ref.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/functional_ref/functional_ref.g.dart @@ -178,8 +178,8 @@ final class GenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericsProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericsProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -300,8 +300,8 @@ final class NoGenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as NoGenericsProvider; + createElement: (pointer) { + final provider = pointer.origin as NoGenericsProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -421,8 +421,8 @@ final class MissingGenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as MissingGenericsProvider; + createElement: (pointer) { + final provider = pointer.origin as MissingGenericsProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -542,8 +542,8 @@ final class WrongOrderFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as WrongOrderProvider; + createElement: (pointer) { + final provider = pointer.origin as WrongOrderProvider; return provider._copyWithCreate(create).$createElement(pointer); }, diff --git a/packages/riverpod_lint_flutter_test/test/lints/notifier_extends.g.dart b/packages/riverpod_lint_flutter_test/test/lints/notifier_extends.g.dart index 096a36980..61e8b3022 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/notifier_extends.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/notifier_extends.g.dart @@ -404,8 +404,8 @@ final class GenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericsProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericsProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -418,8 +418,8 @@ final class GenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GenericsProvider; + createElement: (pointer) { + final provider = pointer.origin as GenericsProvider; return provider._copyWithBuild(build).$createElement(pointer); }, @@ -559,8 +559,8 @@ final class NoGenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as NoGenericsProvider; + createElement: (pointer) { + final provider = pointer.origin as NoGenericsProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -574,8 +574,8 @@ final class NoGenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as NoGenericsProvider; + createElement: (pointer) { + final provider = pointer.origin as NoGenericsProvider; return provider._copyWithBuild(build).$createElement(pointer); }, @@ -717,8 +717,8 @@ final class MissingGenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as MissingGenericsProvider; + createElement: (pointer) { + final provider = pointer.origin as MissingGenericsProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -731,8 +731,8 @@ final class MissingGenericsFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as MissingGenericsProvider; + createElement: (pointer) { + final provider = pointer.origin as MissingGenericsProvider; return provider._copyWithBuild(build).$createElement(pointer); }, @@ -872,8 +872,8 @@ final class WrongOrderFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as WrongOrderProvider; + createElement: (pointer) { + final provider = pointer.origin as WrongOrderProvider; return provider._copyWithCreate(create).$createElement(pointer); }, @@ -886,8 +886,8 @@ final class WrongOrderFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as WrongOrderProvider; + createElement: (pointer) { + final provider = pointer.origin as WrongOrderProvider; return provider._copyWithBuild(build).$createElement(pointer); }, diff --git a/packages/riverpod_lint_flutter_test/test/lints/protected_notifier_properties.g.dart b/packages/riverpod_lint_flutter_test/test/lints/protected_notifier_properties.g.dart index f64001270..d0fe04acd 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/protected_notifier_properties.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/protected_notifier_properties.g.dart @@ -248,8 +248,8 @@ final class A3Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as A3Provider; + createElement: (pointer) { + final provider = pointer.origin as A3Provider; final argument = provider.argument as int; @@ -266,8 +266,8 @@ final class A3Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as A3Provider; + createElement: (pointer) { + final provider = pointer.origin as A3Provider; final argument = provider.argument as int; @@ -403,8 +403,8 @@ final class A4Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as A4Provider; + createElement: (pointer) { + final provider = pointer.origin as A4Provider; final argument = provider.argument as int; @@ -421,8 +421,8 @@ final class A4Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as A4Provider; + createElement: (pointer) { + final provider = pointer.origin as A4Provider; final argument = provider.argument as int; @@ -551,8 +551,8 @@ final class A5Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as A5Provider; + createElement: (pointer) { + final provider = pointer.origin as A5Provider; final argument = provider.argument as int; @@ -570,8 +570,8 @@ final class A5Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as A5Provider; + createElement: (pointer) { + final provider = pointer.origin as A5Provider; final argument = provider.argument as int; @@ -700,8 +700,8 @@ final class A6Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as A6Provider; + createElement: (pointer) { + final provider = pointer.origin as A6Provider; final argument = provider.argument as int; @@ -719,8 +719,8 @@ final class A6Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as A6Provider; + createElement: (pointer) { + final provider = pointer.origin as A6Provider; final argument = provider.argument as int; @@ -849,8 +849,8 @@ final class A7Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as A7Provider; + createElement: (pointer) { + final provider = pointer.origin as A7Provider; final argument = provider.argument as int; @@ -868,8 +868,8 @@ final class A7Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as A7Provider; + createElement: (pointer) { + final provider = pointer.origin as A7Provider; final argument = provider.argument as int; @@ -998,8 +998,8 @@ final class A8Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as A8Provider; + createElement: (pointer) { + final provider = pointer.origin as A8Provider; final argument = provider.argument as int; @@ -1017,8 +1017,8 @@ final class A8Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as A8Provider; + createElement: (pointer) { + final provider = pointer.origin as A8Provider; final argument = provider.argument as int; diff --git a/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies.g.dart b/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies.g.dart index eb1a0a8a9..ffa3778cc 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies.g.dart @@ -305,8 +305,8 @@ final class DepFamilyFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as DepFamilyProvider; + createElement: (pointer) { + final provider = pointer.origin as DepFamilyProvider; final argument = provider.argument as int; diff --git a/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies2.g.dart b/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies2.g.dart index bdb43a8b0..b1b4d7a09 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies2.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/provider_dependencies/missing_dependencies2.g.dart @@ -1087,8 +1087,8 @@ final class FamilyDepFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyDepProvider; + createElement: (pointer) { + final provider = pointer.origin as FamilyDepProvider; final argument = provider.argument as int; @@ -1225,8 +1225,8 @@ final class FamilyDep2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FamilyDep2Provider; + createElement: (pointer) { + final provider = pointer.origin as FamilyDep2Provider; final argument = provider.argument as int; diff --git a/packages/riverpod_lint_flutter_test/test/lints/provider_parameters.g.dart b/packages/riverpod_lint_flutter_test/test/lints/provider_parameters.g.dart index 11870007b..103e6de3a 100644 --- a/packages/riverpod_lint_flutter_test/test/lints/provider_parameters.g.dart +++ b/packages/riverpod_lint_flutter_test/test/lints/provider_parameters.g.dart @@ -124,8 +124,8 @@ final class GeneratorFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as GeneratorProvider; + createElement: (pointer) { + final provider = pointer.origin as GeneratorProvider; final argument = provider.argument; diff --git a/website/docs/concepts/about_codegen/main.g.dart b/website/docs/concepts/about_codegen/main.g.dart index 7a59fb2ff..b88dde802 100644 --- a/website/docs/concepts/about_codegen/main.g.dart +++ b/website/docs/concepts/about_codegen/main.g.dart @@ -119,8 +119,8 @@ final class FetchUserFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FetchUserProvider; + createElement: (pointer) { + final provider = pointer.origin as FetchUserProvider; final argument = provider.argument as int; diff --git a/website/docs/concepts/about_codegen/provider_type/family.g.dart b/website/docs/concepts/about_codegen/provider_type/family.g.dart index f19235fe6..7a296856f 100644 --- a/website/docs/concepts/about_codegen/provider_type/family.g.dart +++ b/website/docs/concepts/about_codegen/provider_type/family.g.dart @@ -126,8 +126,8 @@ final class ExampleFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ExampleProvider; + createElement: (pointer) { + final provider = pointer.origin as ExampleProvider; final argument = provider.argument as int; diff --git a/website/docs/concepts/about_codegen/provider_type/family_class.g.dart b/website/docs/concepts/about_codegen/provider_type/family_class.g.dart index d31b7afef..7ceac8995 100644 --- a/website/docs/concepts/about_codegen/provider_type/family_class.g.dart +++ b/website/docs/concepts/about_codegen/provider_type/family_class.g.dart @@ -138,8 +138,8 @@ final class ExampleFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ExampleProvider; + createElement: (pointer) { + final provider = pointer.origin as ExampleProvider; final argument = provider.argument as ( int, { @@ -166,8 +166,8 @@ final class ExampleFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ExampleProvider; + createElement: (pointer) { + final provider = pointer.origin as ExampleProvider; final argument = provider.argument as ( int, { diff --git a/website/docs/concepts/about_codegen/provider_type/family_fn.g.dart b/website/docs/concepts/about_codegen/provider_type/family_fn.g.dart index abf99703a..8ea7d704a 100644 --- a/website/docs/concepts/about_codegen/provider_type/family_fn.g.dart +++ b/website/docs/concepts/about_codegen/provider_type/family_fn.g.dart @@ -147,8 +147,8 @@ final class ExampleFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ExampleProvider; + createElement: (pointer) { + final provider = pointer.origin as ExampleProvider; final argument = provider.argument as ( int, { diff --git a/website/docs/essentials/auto_dispose/invalidate_family_example/codegen.g.dart b/website/docs/essentials/auto_dispose/invalidate_family_example/codegen.g.dart index cf3ac7964..31089b0e5 100644 --- a/website/docs/essentials/auto_dispose/invalidate_family_example/codegen.g.dart +++ b/website/docs/essentials/auto_dispose/invalidate_family_example/codegen.g.dart @@ -126,8 +126,8 @@ final class LabelFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as LabelProvider; + createElement: (pointer) { + final provider = pointer.origin as LabelProvider; final argument = provider.argument as String; diff --git a/website/docs/essentials/passing_args/family/codegen.g.dart b/website/docs/essentials/passing_args/family/codegen.g.dart index cb2ba3594..01bb58677 100644 --- a/website/docs/essentials/passing_args/family/codegen.g.dart +++ b/website/docs/essentials/passing_args/family/codegen.g.dart @@ -119,8 +119,8 @@ final class ActivityFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ActivityProvider; + createElement: (pointer) { + final provider = pointer.origin as ActivityProvider; final argument = provider.argument as String; @@ -238,8 +238,8 @@ final class ActivityNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ActivityNotifier2Provider; + createElement: (pointer) { + final provider = pointer.origin as ActivityNotifier2Provider; final argument = provider.argument as String; @@ -258,8 +258,8 @@ final class ActivityNotifier2Family extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as ActivityNotifier2Provider; + createElement: (pointer) { + final provider = pointer.origin as ActivityNotifier2Provider; final argument = provider.argument as String; diff --git a/website/docs/from_provider/family/family.g.dart b/website/docs/from_provider/family/family.g.dart index 1ed93a3ec..064167f16 100644 --- a/website/docs/from_provider/family/family.g.dart +++ b/website/docs/from_provider/family/family.g.dart @@ -147,8 +147,8 @@ final class RandomFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as RandomProvider; + createElement: (pointer) { + final provider = pointer.origin as RandomProvider; final argument = provider.argument as ({ int seed, diff --git a/website/docs/introduction/why_riverpod/codegen.g.dart b/website/docs/introduction/why_riverpod/codegen.g.dart index ac257888d..c38aa9c43 100644 --- a/website/docs/introduction/why_riverpod/codegen.g.dart +++ b/website/docs/introduction/why_riverpod/codegen.g.dart @@ -143,8 +143,8 @@ final class FetchPackagesFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as FetchPackagesProvider; + createElement: (pointer) { + final provider = pointer.origin as FetchPackagesProvider; final argument = provider.argument as ({ int page, diff --git a/website/docs/migration/from_state_notifier/family_and_dispose/family_and_dispose.g.dart b/website/docs/migration/from_state_notifier/family_and_dispose/family_and_dispose.g.dart index 466508708..f07aa01a6 100644 --- a/website/docs/migration/from_state_notifier/family_and_dispose/family_and_dispose.g.dart +++ b/website/docs/migration/from_state_notifier/family_and_dispose/family_and_dispose.g.dart @@ -177,8 +177,8 @@ final class BugsEncounteredNotifierFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as BugsEncounteredNotifierProvider; + createElement: (pointer) { + final provider = pointer.origin as BugsEncounteredNotifierProvider; final argument = provider.argument as String; @@ -197,8 +197,8 @@ final class BugsEncounteredNotifierFamily extends Family { ) { return $FamilyOverride( from: this, - createElement: (pointer, provider) { - provider as BugsEncounteredNotifierProvider; + createElement: (pointer) { + final provider = pointer.origin as BugsEncounteredNotifierProvider; final argument = provider.argument as String; From 79662d2c09b7b732db32c2d6bfff959c730bbe0a Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Sat, 16 Mar 2024 12:56:08 +0100 Subject: [PATCH 07/13] Add test --- packages/riverpod/lib/src/core/element.dart | 2 -- .../test/src/core/modifiers/future_test.dart | 13 +++++++++++++ .../test/src/core/modifiers/select_test.dart | 16 ++++++++++++++++ packages/riverpod/test/src/core/ref_test.dart | 13 +++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/packages/riverpod/lib/src/core/element.dart b/packages/riverpod/lib/src/core/element.dart index 08f4764d4..cc2ea4fb0 100644 --- a/packages/riverpod/lib/src/core/element.dart +++ b/packages/riverpod/lib/src/core/element.dart @@ -98,7 +98,6 @@ abstract class ProviderElement implements WrappedNode { /// Those subscriptions are separate from [ProviderElement._dependents] for a few reasons: /// - They do not count towards [ProviderElement.isActive]. /// - They may be reused between two instances of a [ProviderElement]. - // TODO keep the pointer alive until all weak dependents are disposed final _weakDependents = []; /// The element of the providers that depends on this provider. @@ -589,7 +588,6 @@ The provider ${_debugCurrentlyBuildingElement!.origin} modified $origin while bu ref._throwIfInvalidUsage(); final result = listenable.addListener( - // TODO assert weak listeners are removed on dispose weak ? WeakNode(this) : this, listener, fireImmediately: fireImmediately, diff --git a/packages/riverpod/test/src/core/modifiers/future_test.dart b/packages/riverpod/test/src/core/modifiers/future_test.dart index e9c259c36..f308820cd 100644 --- a/packages/riverpod/test/src/core/modifiers/future_test.dart +++ b/packages/riverpod/test/src/core/modifiers/future_test.dart @@ -7,6 +7,19 @@ import '../../utils.dart'; void main() { group('provider.future', () { group('handles listen(weak: true)', () { + test('closing the subscription updated element.hasListeners', () { + final container = ProviderContainer.test(); + final provider = FutureProvider((ref) => 0); + + final sub = container.listen(provider.future, (previous, value) {}); + + expect(container.readProviderElement(provider).hasListeners, true); + + sub.close(); + + expect(container.readProviderElement(provider).hasListeners, false); + }); + test( 'calls mayNeedDispose in ProviderSubscription.read for the sake of listen(weak: true)', () async { diff --git a/packages/riverpod/test/src/core/modifiers/select_test.dart b/packages/riverpod/test/src/core/modifiers/select_test.dart index 015e831c7..46bc4fef6 100644 --- a/packages/riverpod/test/src/core/modifiers/select_test.dart +++ b/packages/riverpod/test/src/core/modifiers/select_test.dart @@ -29,6 +29,22 @@ void main() { }); group('handles listen(weak: true)', () { + test('closing the subscription updated element.hasListeners', () { + final container = ProviderContainer.test(); + final provider = Provider((ref) => 0); + + final sub = container.listen( + provider.select((value) => 0), + (previous, value) {}, + ); + + expect(container.readProviderElement(provider).hasListeners, true); + + sub.close(); + + expect(container.readProviderElement(provider).hasListeners, false); + }); + test( 'calls mayNeedDispose in ProviderSubscription.read for the sake of listen(weak: true)', () async { diff --git a/packages/riverpod/test/src/core/ref_test.dart b/packages/riverpod/test/src/core/ref_test.dart index 2534b194d..4634bba3c 100644 --- a/packages/riverpod/test/src/core/ref_test.dart +++ b/packages/riverpod/test/src/core/ref_test.dart @@ -920,6 +920,19 @@ void main() { expect(buildCount, 1); }); + test('closing the subscription updated element.hasListeners', () { + final container = ProviderContainer.test(); + final provider = Provider((ref) => 0); + + final sub = container.listen(provider, (previous, value) {}); + + expect(container.readProviderElement(provider).hasListeners, true); + + sub.close(); + + expect(container.readProviderElement(provider).hasListeners, false); + }); + test('throws if specifying both weak and fireImmediately', () { throw UnimplementedError(); }); From e2627d26d04f5a0a24dded639684a5ad42313e31 Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Sat, 16 Mar 2024 12:58:10 +0100 Subject: [PATCH 08/13] Add test --- .../lib/src/core/provider/provider.dart | 5 +++++ .../riverpod/test/src/core/provider_test.dart | 17 +++++++++++++++++ packages/riverpod/test/src/core/ref_test.dart | 4 ---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/packages/riverpod/lib/src/core/provider/provider.dart b/packages/riverpod/lib/src/core/provider/provider.dart index 2a0e16e12..cdd6fa09f 100644 --- a/packages/riverpod/lib/src/core/provider/provider.dart +++ b/packages/riverpod/lib/src/core/provider/provider.dart @@ -58,6 +58,11 @@ abstract base class ProviderBase extends ProviderOrFamily required void Function()? onDependencyMayHaveChanged, required bool fireImmediately, }) { + assert( + !fireImmediately || !node.weak, + 'Cannot use fireImmediately with weak listeners', + ); + onError ??= Zone.current.handleUncaughtError; final element = node.readProviderElement(this); diff --git a/packages/riverpod/test/src/core/provider_test.dart b/packages/riverpod/test/src/core/provider_test.dart index 9c757eb9e..e364ec729 100644 --- a/packages/riverpod/test/src/core/provider_test.dart +++ b/packages/riverpod/test/src/core/provider_test.dart @@ -16,5 +16,22 @@ void main() { expect(b(21).allTransitiveDependencies, isNull); expect(b(21).dependencies, isNull); }); + + group('addListener', () { + test('throws if specifying both weak and fireImmediately', () { + final container = ProviderContainer.test(); + final provider = Provider((ref) => 0); + + expect( + () => container.listen( + provider, + (previous, value) {}, + weak: true, + fireImmediately: true, + ), + throwsA(isA()), + ); + }); + }); }); } diff --git a/packages/riverpod/test/src/core/ref_test.dart b/packages/riverpod/test/src/core/ref_test.dart index 4634bba3c..12b717563 100644 --- a/packages/riverpod/test/src/core/ref_test.dart +++ b/packages/riverpod/test/src/core/ref_test.dart @@ -933,10 +933,6 @@ void main() { expect(container.readProviderElement(provider).hasListeners, false); }); - test('throws if specifying both weak and fireImmediately', () { - throw UnimplementedError(); - }); - test('does not count towards the pause mechanism', () async { final container = ProviderContainer.test(); From aea5b7afdfe06ecfa697780dbf424963c029fed1 Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Sat, 16 Mar 2024 13:02:33 +0100 Subject: [PATCH 09/13] Docs --- packages/riverpod/CHANGELOG.md | 4 ++++ packages/riverpod/lib/src/core/ref.dart | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/packages/riverpod/CHANGELOG.md b/packages/riverpod/CHANGELOG.md index 0e87ed343..4c89b9d4e 100644 --- a/packages/riverpod/CHANGELOG.md +++ b/packages/riverpod/CHANGELOG.md @@ -15,6 +15,10 @@ - `Stream/FutureProvider.overrideWithValue` was added back. - **Breaking**: `Notifier` and variants are now recreated whenever the provider rebuilds. This enables using `Ref.mounted` to check dispose. +- Added `Ref.listen(..., weak: true)`. + When specifying `weak: true`, the listener will not cause the provider to be + initialized. This is useful when wanting to react to changes to a provider, + but not trigger a network request if not necessary. - An error is now thrown when trying to override a provider twice in the same `ProviderContainer`. - Disposing a `ProviderContainer` now disposes of all of its sub `ProviderContainers` too. diff --git a/packages/riverpod/lib/src/core/ref.dart b/packages/riverpod/lib/src/core/ref.dart index b235a2a7b..282b28556 100644 --- a/packages/riverpod/lib/src/core/ref.dart +++ b/packages/riverpod/lib/src/core/ref.dart @@ -598,6 +598,11 @@ final = Provider(dependencies: []); /// and emit a valid value out of it. As such, if a /// [FutureProvider]/[StreamProvider] fail, [onError] will not be called. /// Instead the listener will receive an [AsyncError]. + /// + /// - [weak] (false by default) can be optionally passed to have the listener + /// not cause the provider to be initialized and kept alive. + /// This enables listening to changes on a provider, without causing it to + /// perform any work if it currently isn't used. /// {@endtemplate} ProviderSubscription listen( ProviderListenable provider, From 0ad6424eef0fe12825c726e4f3dc9df9c9e90ebe Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Sat, 16 Mar 2024 13:20:43 +0100 Subject: [PATCH 10/13] Coverage --- .../riverpod/test/src/core/family_test.dart | 39 +++++++++++++++++++ packages/riverpod/test/src/utils.dart | 14 +++++++ 2 files changed, 53 insertions(+) create mode 100644 packages/riverpod/test/src/core/family_test.dart diff --git a/packages/riverpod/test/src/core/family_test.dart b/packages/riverpod/test/src/core/family_test.dart new file mode 100644 index 000000000..653921fd4 --- /dev/null +++ b/packages/riverpod/test/src/core/family_test.dart @@ -0,0 +1,39 @@ +import 'package:mockito/mockito.dart'; +import 'package:riverpod/riverpod.dart'; +import 'package:test/test.dart'; + +import '../matrix.dart'; +import '../utils.dart'; + +void main() { + group('ClassFamily', () { + notifierProviderFactory.createGroup((factory) { + test('overrideWithBuild', () { + final provider = factory.simpleTestProvider((ref) => 0); + final overrideWithBuild = + OverrideWithBuildMock, int, int>(-1); + + when(overrideWithBuild.call(any, any)).thenReturn(42); + + final container = ProviderContainer.test( + overrides: [ + provider.overrideWithBuild(overrideWithBuild.call), + ], + ); + + verifyZeroInteractions(overrideWithBuild); + + container.read(provider); + + final [ref as Ref, notifier as TestNotifier] = verify( + overrideWithBuild.call(captureAny, captureAny), + ).captured; + + // ignore: invalid_use_of_protected_member + expect(ref, same(notifier.ref)); + + expect(notifier.state, 42); + }); + }); + }); +} diff --git a/packages/riverpod/test/src/utils.dart b/packages/riverpod/test/src/utils.dart index 24ca8c4ca..fe631441e 100644 --- a/packages/riverpod/test/src/utils.dart +++ b/packages/riverpod/test/src/utils.dart @@ -20,6 +20,20 @@ List captureErrors(List cb) { class ProviderObserverMock extends Mock implements ProviderObserver {} +class OverrideWithBuildMock extends Mock { + OverrideWithBuildMock(this.fallback); + + final CreatedT fallback; + + CreatedT call(Ref? ref, NotifierT? value) { + return super.noSuchMethod( + Invocation.method(#call, [ref, value]), + returnValue: fallback, + returnValueForMissingStub: fallback, + ) as CreatedT; + } +} + class OnBuildMock extends Mock { void call(); } From 510b45bc6155edf98e8087a548ecea9f3292f773 Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Sat, 16 Mar 2024 13:26:36 +0100 Subject: [PATCH 11/13] Coverage --- .../test/src/core/modifiers/future_test.dart | 6 +++++- .../test/src/core/modifiers/select_test.dart | 15 +++++++++++++++ packages/riverpod/test/src/core/ref_test.dart | 3 ++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/packages/riverpod/test/src/core/modifiers/future_test.dart b/packages/riverpod/test/src/core/modifiers/future_test.dart index f308820cd..daedb4fe5 100644 --- a/packages/riverpod/test/src/core/modifiers/future_test.dart +++ b/packages/riverpod/test/src/core/modifiers/future_test.dart @@ -11,7 +11,11 @@ void main() { final container = ProviderContainer.test(); final provider = FutureProvider((ref) => 0); - final sub = container.listen(provider.future, (previous, value) {}); + final sub = container.listen( + provider.future, + weak: true, + (previous, value) {}, + ); expect(container.readProviderElement(provider).hasListeners, true); diff --git a/packages/riverpod/test/src/core/modifiers/select_test.dart b/packages/riverpod/test/src/core/modifiers/select_test.dart index 46bc4fef6..a0b4d9eda 100644 --- a/packages/riverpod/test/src/core/modifiers/select_test.dart +++ b/packages/riverpod/test/src/core/modifiers/select_test.dart @@ -29,12 +29,27 @@ void main() { }); group('handles listen(weak: true)', () { + test( + 'supports calling ProviderSubscription.read when no value were emitted yet', + () { + final container = ProviderContainer.test(); + final provider = Provider((ref) => 0); + + final sub = container.listen( + provider.select((value) => 42), + (previous, value) {}, + ); + + expect(sub.read(), 42); + }); + test('closing the subscription updated element.hasListeners', () { final container = ProviderContainer.test(); final provider = Provider((ref) => 0); final sub = container.listen( provider.select((value) => 0), + weak: true, (previous, value) {}, ); diff --git a/packages/riverpod/test/src/core/ref_test.dart b/packages/riverpod/test/src/core/ref_test.dart index 12b717563..1131b30cc 100644 --- a/packages/riverpod/test/src/core/ref_test.dart +++ b/packages/riverpod/test/src/core/ref_test.dart @@ -924,7 +924,8 @@ void main() { final container = ProviderContainer.test(); final provider = Provider((ref) => 0); - final sub = container.listen(provider, (previous, value) {}); + final sub = + container.listen(provider, weak: true, (previous, value) {}); expect(container.readProviderElement(provider).hasListeners, true); From 5c53649035a08820135a2b75db75daeed96b60ac Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Sat, 16 Mar 2024 13:40:05 +0100 Subject: [PATCH 12/13] Remove dead code --- .../lib/src/core/modifiers/select.dart | 5 ++- .../riverpod/test/src/core/family_test.dart | 39 ++++++++++++++++++- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/packages/riverpod/lib/src/core/modifiers/select.dart b/packages/riverpod/lib/src/core/modifiers/select.dart index 5878093e6..4cce5cc42 100644 --- a/packages/riverpod/lib/src/core/modifiers/select.dart +++ b/packages/riverpod/lib/src/core/modifiers/select.dart @@ -160,8 +160,9 @@ class _ProviderSelector with ProviderListenable { node, sub, () { - return switch (lastSelectedValue) { - null => read(node), + // Using ! because since `sub.read` flushes the inner subscription, + // it is guaranteed that `lastSelectedValue` is not null. + return switch (lastSelectedValue!) { ResultData(:final state) => state, ResultError(:final error, :final stackTrace) => throwErrorWithCombinedStackTrace( diff --git a/packages/riverpod/test/src/core/family_test.dart b/packages/riverpod/test/src/core/family_test.dart index 653921fd4..ffbd9c1a0 100644 --- a/packages/riverpod/test/src/core/family_test.dart +++ b/packages/riverpod/test/src/core/family_test.dart @@ -1,12 +1,13 @@ import 'package:mockito/mockito.dart'; import 'package:riverpod/riverpod.dart'; +import 'package:riverpod/src/framework.dart'; import 'package:test/test.dart'; import '../matrix.dart'; import '../utils.dart'; void main() { - group('ClassFamily', () { + group('ClassProvider', () { notifierProviderFactory.createGroup((factory) { test('overrideWithBuild', () { final provider = factory.simpleTestProvider((ref) => 0); @@ -36,4 +37,40 @@ void main() { }); }); }); + + group('ClassFamily', () { + notifierProviderFactory.createGroup((factory) { + if (!factory.isFamily) return; + + test('overrideWithBuild', () { + final provider = factory.simpleTestProvider((ref) => 0).from!; + provider as NotifierProviderFamily, int, + Object?>; + + final overrideWithBuild = + OverrideWithBuildMock, int, int>(-1); + + when(overrideWithBuild.call(any, any)).thenReturn(42); + + final container = ProviderContainer.test( + overrides: [ + provider.overrideWithBuild(overrideWithBuild.call), + ], + ); + + verifyZeroInteractions(overrideWithBuild); + + container.read(provider(0)); + + final [ref as Ref, notifier as TestNotifier] = verify( + overrideWithBuild.call(captureAny, captureAny), + ).captured; + + // ignore: invalid_use_of_protected_member + expect(ref, same(notifier.ref)); + + expect(notifier.state, 42); + }); + }); + }); } From f96031e4cebc8f68d5781a4140950aae4fa5bee5 Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Sat, 16 Mar 2024 13:41:54 +0100 Subject: [PATCH 13/13] Remove unused import --- packages/riverpod/test/src/core/family_test.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/riverpod/test/src/core/family_test.dart b/packages/riverpod/test/src/core/family_test.dart index ffbd9c1a0..800e0e75e 100644 --- a/packages/riverpod/test/src/core/family_test.dart +++ b/packages/riverpod/test/src/core/family_test.dart @@ -1,6 +1,5 @@ import 'package:mockito/mockito.dart'; import 'package:riverpod/riverpod.dart'; -import 'package:riverpod/src/framework.dart'; import 'package:test/test.dart'; import '../matrix.dart';