Skip to content

Commit 003b6a5

Browse files
authored
Use FunctionTypeAliasElement instead of GenericTypeAliasElement. (#2392)
1 parent 0ad9830 commit 003b6a5

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

lib/src/element_type.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ abstract class ElementType extends Privacy {
4040
// TODO(jcollins-g): Remove reference to f.element.enclosingElement after
4141
// analyzer 0.41.
4242
var isGenericTypeAlias =
43-
f.element.enclosingElement is GenericTypeAliasElement ||
44-
f.element is GenericTypeAliasElement;
43+
f.element.enclosingElement is FunctionTypeAliasElement ||
44+
f.element is FunctionTypeAliasElement;
4545
if (f is FunctionType) {
4646
assert(f is ParameterizedType);
4747
if (isGenericTypeAlias) {

lib/src/model/model_element.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ abstract class ModelElement extends Canonicalization
331331
if (e is FunctionElement) {
332332
return ModelFunction(e, library, packageGraph);
333333
} else if (e is GenericFunctionTypeElement) {
334-
assert(e.enclosingElement is GenericTypeAliasElement);
334+
assert(e.enclosingElement is FunctionTypeAliasElement);
335335
assert(e.enclosingElement.name != '');
336336
return ModelFunctionTypedef(e, library, packageGraph);
337337
}

lib/src/model/typedef.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class Typedef extends ModelElement
2424
String get genericParameters => _renderer.renderGenericParameters(this);
2525

2626
List<TypeParameterElement> get genericTypeParameters {
27-
if (element is GenericTypeAliasElement) {
28-
return (element as GenericTypeAliasElement).function.typeParameters;
27+
if (element is FunctionTypeAliasElement) {
28+
return (element as FunctionTypeAliasElement).function.typeParameters;
2929
}
3030
return Iterable<TypeParameterElement>.empty();
3131
}

0 commit comments

Comments
 (0)