Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Unified Diff: pkg/analyzer/lib/src/generated/resolver.dart

Issue 1555213002: fix #25305, DeclarationResolver.visitTypeParameter now handles generic methods (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pkg/analyzer/test/generated/declaration_resolver_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « no previous file | pkg/analyzer/test/generated/declaration_resolver_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698