Issue 38992. Build annotation elements for type parameter elements on their creation.

scheglov · commit-bot@chromium.org · commit 2a5d00bcd26f · 2019-11-18T15:36:08.000Z
R=brianwilkerson@google.com Bug: #38992 Change-Id: I98f7690914ce2acb7074a8333b9a482605bb9afb Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125527 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart b/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart
@@ -917,9 +917,6 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
       boundNode.accept(this);
       if (_elementWalker == null) {
         element.bound = boundNode.type;
-
-        element.metadata = _createElementAnnotations(node.metadata);
-        _setCodeRange(element, node);
       }
     }
   }
@@ -1059,6 +1056,9 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
       } else {
         element = TypeParameterElementImpl.forNode(name);
         _elementHolder.addTypeParameter(element);
+
+        element.metadata = _createElementAnnotations(typeParameter.metadata);
+        _setCodeRange(element, typeParameter);
       }
       name.staticElement = element;
       _nameScope.define(element);
diff --git a/pkg/analyzer/test/src/dart/resolution/generic_function_type_test.dart b/pkg/analyzer/test/src/dart/resolution/generic_function_type_test.dart
@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/ast/ast.dart';
+import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import 'driver_resolution.dart';
@@ -47,6 +48,17 @@ int Function(int a) y;
 ''');
   }
 
+  test_metadata_typeParameter() async {
+    await assertNoErrorsInCode(r'''
+const a = 42;
+
+Function<@a T>() x;
+''');
+    var T = findNode.typeParameter('T');
+    var annotation = T.declaredElement.metadata[0];
+    expect(annotation.element, findElement.topGet('a'));
+  }
+
   /// Test that when multiple [GenericFunctionType]s are used in a
   /// [FunctionDeclaration], all of them are resolved correctly.
   test_typeAnnotation_function() async {

Original file line number	Diff line number	Diff line change
`@@ -917,9 +917,6 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {`
`917`	`917`	`boundNode.accept(this);`
`918`	`918`	`if (_elementWalker == null) {`
`919`	`919`	`element.bound = boundNode.type;`
`920`		`-`
`921`		`- element.metadata = _createElementAnnotations(node.metadata);`
`922`		`- _setCodeRange(element, node);`
`923`	`920`	`}`
`924`	`921`	`}`
`925`	`922`	`}`
`@@ -1059,6 +1056,9 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {`
`1059`	`1056`	`} else {`
`1060`	`1057`	`element = TypeParameterElementImpl.forNode(name);`
`1061`	`1058`	`_elementHolder.addTypeParameter(element);`
	`1059`	`+`
	`1060`	`+ element.metadata = _createElementAnnotations(typeParameter.metadata);`
	`1061`	`+ _setCodeRange(element, typeParameter);`
`1062`	`1062`	`}`
`1063`	`1063`	`name.staticElement = element;`
`1064`	`1064`	`_nameScope.define(element);`