Elements. Store FieldFormalParameterElementImpl.field directly.

Change-Id: Icdbb58fedaa2b1ba5314368474a683ebf513ff45
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449075
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: scheglov

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

@@ -2970,13 +2970,10 @@ class FieldElementImpl extends PropertyInducingElementImpl
 
 class FieldFormalParameterElementImpl extends FormalParameterElementImpl
     implements FieldFormalParameterElement {
-  FieldFormalParameterElementImpl(super.firstFragment);
-
   @override
-  FieldElementImpl? get field => switch (_firstFragment) {
-    FieldFormalParameterFragmentImpl(:FieldFragmentImpl field) => field.element,
-    _ => null,
-  };
+  FieldElementImpl? field;
+
+  FieldFormalParameterElementImpl(super.firstFragment);
 
   @Deprecated('Use field instead')
   @override
@@ -3004,11 +3001,6 @@ class FieldFormalParameterElementImpl extends FormalParameterElementImpl
 
 class FieldFormalParameterFragmentImpl extends FormalParameterFragmentImpl
     implements FieldFormalParameterFragment {
-  /// The field element associated with this field formal parameter, or `null`
-  /// if the parameter references a field that doesn't exist.
-  // TODO(scheglov): move to element
-  FieldFragmentImpl? field;
-
   /// Initialize a newly created parameter element to have the given [name] and
   /// [nameOffset].
   FieldFormalParameterFragmentImpl({

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

@@ -742,10 +742,7 @@ class LibraryReader {
       parameter.element.type = type;
       parameter.constantInitializer = reader.readOptionalExpression();
       if (parameter is FieldFormalParameterFragmentImpl) {
-        // TODO(scheglov): use element
-        parameter.field =
-            (reader.readElement() as FieldElementImpl?)?.firstFragment;
-        // parameter.field = reader.readFragmentOrMember() as FieldFragmentImpl?;
+        parameter.element.field = reader.readElement() as FieldElementImpl?;
       }
     }
   }

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

@@ -645,8 +645,7 @@ class BundleWriter {
 
       if (element is FieldFormalParameterFragmentImpl) {
         // TODO(scheglov): formal parameter types? Anything else?
-        // _resolutionSink.writeFragmentOrMember(element.field);
-        _resolutionSink.writeElement(element.field?.element);
+        _resolutionSink.writeElement(element.element.field);
       }
     });
   }

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

@@ -1826,14 +1826,11 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
 
     _addChildFragment(fieldFragment);
 
-    var formalParameterElement =
-        FieldFormalParameterFragmentImpl(
-            name: _getFragmentName(fieldNameToken),
-            nameOffset: null,
-            parameterKind: ParameterKind.REQUIRED,
-          )
-          ..field = fieldFragment
-          ..hasImplicitType = true;
+    var formalParameterFragment = FieldFormalParameterFragmentImpl(
+      name: _getFragmentName(fieldNameToken),
+      nameOffset: null,
+      parameterKind: ParameterKind.REQUIRED,
+    )..hasImplicitType = true;
 
     {
       var constructorFragment =
@@ -1842,7 +1839,7 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
             )
             ..isAugmentation = extensionNode.augmentKeyword != null
             ..isConst = extensionNode.constKeyword != null
-            ..formalParameters = [formalParameterElement];
+            ..formalParameters = [formalParameterFragment];
       constructorFragment.typeName = extensionFragment.name;
 
       representation.constructorFragment = constructorFragment;

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

@@ -323,21 +323,20 @@ class LibraryBuilder {
   }
 
   void resolveConstructorFieldFormals() {
-    for (var interfaceFragment in element.topLevelElements) {
-      if (interfaceFragment is! InterfaceFragmentImpl) {
+    for (var interfaceElement in element.children) {
+      if (interfaceElement is! InterfaceElementImpl) {
         continue;
       }
 
-      if (interfaceFragment is ClassFragmentImpl &&
-          interfaceFragment.isMixinApplication) {
+      if (interfaceElement is ClassElementImpl &&
+          interfaceElement.isMixinApplication) {
         continue;
       }
 
-      var element = interfaceFragment.element;
-      for (var constructor in interfaceFragment.constructors) {
+      for (var constructor in interfaceElement.constructors) {
         for (var parameter in constructor.formalParameters) {
-          if (parameter is FieldFormalParameterFragmentImpl) {
-            parameter.field = element.getField(parameter.name ?? '')?.asElement;
+          if (parameter is FieldFormalParameterElementImpl) {
+            parameter.field = interfaceElement.getField(parameter.name ?? '');
           }
         }
       }