Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Fix family.overrideWith cast error and include family arguments in the ref #2852

Merged
merged 11 commits into from
Aug 28, 2023
Merged

Fix family.overrideWith cast error and include family arguments in the ref #2852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f64572e
Fix generated Notifier.overrideWith
rrousselGit Aug 27, 2023
736b517
Update generated code
rrousselGit Aug 27, 2023
79abdbf
Changelog
rrousselGit Aug 27, 2023
a03fada
Update generated code
rrousselGit Aug 27, 2023
5918d7f
Update more generated code
rrousselGit Aug 27, 2023
b117dba
Correctly initialize family args and add tests
rrousselGit Aug 27, 2023
f75df3f
Test overrideWith for non-family notifiers
rrousselGit Aug 27, 2023
2470122
Generated files
rrousselGit Aug 28, 2023
8e0a353
Include family arguments in generated overrideWith
rrousselGit Aug 28, 2023
17b8e0a
Changelog
rrousselGit Aug 28, 2023
1446a6a
Fix tests
rrousselGit Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions examples/counter/lib/main.g.dart
View file
Open in desktop

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

122 changes: 108 additions & 14 deletions examples/pub/lib/detail.g.dart
View file
Open in desktop

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

66 changes: 60 additions & 6 deletions examples/pub/lib/search.g.dart
View file
Open in desktop

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

7 changes: 5 additions & 2 deletions packages/riverpod/lib/src/async_notifier/auto_dispose.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,17 @@ class AutoDisposeAsyncNotifierProviderImpl<

@override
AutoDisposeAsyncNotifierProviderElement<NotifierT, T> createElement() {
return AutoDisposeAsyncNotifierProviderElement._(this);
return AutoDisposeAsyncNotifierProviderElement(this);
}

@override
@mustBeOverridden
FutureOr<T> runNotifierBuild(AsyncNotifierBase<T> notifier) {
return (notifier as AutoDisposeAsyncNotifier<T>).build();
}

/// {@macro riverpod.overridewith}
@mustBeOverridden
Override overrideWith(NotifierT Function() create) {
return ProviderOverride(
origin: this,
Expand All @@ -119,5 +121,6 @@ class AutoDisposeAsyncNotifierProviderElement<
with AutoDisposeProviderElementMixin<AsyncValue<T>>
implements AutoDisposeAsyncNotifierProviderRef<T> {
/// The [ProviderElementBase] for [AsyncNotifierProvider]
AutoDisposeAsyncNotifierProviderElement._(super._provider) : super._();
@internal
AutoDisposeAsyncNotifierProviderElement(super._provider) : super();
}
2 changes: 1 addition & 1 deletion packages/riverpod/lib/src/async_notifier/auto_dispose_family.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class AutoDisposeFamilyAsyncNotifierProviderImpl<

@override
AutoDisposeAsyncNotifierProviderElement<NotifierT, T> createElement() {
return AutoDisposeAsyncNotifierProviderElement._(this);
return AutoDisposeAsyncNotifierProviderElement(this);
}

@override
Expand Down
14 changes: 10 additions & 4 deletions packages/riverpod/lib/src/async_notifier/base.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,17 @@ class AsyncNotifierProviderImpl<NotifierT extends AsyncNotifierBase<T>, T>

@override
AsyncNotifierProviderElement<NotifierT, T> createElement() {
return AsyncNotifierProviderElement._(this);
return AsyncNotifierProviderElement(this);
}

@override
@mustBeOverridden
FutureOr<T> runNotifierBuild(AsyncNotifierBase<T> notifier) {
return (notifier as AsyncNotifier<T>).build();
}

/// {@macro riverpod.overridewith}
@mustBeOverridden
Override overrideWith(NotifierT Function() create) {
return ProviderOverride(
origin: this,
Expand Down Expand Up @@ -472,7 +474,9 @@ abstract class AsyncNotifierProviderElementBase<
NotifierT extends AsyncNotifierBase<T>,
T> extends ProviderElementBase<AsyncValue<T>>
with FutureHandlerProviderElementMixin<T> {
AsyncNotifierProviderElementBase._(super._provider);
/// The element of [AsyncNotifierProvider].
@internal
AsyncNotifierProviderElementBase(super._provider);

final _notifierNotifier = ProxyElementValueNotifier<NotifierT>();

Expand Down Expand Up @@ -501,9 +505,11 @@ abstract class AsyncNotifierProviderElementBase<
class AsyncNotifierProviderElement<NotifierT extends AsyncNotifierBase<T>, T>
extends AsyncNotifierProviderElementBase<NotifierT, T>
implements AsyncNotifierProviderRef<T> {
AsyncNotifierProviderElement._(
/// The element of [AsyncNotifierProvider].
@internal
AsyncNotifierProviderElement(
AsyncNotifierProviderBase<NotifierT, T> super._provider,
) : super._();
);

@override
void create({required bool didChangeDependency}) {
Expand Down
2 changes: 1 addition & 1 deletion packages/riverpod/lib/src/async_notifier/family.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class FamilyAsyncNotifierProviderImpl<NotifierT extends AsyncNotifierBase<T>, T,

@override
AsyncNotifierProviderElement<NotifierT, T> createElement() {
return AsyncNotifierProviderElement._(this);
return AsyncNotifierProviderElement(this);
}

@override
Expand Down
Loading
Loading