Elements. Rename Reference.element2 to element.

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

Author: scheglov

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -892,7 +892,7 @@ class AnalysisDriver {
     if (_pendingFileChanges.isEmpty) {
       var rootReference = libraryContext.elementFactory.rootReference;
       var reference = rootReference.getChild('$uriObj');
-      var element = reference.element2;
+      var element = reference.element;
       if (element is LibraryElementImpl) {
         return LibraryElementResultImpl(element);
       }

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

@@ -160,7 +160,7 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
   final ClassFragmentImpl _firstFragment;
 
   ClassElementImpl(this.reference, this._firstFragment) {
-    reference.element2 = this;
+    reference.element = this;
     firstFragment.augmentedInternal = this;
   }
 
@@ -791,7 +791,7 @@ class ConstructorElementImpl extends ExecutableElementImpl
     required this.reference,
     required this.firstFragment,
   }) {
-    reference.element2 = this;
+    reference.element = this;
     firstFragment.element = this;
   }
 
@@ -2187,7 +2187,7 @@ class EnumElementImpl extends InterfaceElementImpl implements EnumElement {
   final EnumFragmentImpl firstFragment;
 
   EnumElementImpl(this.reference, this.firstFragment) {
-    reference.element2 = this;
+    reference.element = this;
     firstFragment.augmentedInternal = this;
   }
 
@@ -2643,7 +2643,7 @@ class ExtensionElementImpl extends InstanceElementImpl
   TypeImpl _extendedType = InvalidTypeImpl.instance;
 
   ExtensionElementImpl(this.reference, this.firstFragment) {
-    reference.element2 = this;
+    reference.element = this;
     firstFragment.augmentedInternal = this;
   }
 
@@ -2759,7 +2759,7 @@ class ExtensionTypeElementImpl extends InterfaceElementImpl
   final ExtensionTypeFragmentImpl firstFragment;
 
   ExtensionTypeElementImpl(this.reference, this.firstFragment) {
-    reference.element2 = this;
+    reference.element = this;
     firstFragment.augmentedInternal = this;
   }
 
@@ -2898,7 +2898,7 @@ class FieldElementImpl extends PropertyInducingElementImpl
   final FieldFragmentImpl firstFragment;
 
   FieldElementImpl({required this.reference, required this.firstFragment}) {
-    reference.element2 = this;
+    reference.element = this;
     firstFragment.element = this;
   }
 
@@ -4471,7 +4471,7 @@ class GetterElementImpl extends PropertyAccessorElementImpl
   final GetterFragmentImpl firstFragment;
 
   GetterElementImpl(this.reference, this.firstFragment) {
-    reference.element2 = this;
+    reference.element = this;
     GetterFragmentImpl? fragment = firstFragment;
     while (fragment != null) {
       fragment.element = this;
@@ -7746,7 +7746,7 @@ class MethodElementImpl extends ExecutableElementImpl
     required this.reference,
     required this.firstFragment,
   }) {
-    reference.element2 = this;
+    reference.element = this;
     firstFragment.element = this;
   }
 
@@ -7919,7 +7919,7 @@ class MixinElementImpl extends InterfaceElementImpl implements MixinElement {
   final MixinFragmentImpl firstFragment;
 
   MixinElementImpl(this.reference, this.firstFragment) {
-    reference.element2 = this;
+    reference.element = this;
     firstFragment.augmentedInternal = this;
   }
 
@@ -8715,7 +8715,7 @@ class PrefixElementImpl extends ElementImpl implements PrefixElement {
 
   PrefixElementImpl({required this.reference, required this.firstFragment})
     : lastFragment = firstFragment {
-    reference.element2 = this;
+    reference.element = this;
   }
 
   @override
@@ -9441,7 +9441,7 @@ class SetterElementImpl extends PropertyAccessorElementImpl
   final SetterFragmentImpl firstFragment;
 
   SetterElementImpl(this.reference, this.firstFragment) {
-    reference.element2 = this;
+    reference.element = this;
     SetterFragmentImpl? fragment = firstFragment;
     while (fragment != null) {
       fragment.element = this;
@@ -9726,7 +9726,7 @@ class TopLevelFunctionElementImpl extends ExecutableElementImpl
   final TopLevelFunctionFragmentImpl firstFragment;
 
   TopLevelFunctionElementImpl(this.reference, this.firstFragment) {
-    reference.element2 = this;
+    reference.element = this;
     firstFragment.element = this;
   }
 
@@ -9831,7 +9831,7 @@ class TopLevelVariableElementImpl extends PropertyInducingElementImpl
   final TopLevelVariableFragmentImpl firstFragment;
 
   TopLevelVariableElementImpl(this.reference, this.firstFragment) {
-    reference.element2 = this;
+    reference.element = this;
     firstFragment.element = this;
   }
 
@@ -9971,7 +9971,7 @@ class TypeAliasElementImpl extends TypeDefiningElementImpl
   final TypeAliasFragmentImpl firstFragment;
 
   TypeAliasElementImpl(this.reference, this.firstFragment) {
-    reference.element2 = this;
+    reference.element = this;
     firstFragment.element = this;
   }
 

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

@@ -1145,7 +1145,7 @@ class InheritanceManager3 {
       var elementReference = class_.element.reference!
           .getChild('@method')
           .getChild(fragmentName);
-      if (elementReference.element2 case MethodElementImpl result) {
+      if (elementReference.element case MethodElementImpl result) {
         return result.firstFragment;
       }
 
@@ -1171,7 +1171,7 @@ class InheritanceManager3 {
       var setterReference = class_.element.reference!
           .getChild('@setter')
           .getChild(fragmentName);
-      if (setterReference.element2 case SetterElementImpl result) {
+      if (setterReference.element case SetterElementImpl result) {
         return result.firstFragment;
       }
 
@@ -1191,7 +1191,7 @@ class InheritanceManager3 {
       var fieldReference = class_.element.reference!
           .getChild('@field')
           .getChild(elementName);
-      assert(fieldReference.element2 == null);
+      assert(fieldReference.element == null);
       FieldElementImpl(reference: fieldReference, firstFragment: resultField);
 
       resultField.type = executable.parameters[0].type;
@@ -1237,7 +1237,7 @@ class InheritanceManager3 {
       var elementReference = targetClass.element.reference!
           .getChild('@method')
           .getChild(fragmentName);
-      if (elementReference.element2 case SetterElementImpl result) {
+      if (elementReference.element case SetterElementImpl result) {
         return result.firstFragment;
       }
 
@@ -1269,7 +1269,7 @@ class InheritanceManager3 {
         var elementReference = targetClass.element.reference!
             .getChild('@getter')
             .getChild(fragmentName);
-        if (elementReference.element2 case GetterElementImpl result) {
+        if (elementReference.element case GetterElementImpl result) {
           return result.firstFragment;
         }
 
@@ -1282,7 +1282,7 @@ class InheritanceManager3 {
         var elementReference = targetClass.element.reference!
             .getChild('@setter')
             .getChild(fragmentName);
-        if (elementReference.element2 case SetterElementImpl result) {
+        if (elementReference.element case SetterElementImpl result) {
           return result.firstFragment;
         }
 
@@ -1305,7 +1305,7 @@ class InheritanceManager3 {
       var elementReference = targetClass.element.reference!
           .getChild('@field')
           .getChild(elementName);
-      assert(elementReference.element2 == null);
+      assert(elementReference.element == null);
       var fieldElement = FieldElementImpl(
         reference: elementReference,
         firstFragment: field,

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

@@ -150,7 +150,7 @@ class LibraryReader {
       0,
       featureSet,
     );
-    _reference.element2 = _libraryElement;
+    _reference.element = _libraryElement;
     _libraryElement.reference = _reference;
 
     // Read the rest of non-resolution data for the library.
@@ -251,8 +251,8 @@ class LibraryReader {
   /// These elements are implicitly declared in `dart:core`.
   void _declareDartCoreDynamicNever() {
     if (_reference.name == 'dart:core') {
-      _reference.getChild('dynamic').element2 = DynamicElementImpl.instance;
-      _reference.getChild('Never').element2 = NeverElementImpl.instance;
+      _reference.getChild('dynamic').element = DynamicElementImpl.instance;
+      _reference.getChild('Never').element = NeverElementImpl.instance;
     }
   }
 
@@ -896,7 +896,7 @@ class LibraryReader {
         isDeferred: isDeferred,
       );
 
-      var element = reference.element2 as PrefixElementImpl?;
+      var element = reference.element as PrefixElementImpl?;
       if (element == null) {
         element = PrefixElementImpl(
           reference: reference,
@@ -1492,16 +1492,16 @@ class LibraryReader {
 
   void _readVariableGetterSetterLinking() {
     _reader.readTypedList(() {
-      var variable = _readReference().element2 as PropertyInducingElementImpl;
+      var variable = _readReference().element as PropertyInducingElementImpl;
 
-      var optionalGetter = _readOptionalReference()?.element2;
+      var optionalGetter = _readOptionalReference()?.element;
       if (optionalGetter != null) {
         var getter = optionalGetter as GetterElementImpl;
         variable.getter2 = getter;
         getter.variable3 = variable;
       }
 
-      var optionalSetter = _readOptionalReference()?.element2;
+      var optionalSetter = _readOptionalReference()?.element;
       if (optionalSetter != null) {
         var setter = optionalSetter as SetterElementImpl;
         variable.setter2 = setter;
@@ -1614,7 +1614,6 @@ class ResolutionReader {
     return _reader.readEnum(values);
   }
 
-
   Map<K, V> readMap<K, V>({
     required K Function() readKey,
     required V Function() readValue,

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

@@ -630,7 +630,7 @@ class LibraryBuilder {
         .getChild('${libraryFragment.source.uri}')
         .getChild('@prefix2')
         .getChild(refName);
-    var element = reference.element2 as PrefixElementImpl?;
+    var element = reference.element as PrefixElementImpl?;
 
     if (element == null) {
       element = PrefixElementImpl(
@@ -729,11 +729,11 @@ class LibraryBuilder {
   void _declareDartCoreDynamicNever() {
     if (reference.name == 'dart:core') {
       var dynamicRef = reference.getChild('dynamic');
-      dynamicRef.element2 = DynamicElementImpl.instance;
+      dynamicRef.element = DynamicElementImpl.instance;
       declare(DynamicElementImpl.instance, dynamicRef);
 
       var neverRef = reference.getChild('Never');
-      neverRef.element2 = NeverElementImpl.instance;
+      neverRef.element = NeverElementImpl.instance;
       declare(NeverElementImpl.instance, neverRef);
     }
   }
@@ -780,7 +780,7 @@ class LibraryBuilder {
     libraryElement.isSynthetic = !libraryFile.exists;
     libraryElement.languageVersion = libraryUnitNode.languageVersion;
     libraryElement.reference = libraryReference;
-    libraryReference.element2 = libraryElement;
+    libraryReference.element = libraryElement;
 
     var linkingUnits = <LinkingUnit>[];
     {

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

@@ -62,7 +62,7 @@ class LinkedElementFactory {
   @visibleForTesting
   List<Uri> get uriListWithLibraryElements {
     return rootReference.children
-        .map((reference) => reference.element2)
+        .map((reference) => reference.element)
         .whereType<LibraryElementImpl>()
         .map((e) => e.uri)
         .toList();
@@ -145,7 +145,7 @@ class LinkedElementFactory {
     // During linking we create libraries when typeProvider is not ready.
     // Update these libraries now, when typeProvider is ready.
     for (var reference in rootReference.children) {
-      var libraryElement = reference.element2 as LibraryElementImpl?;
+      var libraryElement = reference.element as LibraryElementImpl?;
       if (libraryElement != null && !libraryElement.hasTypeProviderSystemSet) {
         setLibraryTypeSystem(libraryElement);
       }
@@ -154,12 +154,12 @@ class LinkedElementFactory {
 
   void dispose() {
     for (var libraryReference in rootReference.children) {
-      _disposeLibrary(libraryReference.element2);
+      _disposeLibrary(libraryReference.element);
     }
   }
 
   Element elementOfReference3(Reference reference) {
-    if (reference.element2 case var element?) {
+    if (reference.element case var element?) {
       return element;
     }
 
@@ -179,7 +179,7 @@ class LinkedElementFactory {
       parentElement.constructors;
     }
 
-    var element = reference.element2;
+    var element = reference.element;
     if (element == null) {
       throw StateError('Expected existing element: $reference');
     }
@@ -188,7 +188,7 @@ class LinkedElementFactory {
 
   LibraryElementImpl? libraryOfUri(Uri uri) {
     var reference = rootReference.getChild('$uri');
-    if (reference.element2 case LibraryElementImpl element) {
+    if (reference.element case LibraryElementImpl element) {
       return element;
     }
     return createLibraryElementForReading(uri);
@@ -217,7 +217,7 @@ class LinkedElementFactory {
       _libraryReaders.remove(uri);
       libraryManifests.remove(uri);
       var libraryReference = rootReference.removeChild('$uri');
-      _disposeLibrary(libraryReference?.element2);
+      _disposeLibrary(libraryReference?.element);
     }
 
     analysisSession.classHierarchy.removeOfLibraries(uriSet);
@@ -249,7 +249,7 @@ class LinkedElementFactory {
   void replaceAnalysisSession(AnalysisSessionImpl newSession) {
     analysisSession = newSession;
     for (var libraryReference in rootReference.children) {
-      var libraryElement = libraryReference.element2;
+      var libraryElement = libraryReference.element;
       if (libraryElement is LibraryElementImpl) {
         libraryElement.session = newSession;
       }

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

@@ -35,7 +35,7 @@ class Reference {
   String name;
 
   /// The corresponding [ElementImpl], or `null` if a named container.
-  ElementImpl? element2;
+  ElementImpl? element;
 
   /// Temporary index used during serialization and linking.
   int? index;