Skip to content

Use FunctionTypeAliasElement instead of GenericTypeAliasElement. #2392

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

Merged
merged 1 commit into from
Oct 15, 2020
Merged

Use FunctionTypeAliasElement instead of GenericTypeAliasElement. #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/src/element_type.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ abstract class ElementType extends Privacy {
// TODO(jcollins-g): Remove reference to f.element.enclosingElement after
// analyzer 0.41.
var isGenericTypeAlias =
f.element.enclosingElement is GenericTypeAliasElement ||
f.element is GenericTypeAliasElement;
f.element.enclosingElement is FunctionTypeAliasElement ||
f.element is FunctionTypeAliasElement;
if (f is FunctionType) {
assert(f is ParameterizedType);
if (isGenericTypeAlias) {
Expand Down
2 changes: 1 addition & 1 deletion lib/src/model/model_element.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ abstract class ModelElement extends Canonicalization
if (e is FunctionElement) {
return ModelFunction(e, library, packageGraph);
} else if (e is GenericFunctionTypeElement) {
assert(e.enclosingElement is GenericTypeAliasElement);
assert(e.enclosingElement is FunctionTypeAliasElement);
assert(e.enclosingElement.name != '');
return ModelFunctionTypedef(e, library, packageGraph);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/src/model/typedef.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ class Typedef extends ModelElement
String get genericParameters => _renderer.renderGenericParameters(this);

List<TypeParameterElement> get genericTypeParameters {
if (element is GenericTypeAliasElement) {
return (element as GenericTypeAliasElement).function.typeParameters;
if (element is FunctionTypeAliasElement) {
return (element as FunctionTypeAliasElement).function.typeParameters;
}
return Iterable<TypeParameterElement>.empty();
}
Expand Down