| Index: pkg/analyzer/lib/src/dart/element/element.dart
|
| diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
|
| index 04e7cf260f0ace87522f783343bf6f96e47c3995..3d1045e63ee26549b6ce233dc51cf2991c6a005d 100644
|
| --- a/pkg/analyzer/lib/src/dart/element/element.dart
|
| +++ b/pkg/analyzer/lib/src/dart/element/element.dart
|
| @@ -5376,9 +5376,9 @@ class MethodElementImpl extends ExecutableElementImpl implements MethodElement {
|
| }
|
|
|
| @override
|
| - List<TypeParameterType> get allEnclosingTypeParameterTypes {
|
| + List<DartType> get allEnclosingTypeParameterTypes {
|
| if (isStatic) {
|
| - return const <TypeParameterType>[];
|
| + return const <DartType>[];
|
| }
|
| return super.allEnclosingTypeParameterTypes;
|
| }
|
| @@ -6619,9 +6619,9 @@ class PropertyAccessorElementImpl extends ExecutableElementImpl
|
| }
|
|
|
| @override
|
| - List<TypeParameterType> get allEnclosingTypeParameterTypes {
|
| + List<DartType> get allEnclosingTypeParameterTypes {
|
| if (isStatic) {
|
| - return const <TypeParameterType>[];
|
| + return const <DartType>[];
|
| }
|
| return super.allEnclosingTypeParameterTypes;
|
| }
|
| @@ -7262,24 +7262,24 @@ abstract class TypeParameterizedElementMixin
|
| implements TypeParameterizedElement, ElementImpl {
|
| int _nestingLevel;
|
| List<TypeParameterElement> _typeParameterElements;
|
| - List<TypeParameterType> _typeParameterTypes;
|
| - List<TypeParameterType> _allTypeParameterTypes;
|
| + List<DartType> _typeParameterTypes;
|
| + List<DartType> _allTypeParameterTypes;
|
|
|
| /**
|
| * Return all type parameter types of the element that encloses element.
|
| * Not `null`, but might be empty for top-level and static class members.
|
| */
|
| - List<TypeParameterType> get allEnclosingTypeParameterTypes {
|
| + List<DartType> get allEnclosingTypeParameterTypes {
|
| return enclosingTypeParameterContext?.allTypeParameterTypes ??
|
| - const <TypeParameterType>[];
|
| + const <DartType>[];
|
| }
|
|
|
| /**
|
| * Return all type parameter types of this element.
|
| */
|
| - List<TypeParameterType> get allTypeParameterTypes {
|
| + List<DartType> get allTypeParameterTypes {
|
| if (_allTypeParameterTypes == null) {
|
| - _allTypeParameterTypes = <TypeParameterType>[];
|
| + _allTypeParameterTypes = <DartType>[];
|
| // The most logical order would be (enclosing, this).
|
| // But we have to have it like this to be consistent with (inconsistent
|
| // by itself) element builder for generic functions.
|
|
|