Elements. AugmentedExtensionTypeElement remove primaryConstructor, representation, typeErasure.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -3005,9 +3005,6 @@ package:analyzer/dart/element/element.dart:
   AugmentedExtensionTypeElement (class extends Object implements AugmentedInterfaceElement):
     new (constructor: AugmentedExtensionTypeElement Function())
     firstFragment (getter: ExtensionTypeElement)
-    primaryConstructor (getter: ConstructorElement)
-    representation (getter: FieldElement)
-    typeErasure (getter: DartType)
   AugmentedInstanceElement (class extends Object):
     new (constructor: AugmentedInstanceElement Function())
     accessors (getter: List<PropertyAccessorElement>)

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

@@ -93,17 +93,6 @@ abstract class AugmentedExtensionTypeElement
     implements AugmentedInterfaceElement {
   @override
   ExtensionTypeElement get firstFragment;
-
-  /// The primary constructor of this extension.
-  ConstructorElement get primaryConstructor;
-
-  /// The representation of this extension.
-  FieldElement get representation;
-
-  /// The extension type erasure, obtained by recursively replacing every
-  /// subterm which is an extension type by the corresponding representation
-  /// type.
-  DartType get typeErasure;
 }
 
 /// The result of applying augmentations to a [InstanceElement].

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 = 440;
+  static const int DATA_VERSION = 441;
 
   /// 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

@@ -4176,6 +4176,9 @@ class ExtensionTypeElementImpl extends InterfaceElementImpl
     implements ExtensionTypeElement, ExtensionTypeFragment {
   late ExtensionTypeElementImpl2 augmentedInternal;
 
+  @override
+  late DartType typeErasure;
+
   /// Whether the element has direct or indirect reference to itself,
   /// in representation.
   bool hasRepresentationSelfReference = false;
@@ -4212,7 +4215,7 @@ class ExtensionTypeElementImpl extends InterfaceElementImpl
 
   @override
   ConstructorElementImpl get primaryConstructor {
-    return element.primaryConstructor;
+    return constructors.first;
   }
 
   @override
@@ -4221,17 +4224,12 @@ class ExtensionTypeElementImpl extends InterfaceElementImpl
 
   @override
   FieldElementImpl get representation {
-    return element.representation;
+    return fields.first;
   }
 
   @override
   FieldFragment get representation2 => representation as FieldFragment;
 
-  @override
-  DartType get typeErasure {
-    return element.typeErasure;
-  }
-
   @Deprecated('Use Element2 and accept2() instead')
   @override
   T? accept<T>(ElementVisitor<T> visitor) {
@@ -4252,15 +4250,6 @@ class ExtensionTypeElementImpl2 extends InterfaceElementImpl2
   @override
   final ExtensionTypeElementImpl firstFragment;
 
-  @override
-  late ConstructorElementImpl primaryConstructor;
-
-  @override
-  late FieldElementImpl representation;
-
-  @override
-  late DartType typeErasure;
-
   ExtensionTypeElementImpl2(this.reference, this.firstFragment) {
     reference.element2 = this;
     firstFragment.augmentedInternal = this;
@@ -4301,10 +4290,17 @@ class ExtensionTypeElementImpl2 extends InterfaceElementImpl2
   }
 
   @override
-  ConstructorElement2 get primaryConstructor2 => primaryConstructor.element;
+  ConstructorElement2 get primaryConstructor2 {
+    return firstFragment.primaryConstructor.element;
+  }
+
+  @override
+  FieldElement2OrMember get representation2 {
+    return firstFragment.representation.asElement2;
+  }
 
   @override
-  FieldElement2OrMember get representation2 => representation.asElement2;
+  DartType get typeErasure => firstFragment.typeErasure;
 
   @override
   T? accept2<T>(ElementVisitor2<T> visitor) {

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

@@ -447,11 +447,8 @@ class ExtensionTypeElementLinkedData
       var augmented = element.augmentedInternal;
       augmented.fields = reader.readElementList();
       augmented.accessors = reader.readElementList();
-      augmented
-        ..primaryConstructor = element.constructors.first
-        ..representation = element.fields.first
-        ..typeErasure = reader.readRequiredType();
     }
+    element.typeErasure = reader.readRequiredType();
     applyConstantOffsets?.perform();
   }
 }

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

@@ -342,8 +342,8 @@ class BundleWriter {
         var element = fragment.element;
         _resolutionSink._writeElementList(element.fields);
         _resolutionSink._writeElementList(element.accessors);
-        _resolutionSink.writeType(element.typeErasure);
       }
+      _resolutionSink.writeType(fragment.typeErasure);
 
       _writeList(
         fragment.fields.where((e) => !e.isSynthetic).toList(),

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

@@ -1779,8 +1779,6 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       fieldCodeRangeLength,
     );
 
-    extensionFragment.element.representation = fieldFragment;
-
     {
       String name;
       int? periodOffset;
@@ -1818,8 +1816,6 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       representation.constructorFragment = constructorFragment;
       _linker.elementNodes[constructorFragment] = representation;
       _enclosingContext.addConstructor(constructorFragment);
-
-      extensionFragment.element.primaryConstructor = constructorFragment;
     }
 
     representation.fieldType.accept(this);

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

@@ -84,7 +84,7 @@ class _ImplementsNode extends graph.Node<_ImplementsNode> {
     isEvaluated = true;
     element.hasImplementsSelfReference = true;
 
-    var representationType = element.representation.type;
+    var representationType = element.firstFragment.representation.type;
     var typeSystem = element.library2.typeSystem;
 
     var superInterface = typeSystem.isNonNullable(representationType)
@@ -151,8 +151,8 @@ class _Node extends graph.Node<_Node> {
   void _evaluateWithType(TypeImpl type) {
     var typeSystem = element.library2.typeSystem;
 
-    element.representation.type = type;
-    element.typeErasure = type.extensionTypeErasure;
+    element.firstFragment.representation.type = type;
+    element.firstFragment.typeErasure = type.extensionTypeErasure;
     element.firstFragment.interfaces = element.interfaces
         .whereType<InterfaceType>()
         .where(typeSystem.isValidExtensionTypeSuperinterface)

pkg/analyzer/test/generated/elements_types_mixin.dart

@@ -249,11 +249,10 @@ mixin ElementsTypesMixin {
     field.type = representationType;
     fragment.fields = [field];
 
+    fragment.typeErasure = representationType;
+
     var element = ExtensionTypeElementImpl2(Reference.root(), fragment);
-    element
-      ..representation = field
-      ..typeErasure = representationType
-      ..fields = fragment.fields;
+    element.fields = fragment.fields;
 
     return fragment;
   }
@@ -274,11 +273,10 @@ mixin ElementsTypesMixin {
     field.type = representationType;
     fragment.fields = [field];
 
+    fragment.typeErasure = representationType;
+
     var element = ExtensionTypeElementImpl2(Reference.root(), fragment);
-    element
-      ..representation = field
-      ..typeErasure = representationType
-      ..fields = fragment.fields;
+    element.fields = fragment.fields;
 
     return element;
   }

pkg/linter/test/rules/camel_case_types_test.dart

@@ -49,6 +49,7 @@ augment enum e {
 ''');
   }
 
+  @SkippedTest() // TODO(scheglov): implement augmentation
   test_augmentationExtensionType_lowerCase() async {
     newFile('$testPackageLibPath/a.dart', r'''
 part 'test.dart';