Elements. Simplify ElementAnnotationImpl() creation.

Change-Id: I38900e393bbc942c3ca7525aacffd18a28c1db4d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/441984
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/dart/element/element.dart

@@ -1535,7 +1535,9 @@ class ElementAnnotationImpl
 
   /// Initialize a newly created annotation. The given [libraryFragment] is the
   /// compilation unit in which the annotation appears.
-  ElementAnnotationImpl(this.libraryFragment);
+  ElementAnnotationImpl(this.libraryFragment, this.annotationAst) {
+    annotationAst.elementAnnotation = this;
+  }
 
   @override
   List<Diagnostic> get constantEvaluationErrors {

pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart

@@ -180,7 +180,7 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
   @override
   void visitAnnotation(covariant AnnotationImpl node) {
     if (_elementWalker == null) {
-      _createElementAnnotation(node);
+      ElementAnnotationImpl(_unitElement, node);
     }
     _withElementWalker(null, () {
       super.visitAnnotation(node);
@@ -1596,13 +1596,6 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
     }
   }
 
-  /// Create a new [ElementAnnotation] for the [node].
-  void _createElementAnnotation(AnnotationImpl node) {
-    var element = ElementAnnotationImpl(_unitElement);
-    element.annotationAst = node;
-    node.elementAnnotation = element;
-  }
-
   void _define(Element element) {
     if (_nameScope case LocalScope nameScope) {
       nameScope.add(element);

pkg/analyzer/lib/src/summary2/bundle_reader.dart

@@ -1863,9 +1863,7 @@ class ResolutionReader {
     currentLibraryFragment = unitElement;
     var annotations = readTypedList(() {
       var ast = _readRequiredNode() as AnnotationImpl;
-      return ElementAnnotationImpl(unitElement)
-        ..annotationAst = ast
-        ..element = ast.element;
+      return ElementAnnotationImpl(unitElement, ast)..element = ast.element;
     });
 
     return MetadataImpl(annotations);

pkg/analyzer/lib/src/summary2/element_builder.dart

@@ -13,6 +13,7 @@ import 'package:analyzer/src/summary2/ast_binary_tokens.dart';
 import 'package:analyzer/src/summary2/library_builder.dart';
 import 'package:analyzer/src/summary2/link.dart';
 import 'package:analyzer/src/summary2/reference.dart';
+import 'package:analyzer/src/utilities/extensions/collection.dart';
 import 'package:analyzer/src/utilities/extensions/object.dart';
 import 'package:collection/collection.dart';
 
@@ -1813,8 +1814,12 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
     });
   }
 
-  MetadataImpl _buildMetadata(List<Annotation> nodeList) {
-    var annotations = _buildAnnotationsWithUnit(_unitElement, nodeList);
+  MetadataImpl _buildMetadata(List<AnnotationImpl> nodeList) {
+    var annotations =
+        nodeList.map((ast) {
+          return ElementAnnotationImpl(_unitElement, ast);
+        }).toFixedList();
+
     return MetadataImpl(annotations);
   }
 
@@ -1885,24 +1890,6 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
       _enclosingContext = previous;
     }
   }
-
-  static List<ElementAnnotationImpl> _buildAnnotationsWithUnit(
-    LibraryFragmentImpl unitElement,
-    List<Annotation> nodeList,
-  ) {
-    var length = nodeList.length;
-    if (length == 0) {
-      return const <ElementAnnotationImpl>[];
-    }
-
-    return List<ElementAnnotationImpl>.generate(length, (index) {
-      var ast = nodeList[index] as AnnotationImpl;
-      var element = ElementAnnotationImpl(unitElement);
-      element.annotationAst = ast;
-      ast.elementAnnotation = element;
-      return element;
-    }, growable: false);
-  }
 }
 
 class _EnclosingContext {