Fix code generation error on nested generic bounded type arguments #659
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KholmatovS
changed the title
yanok
reviewed
Jun 30, 2023
| @@ -1,3 +1,7 @@ | |||
| ## 5.4.3 | |||
| @@ -1,5 +1,5 @@ | |||
| name: mockito | |||
| version: 5.4.2 | |||
| version: 5.4.3 | |||
| @@ -2051,7 +2051,20 @@ class _MockClassInfo { | |||
|
|
|||
| T _withTypeParameters<T>(Iterable<TypeParameterElement> typeParameters, | |||
| T Function(Iterable<TypeReference>, Iterable<TypeReference>) body) { | |||
| final typeVars = {for (final t in typeParameters) t: _newTypeVar(t)}; | |||
| final Map<TypeParameterElement, String> typeVars = {}; | |||
There was a problem hiding this comment.
As I wrote on the bug, I think it would be more logical to fix the equality on the analyzer side, if possible. Then, this won't be needed.
But even as a workaround, it has a few problems:
- It won't catch cases with more than one level of wrapping, like
T extends Foo<Bar<T>>. - It will create a wrong mapping for other type variables appearing in the bound, like
class C<T> { X m<X extends Iterable<T>>() => []; }
| @@ -1843,6 +1843,32 @@ void main() { | |||
| expect(mocksContent, contains('Iterable<X1> m1<X1>(X1 Function(X)? f)')); | |||
| expect(mocksContent, contains('Iterable<X1?> m2<X1>(X1 Function(X)? f)')); | |||
| }); | |||
|
|
|||
| test('We preserve nested generic bounded type arguments', () async { | |||
There was a problem hiding this comment.
Thanks for the test! Could you please try adding test cases to cover the items in my comment above? Thanks!
|
Closing this in favor of #671 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #658 code generation error on nested generic bounded type arguments.
Contribution guidelines:
dart format.Note that many Dart repos have a weekly cadence for reviewing PRs - please allow for some latency before initial review feedback.