Elements. AugmentedInstanceElement remove fields, accessors.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -3007,14 +3007,9 @@ package:analyzer/dart/element/element.dart:
     firstFragment (getter: ExtensionTypeElement)
   AugmentedInstanceElement (class extends Object):
     new (constructor: AugmentedInstanceElement Function())
-    accessors (getter: List<PropertyAccessorElement>)
-    fields (getter: List<FieldElement>)
     firstFragment (getter: InstanceElement)
     metadata (getter: List<ElementAnnotation>)
     thisType (getter: DartType)
-    getField (method: FieldElement? Function(String))
-    getGetter (method: PropertyAccessorElement? Function(String))
-    getSetter (method: PropertyAccessorElement? Function(String))
   AugmentedInterfaceElement (class extends Object implements AugmentedInstanceElement):
     new (constructor: AugmentedInterfaceElement Function())
     firstFragment (getter: InterfaceElement)

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

@@ -99,18 +99,6 @@ abstract class AugmentedExtensionTypeElement
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class AugmentedInstanceElement {
-  /// The accessors (getters and setters) declared in this element.
-  ///
-  /// [PropertyAccessorElement]s replace corresponding elements,
-  /// other [PropertyAccessorElement]s are appended.
-  List<PropertyAccessorElement> get accessors;
-
-  /// The fields declared in this element.
-  ///
-  /// `FieldAugmentationElement`s replace corresponding elements, other
-  /// [FieldElement]s are appended.
-  List<FieldElement> get fields;
-
   /// The declaration (not augmentation) that owns this result.
   InstanceElement get firstFragment;
 
@@ -122,15 +110,6 @@ abstract class AugmentedInstanceElement {
 
   /// The type of `this` expression.
   DartType get thisType;
-
-  /// Returns the field from [fields] that has the given [name].
-  FieldElement? getField(String name);
-
-  /// Returns the getter from [accessors] that has the given [name].
-  PropertyAccessorElement? getGetter(String name);
-
-  /// Returns the setter from [accessors] that has the given [name].
-  PropertyAccessorElement? getSetter(String name);
 }
 
 /// The result of applying augmentations to a [InterfaceElement].

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

@@ -100,7 +100,7 @@ import 'package:meta/meta.dart';
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 441;
+  static const int DATA_VERSION = 442;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

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

@@ -696,7 +696,7 @@ class ClassElementImpl2 extends InterfaceElementImpl2
 
     // With 2+ static const fields with the type of this class.
     var numberOfElements = 0;
-    for (var field in fields) {
+    for (var field in fields2) {
       if (field.isStatic && field.isConst && field.type == thisType) {
         numberOfElements++;
       }
@@ -3724,12 +3724,13 @@ class EnumElementImpl2 extends InterfaceElementImpl2
 
   @override
   List<FieldElementOrMember> get constants {
-    return fields.where((field) => field.isEnumConstant).toList();
+    return constants2.map((e) => e.asElement).toList();
   }
 
   @override
-  List<FieldElement2OrMember> get constants2 =>
-      constants.map((e) => e.asElement2).toList();
+  List<FieldElementImpl2> get constants2 {
+    return fields2.where((field) => field.isEnumConstant).toList();
+  }
 
   @override
   List<EnumElementImpl> get fragments {
@@ -4108,7 +4109,7 @@ class ExtensionElementImpl extends InstanceElementImpl
 
   @override
   PropertyAccessorElementOrMember? getGetter(String getterName) {
-    for (var accessor in element.accessors) {
+    for (var accessor in accessors) {
       if (accessor.isGetter && accessor.name == getterName) {
         return accessor;
       }
@@ -4128,10 +4129,7 @@ class ExtensionElementImpl extends InstanceElementImpl
 
   @override
   PropertyAccessorElement? getSetter(String setterName) {
-    return InterfaceElementImpl.getSetterFromAccessors(
-      setterName,
-      element.accessors,
-    );
+    return InterfaceElementImpl.getSetterFromAccessors(setterName, accessors);
   }
 }
 
@@ -5838,12 +5836,6 @@ abstract class InstanceElementImpl2 extends ElementImpl2
         AugmentedInstanceElement,
         InstanceElement2,
         TypeParameterizedElement2 {
-  @override
-  List<FieldElementOrMember> fields = [];
-
-  @override
-  List<PropertyAccessorElementOrMember> accessors = [];
-
   @override
   InstanceElement2 get baseElement => this;
 
@@ -5867,20 +5859,22 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   LibraryElement2 get enclosingElement2 => firstFragment.library;
 
   @override
-  List<FieldElement2> get fields2 {
+  List<FieldElementImpl2> get fields2 {
     _readMembers();
-    return fields.map((e) => e.asElement2 as FieldElement2?).nonNulls.toList();
+    return firstFragment.fields
+        .map((e) => e.asElement2 as FieldElementImpl2)
+        .toList();
   }
 
   @override
   InstanceElementImpl get firstFragment;
 
   @override
-  List<GetterElement2OrMember> get getters2 {
+  List<GetterElementImpl> get getters2 {
     _readMembers();
-    return accessors
+    return firstFragment.accessors
         .where((e) => e.isGetter)
-        .map((e) => e.asElement2 as GetterElement2OrMember)
+        .map((e) => e.asElement2 as GetterElementImpl)
         .nonNulls
         .toList();
   }
@@ -5928,11 +5922,11 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   AnalysisSession? get session => firstFragment.session;
 
   @override
-  List<SetterElement> get setters2 {
+  List<SetterElementImpl> get setters2 {
     _readMembers();
-    return accessors
+    return firstFragment.accessors
         .where((e) => e.isSetter)
-        .map((e) => e.asElement2 as SetterElement?)
+        .map((e) => e.asElement2 as SetterElementImpl?)
         .nonNulls
         .toList();
   }
@@ -5948,34 +5942,10 @@ abstract class InstanceElementImpl2 extends ElementImpl2
           multiline: multiline, preferTypeAlias: preferTypeAlias);
 
   @override
-  FieldElementOrMember? getField(String name) {
-    var length = fields.length;
-    for (var i = 0; i < length; i++) {
-      var field = fields[i];
-      if (field.name == name) {
-        return field;
-      }
-    }
-    return null;
-  }
-
-  @override
-  FieldElement2? getField2(String name) {
+  FieldElementImpl2? getField2(String name) {
     return fields2.firstWhereOrNull((e) => e.name3 == name);
   }
 
-  @override
-  PropertyAccessorElement? getGetter(String name) {
-    var length = accessors.length;
-    for (var i = 0; i < length; i++) {
-      var accessor = accessors[i];
-      if (accessor.isGetter && accessor.name == name) {
-        return accessor;
-      }
-    }
-    return null;
-  }
-
   @override
   GetterElement? getGetter2(String name) {
     return getters2.firstWhereOrNull((e) => e.name3 == name);
@@ -5986,15 +5956,6 @@ abstract class InstanceElementImpl2 extends ElementImpl2
     return methods2.firstWhereOrNull((e) => e.lookupName == name);
   }
 
-  @override
-  PropertyAccessorElement? getSetter(String name) {
-    if (!name.endsWith('=')) {
-      name += '=';
-    }
-    return accessors.firstWhereOrNull(
-        (accessor) => accessor.isSetter && accessor.name == name);
-  }
-
   @override
   SetterElement? getSetter2(String name) {
     return setters2.firstWhereOrNull((e) => e.name3 == name);

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

@@ -474,7 +474,8 @@ class InheritanceManager3 {
     }
 
     element.methods2.map((e) => e.asElement).forEach(addMember);
-    element.accessors.forEach(addMember);
+    element.getters2.map((e) => e.asElement).forEach(addMember);
+    element.setters2.map((e) => e.asElement).forEach(addMember);
   }
 
   void _addMixinMembers({
@@ -1198,25 +1199,20 @@ class InheritanceManager3 {
     var declared = <Name, ExecutableElementOrMember>{};
     var libraryUri = fragment.librarySource.uri;
 
-    var methods = element.methods2;
-    for (var i = 0; i < methods.length; i++) {
-      var method = methods[i];
-      if (!method.isStatic) {
-        var name = Name.forElement(method);
-        if (name != null) {
-          declared[name] = method.asElement;
-        }
+    void addMember(ExecutableElementOrMember member) {
+      if (!member.isStatic) {
+        var name = Name(libraryUri, member.name);
+        declared[name] = member;
       }
     }
 
-    var accessors = element.accessors;
-    for (var i = 0; i < accessors.length; i++) {
-      var accessor = accessors[i];
-      if (!accessor.isStatic) {
-        var name = Name(libraryUri, accessor.name);
-        declared[name] = accessor;
-      }
-    }
+    element.methods2.map((e) => e.asElement).forEach(addMember);
+    element.getters2
+        .map((e) => e.asElement as PropertyAccessorElementImpl)
+        .forEach(addMember);
+    element.setters2
+        .map((e) => e.asElement as PropertyAccessorElementImpl)
+        .forEach(addMember);
 
     return declared;
   }

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

@@ -2336,16 +2336,16 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
     // to be visited in the context of the constructor field initializer node.
     //
     var fieldName = node.fieldName;
-    var fieldElement = enclosingClass!.getField(fieldName.name);
-    fieldName.element = fieldElement.asElement2;
+    var fieldElement = enclosingClass!.getField2(fieldName.name);
+    fieldName.element = fieldElement;
     var fieldType = fieldElement?.type ?? UnknownInferredType.instance;
     var expression = node.expression;
     analyzeExpression(expression, SharedTypeSchemaView(fieldType));
     expression = popRewrite()!;
     var whyNotPromoted = flowAnalysis.flow?.whyNotPromoted(expression);
     if (fieldElement != null) {
       var enclosingConstructor = enclosingFunction as ConstructorElementImpl2;
-      checkForFieldInitializerNotAssignable(node, fieldElement.asElement2,
+      checkForFieldInitializerNotAssignable(node, fieldElement,
           isConstConstructor: enclosingConstructor.isConst,
           whyNotPromoted: whyNotPromoted);
     }