Elements. Put element into builders.

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

Author: scheglov

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

@@ -11,13 +11,12 @@ import 'package:analyzer/src/dart/element/type_algebra.dart';
 import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:analyzer/src/utilities/extensions/string.dart';
 
-class ClassElementBuilder extends InstanceElementBuilder<ClassElementImpl> {
+class ClassElementBuilder extends InstanceElementBuilder<
+    AugmentedClassElementImpl, ClassElementImpl> {
   ClassElementBuilder({
+    required super.element,
     required super.firstFragment,
-    required AugmentedClassElementImpl element,
-  }) {
-    firstFragment.augmentedInternal = element;
-  }
+  });
 
   void addFragment(ClassElementImpl fragment) {
     addFields(fragment.fields);
@@ -31,21 +30,18 @@ class ClassElementBuilder extends InstanceElementBuilder<ClassElementImpl> {
       lastFragment.augmentation = fragment;
       lastFragment = fragment;
 
-      var element = firstFragment.augmentedInternal;
-      fragment.augmentedInternal = element;
-
-      _updatedAugmented(element, fragment);
+      fragment.augmentedInternal = firstFragment.element;
+      _updatedAugmented(fragment);
     }
   }
 }
 
-class EnumElementBuilder extends InstanceElementBuilder<EnumElementImpl> {
+class EnumElementBuilder
+    extends InstanceElementBuilder<AugmentedEnumElementImpl, EnumElementImpl> {
   EnumElementBuilder({
+    required super.element,
     required super.firstFragment,
-    required AugmentedEnumElementImpl element,
-  }) {
-    firstFragment.augmentedInternal = element;
-  }
+  });
 
   void addFragment(EnumElementImpl fragment) {
     addFields(fragment.fields);
@@ -59,22 +55,18 @@ class EnumElementBuilder extends InstanceElementBuilder<EnumElementImpl> {
       lastFragment.augmentation = fragment;
       lastFragment = fragment;
 
-      var element = firstFragment.augmentedInternal;
-      fragment.augmentedInternal = element;
-
-      _updatedAugmented(element, fragment);
+      fragment.augmentedInternal = firstFragment.element;
+      _updatedAugmented(fragment);
     }
   }
 }
 
-class ExtensionElementBuilder
-    extends InstanceElementBuilder<ExtensionElementImpl> {
+class ExtensionElementBuilder extends InstanceElementBuilder<
+    AugmentedExtensionElementImpl, ExtensionElementImpl> {
   ExtensionElementBuilder({
+    required super.element,
     required super.firstFragment,
-    required AugmentedExtensionElementImpl element,
-  }) {
-    firstFragment.augmentedInternal = element;
-  }
+  });
 
   void addFragment(ExtensionElementImpl fragment) {
     addFields(fragment.fields);
@@ -87,22 +79,18 @@ class ExtensionElementBuilder
       lastFragment.augmentation = fragment;
       lastFragment = fragment;
 
-      var element = firstFragment.augmentedInternal;
-      fragment.augmentedInternal = element;
-
-      _updatedAugmented(element, fragment);
+      fragment.augmentedInternal = firstFragment.element;
+      _updatedAugmented(fragment);
     }
   }
 }
 
-class ExtensionTypeElementBuilder
-    extends InstanceElementBuilder<ExtensionTypeElementImpl> {
+class ExtensionTypeElementBuilder extends InstanceElementBuilder<
+    AugmentedExtensionTypeElementImpl, ExtensionTypeElementImpl> {
   ExtensionTypeElementBuilder({
+    required super.element,
     required super.firstFragment,
-    required AugmentedExtensionTypeElementImpl element,
-  }) {
-    firstFragment.augmentedInternal = element;
-  }
+  });
 
   void addFragment(ExtensionTypeElementImpl fragment) {
     addFields(fragment.fields);
@@ -116,20 +104,20 @@ class ExtensionTypeElementBuilder
       lastFragment.augmentation = fragment;
       lastFragment = fragment;
 
-      var element = firstFragment.augmentedInternal;
-      fragment.augmentedInternal = element;
-
-      _updatedAugmented(element, fragment);
+      fragment.augmentedInternal = firstFragment.element;
+      _updatedAugmented(fragment);
     }
   }
 }
 
 /// A builder for top-level fragmented elements, e.g. classes.
-class FragmentedElementBuilder<F extends Fragment> {
+class FragmentedElementBuilder<E extends Element2, F extends Fragment> {
+  final E element;
   final F firstFragment;
   F lastFragment;
 
   FragmentedElementBuilder({
+    required this.element,
     required this.firstFragment,
   }) : lastFragment = firstFragment;
 
@@ -150,9 +138,10 @@ class FragmentedElementBuilder<F extends Fragment> {
   }
 }
 
-class FunctionElementBuilder
-    extends FragmentedElementBuilder<FunctionElementImpl> {
+class FunctionElementBuilder extends FragmentedElementBuilder<
+    TopLevelFunctionElementImpl, FunctionElementImpl> {
   FunctionElementBuilder({
+    required super.element,
     required super.firstFragment,
   });
 
@@ -164,9 +153,10 @@ class FunctionElementBuilder
   }
 }
 
-class GetterElementBuilder
-    extends FragmentedElementBuilder<PropertyAccessorElementImpl> {
+class GetterElementBuilder extends FragmentedElementBuilder<GetterElementImpl,
+    PropertyAccessorElementImpl> {
   GetterElementBuilder({
+    required super.element,
     required super.firstFragment,
   });
 
@@ -178,15 +168,16 @@ class GetterElementBuilder
   }
 }
 
-abstract class InstanceElementBuilder<F extends InstanceElementImpl>
-    extends FragmentedElementBuilder<F> {
+abstract class InstanceElementBuilder<E extends AugmentedInstanceElementImpl,
+    F extends InstanceElementImpl> extends FragmentedElementBuilder<E, F> {
   final Map<String, FieldElementImpl> fields = {};
   final Map<String, ConstructorElementImpl> constructors = {};
   final Map<String, PropertyAccessorElementImpl> getters = {};
   final Map<String, PropertyAccessorElementImpl> setters = {};
   final Map<String, MethodElementImpl> methods = {};
 
   InstanceElementBuilder({
+    required super.element,
     required super.firstFragment,
   });
 
@@ -303,11 +294,8 @@ abstract class InstanceElementBuilder<F extends InstanceElementImpl>
     return target;
   }
 
-  // TODO(scheglov): remove [augmented]
-  void _updatedAugmented(
-    AugmentedInstanceElementImpl augmented,
-    InstanceElementImpl augmentation,
-  ) {
+  void _updatedAugmented(InstanceElementImpl augmentation) {
+    var element = this.element;
     var firstFragment = this.firstFragment;
     var firstTypeParameters = firstFragment.typeParameters;
 
@@ -330,9 +318,9 @@ abstract class InstanceElementBuilder<F extends InstanceElementImpl>
 
     if (augmentation is InterfaceElementImpl &&
         firstFragment is InterfaceElementImpl &&
-        augmented is AugmentedInterfaceElementImpl) {
-      augmented.constructors = [
-        ...augmented.constructors.notAugmented,
+        element is AugmentedInterfaceElementImpl) {
+      element.constructors = [
+        ...element.constructors.notAugmented,
         ...augmentation.constructors.notAugmented.map((element) {
           if (toFirstFragment.map.isEmpty) {
             return element;
@@ -346,8 +334,8 @@ abstract class InstanceElementBuilder<F extends InstanceElementImpl>
       ];
     }
 
-    augmented.fields = [
-      ...augmented.fields.notAugmented,
+    element.fields = [
+      ...element.fields.notAugmented,
       ...augmentation.fields.notAugmented.map((element) {
         if (toFirstFragment.map.isEmpty) {
           return element;
@@ -356,8 +344,8 @@ abstract class InstanceElementBuilder<F extends InstanceElementImpl>
       }),
     ];
 
-    augmented.accessors = [
-      ...augmented.accessors.notAugmented,
+    element.accessors = [
+      ...element.accessors.notAugmented,
       ...augmentation.accessors.notAugmented.map((element) {
         if (toFirstFragment.map.isEmpty) {
           return element;
@@ -367,8 +355,8 @@ abstract class InstanceElementBuilder<F extends InstanceElementImpl>
       }),
     ];
 
-    augmented.methods = [
-      ...augmented.methods.notAugmented,
+    element.methods = [
+      ...element.methods.notAugmented,
       ...augmentation.methods.notAugmented.map((element) {
         if (toFirstFragment.map.isEmpty) {
           return element;
@@ -379,13 +367,12 @@ abstract class InstanceElementBuilder<F extends InstanceElementImpl>
   }
 }
 
-class MixinElementBuilder extends InstanceElementBuilder<MixinElementImpl> {
+class MixinElementBuilder extends InstanceElementBuilder<
+    AugmentedMixinElementImpl, MixinElementImpl> {
   MixinElementBuilder({
+    required super.element,
     required super.firstFragment,
-    required AugmentedMixinElementImpl element,
-  }) {
-    firstFragment.augmentedInternal = element;
-  }
+  });
 
   void addFragment(MixinElementImpl fragment) {
     addFields(fragment.fields);
@@ -398,17 +385,16 @@ class MixinElementBuilder extends InstanceElementBuilder<MixinElementImpl> {
       lastFragment.augmentation = fragment;
       lastFragment = fragment;
 
-      var element = firstFragment.augmentedInternal;
-      fragment.augmentedInternal = element;
-
-      _updatedAugmented(element, fragment);
+      fragment.augmentedInternal = firstFragment.element;
+      _updatedAugmented(fragment);
     }
   }
 }
 
-class SetterElementBuilder
-    extends FragmentedElementBuilder<PropertyAccessorElementImpl> {
+class SetterElementBuilder extends FragmentedElementBuilder<SetterElementImpl,
+    PropertyAccessorElementImpl> {
   SetterElementBuilder({
+    required super.element,
     required super.firstFragment,
   });
 
@@ -420,9 +406,10 @@ class SetterElementBuilder
   }
 }
 
-class TopLevelVariableElementBuilder
-    extends FragmentedElementBuilder<TopLevelVariableElementImpl> {
+class TopLevelVariableElementBuilder extends FragmentedElementBuilder<
+    TopLevelVariableElementImpl2, TopLevelVariableElementImpl> {
   TopLevelVariableElementBuilder({
+    required super.element,
     required super.firstFragment,
   });
 
@@ -434,9 +421,10 @@ class TopLevelVariableElementBuilder
   }
 }
 
-class TypeAliasElementBuilder
-    extends FragmentedElementBuilder<TypeAliasElementImpl> {
+class TypeAliasElementBuilder extends FragmentedElementBuilder<
+    TypeAliasElementImpl2, TypeAliasElementImpl> {
   TypeAliasElementBuilder({
+    required super.element,
     required super.firstFragment,
   });