| Index: pkg/analyzer/lib/src/generated/resolver.dart
|
| diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
|
| index 7c3433d5d18ec5f3c2bfe55be18287c8310b3a6e..8f180adc28661cf98753e934850ea0d969807136 100644
|
| --- a/pkg/analyzer/lib/src/generated/resolver.dart
|
| +++ b/pkg/analyzer/lib/src/generated/resolver.dart
|
| @@ -2377,10 +2377,18 @@ class DeclarationResolver extends RecursiveAstVisitor<Object> {
|
| @override
|
| Object visitTypeParameter(TypeParameter node) {
|
| SimpleIdentifier parameterName = node.name;
|
| - if (_enclosingClass != null) {
|
| - _findIdentifier(_enclosingClass.typeParameters, parameterName);
|
| - } else if (_enclosingAlias != null) {
|
| - _findIdentifier(_enclosingAlias.typeParameters, parameterName);
|
| +
|
| + Element element;
|
| + if (_enclosingExecutable != null) {
|
| + element =
|
| + _findIdentifier(_enclosingExecutable.typeParameters, parameterName);
|
| + }
|
| + if (element == null) {
|
| + if (_enclosingClass != null) {
|
| + _findIdentifier(_enclosingClass.typeParameters, parameterName);
|
| + } else if (_enclosingAlias != null) {
|
| + _findIdentifier(_enclosingAlias.typeParameters, parameterName);
|
| + }
|
| }
|
| return super.visitTypeParameter(node);
|
| }
|
|
|