Elements. Move hasEnclosingTypeParameterReference to elements.

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

Author: scheglov

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

@@ -106,7 +106,7 @@ testFineAfterLibraryAnalyzerHook;
 // 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 = 557;
+  static const int DATA_VERSION = 558;
 
   /// 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

@@ -2179,7 +2179,11 @@ abstract class ExecutableElementImpl extends FunctionTypedElementImpl
   /// so for them this flag is always `false`.
   @trackedIncludedInId
   bool get hasEnclosingTypeParameterReference {
-    return _firstFragment.hasEnclosingTypeParameterReference;
+    return !hasModifier(Modifier.NO_ENCLOSING_TYPE_PARAMETER_REFERENCE);
+  }
+
+  set hasEnclosingTypeParameterReference(bool value) {
+    setModifier(Modifier.NO_ENCLOSING_TYPE_PARAMETER_REFERENCE, !value);
   }
 
   @override
@@ -2383,17 +2387,6 @@ abstract class ExecutableFragmentImpl extends FunctionTypedFragmentImpl
     _formalParameters = formalParameters;
   }
 
-  /// Whether the type of this fragment references a type parameter of the
-  /// enclosing element. This includes not only explicitly specified type
-  /// annotations, but also inferred types.
-  bool get hasEnclosingTypeParameterReference {
-    return !hasModifier(Modifier.NO_ENCLOSING_TYPE_PARAMETER_REFERENCE);
-  }
-
-  set hasEnclosingTypeParameterReference(bool value) {
-    setModifier(Modifier.NO_ENCLOSING_TYPE_PARAMETER_REFERENCE, !value);
-  }
-
   /// Whether the executable element is an operator.
   ///
   /// The test may be based on the name of the executable element, in which
@@ -2824,7 +2817,11 @@ class FieldElementImpl extends PropertyInducingElementImpl
   /// annotations, but also inferred types.
   @trackedIncludedInId
   bool get hasEnclosingTypeParameterReference {
-    return _firstFragment.hasEnclosingTypeParameterReference;
+    return !hasModifier(Modifier.NO_ENCLOSING_TYPE_PARAMETER_REFERENCE);
+  }
+
+  set hasEnclosingTypeParameterReference(bool value) {
+    setModifier(Modifier.NO_ENCLOSING_TYPE_PARAMETER_REFERENCE, !value);
   }
 
   @override
@@ -3083,17 +3080,6 @@ class FieldFragmentImpl extends PropertyInducingFragmentImpl
     return super.enclosingFragment as InstanceFragmentImpl;
   }
 
-  /// Whether the type of this fragment references a type parameter of the
-  /// enclosing element. This includes not only explicitly specified type
-  /// annotations, but also inferred types.
-  bool get hasEnclosingTypeParameterReference {
-    return !hasModifier(Modifier.NO_ENCLOSING_TYPE_PARAMETER_REFERENCE);
-  }
-
-  set hasEnclosingTypeParameterReference(bool value) {
-    setModifier(Modifier.NO_ENCLOSING_TYPE_PARAMETER_REFERENCE, !value);
-  }
-
   @override
   MetadataImpl get metadata {
     _ensureReadResolution();

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

@@ -1218,7 +1218,6 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
 
       // Build the 'values' field.
       var valuesField = FieldFragmentImpl(name: 'values')
-        ..hasEnclosingTypeParameterReference = false
         ..isConst = true
         ..isStatic = true
         ..isSynthetic = true;

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

@@ -21,11 +21,9 @@ class EnclosingTypeParameterReferenceFlag {
             for (var field in topElement.fields) {
               if (!field.isSynthetic || field.isEnumValues) {
                 var result = _hasTypeParameterReference(topElement, field.type);
-                field.firstFragment.hasEnclosingTypeParameterReference = result;
-                field.getter?.firstFragment.hasEnclosingTypeParameterReference =
-                    result;
-                field.setter?.firstFragment.hasEnclosingTypeParameterReference =
-                    result;
+                field.hasEnclosingTypeParameterReference = result;
+                field.getter?.hasEnclosingTypeParameterReference = result;
+                field.setter?.hasEnclosingTypeParameterReference = result;
               }
             }
 
@@ -36,40 +34,27 @@ class EnclosingTypeParameterReferenceFlag {
                   topElement,
                   propertyAccessor.type,
                 );
-                propertyAccessor
-                        .firstFragment
-                        .hasEnclosingTypeParameterReference =
-                    result;
+                propertyAccessor.hasEnclosingTypeParameterReference = result;
                 if (propertyAccessor.variable case FieldElementImpl field) {
-                  field.firstFragment.hasEnclosingTypeParameterReference =
-                      result;
+                  field.hasEnclosingTypeParameterReference = result;
                 }
               }
             }
 
             for (var method in topElement.methods) {
-              method.firstFragment.hasEnclosingTypeParameterReference =
+              method.hasEnclosingTypeParameterReference =
                   _hasTypeParameterReference(topElement, method.type);
             }
           case PropertyAccessorElementImpl():
             // Top-level accessors don't have type parameters.
             if (!topElement.isSynthetic) {
-              topElement.firstFragment.hasEnclosingTypeParameterReference =
-                  false;
+              topElement.hasEnclosingTypeParameterReference = false;
             }
           case TopLevelVariableElementImpl():
             // Top-level variables dont have type parameters.
             if (!topElement.isSynthetic) {
-              topElement
-                      .getter
-                      ?.firstFragment
-                      .hasEnclosingTypeParameterReference =
-                  false;
-              topElement
-                      .setter
-                      ?.firstFragment
-                      .hasEnclosingTypeParameterReference =
-                  false;
+              topElement.getter?.hasEnclosingTypeParameterReference = false;
+              topElement.setter?.hasEnclosingTypeParameterReference = false;
             }
         }
       }