Elements. Migrate FieldNameNonPromotabilityInfo.

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

Author: scheglov

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

@@ -97,7 +97,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 = 430;
+  static const int DATA_VERSION = 431;
 
   /// 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/field_name_non_promotability_info.dart

@@ -2,9 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// ignore_for_file: analyzer_use_new_elements
-
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 
 /// Information about why a single private name in a library is non-promotable.
@@ -17,22 +15,23 @@ class FieldNameNonPromotabilityInfo {
   /// The set of fields in the library with the given private name that are
   /// inherently non-promotable. These fields conflict with promotability of the
   /// given private name.
-  final List<FieldElement> conflictingFields;
+  final List<FieldElement2> conflictingFields;
 
   /// The set of getters in the library with the given private name that are
   /// concrete. These getters conflict with promotability of the given private
   /// name.
-  final List<PropertyAccessorElement> conflictingGetters;
+  final List<PropertyAccessorElement2> conflictingGetters;
 
   /// The set of concrete classes in the library that contain a getter with the
   /// given private name in their interface but not explicitly in their
   /// implementation (and hence implicitly contain a `noSuchMethod` forwarder
   /// for the getter). These implicit `noSuchMethod` forwarders conflict with
   /// promotability of the given private name.
-  final List<InterfaceElement> conflictingNsmClasses;
+  final List<InterfaceElement2> conflictingNsmClasses;
 
-  FieldNameNonPromotabilityInfo(
-      {required this.conflictingFields,
-      required this.conflictingGetters,
-      required this.conflictingNsmClasses});
+  FieldNameNonPromotabilityInfo({
+    required this.conflictingFields,
+    required this.conflictingGetters,
+    required this.conflictingNsmClasses,
+  });
 }

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

@@ -5724,47 +5724,55 @@ class _WhyNotPromotedVisitor
       var fieldNonPromotabilityInfo = library.fieldNameNonPromotabilityInfo;
       var fieldNameInfo = fieldNonPromotabilityInfo[reason.propertyName];
       var messages = <DiagnosticMessage>[];
-      void addConflictMessage(
-          {required Element conflictingElement,
-          required String kind,
-          required Element enclosingElement,
-          required NonPromotionDocumentationLink link}) {
+      void addConflictMessage({
+        required Element2 conflictingElement,
+        required String kind,
+        required Element2 enclosingElement,
+        required NonPromotionDocumentationLink link,
+      }) {
         var enclosingKindName = enclosingElement.kind.displayName;
-        var enclosingName = enclosingElement.name;
+        var enclosingName = enclosingElement.name3;
         var message = "'$propertyName' couldn't be promoted because there is a "
             "conflicting $kind in $enclosingKindName '$enclosingName'";
-        var nonSyntheticElement = conflictingElement.nonSynthetic;
-        messages.add(DiagnosticMessageImpl(
-            filePath: nonSyntheticElement.source!.fullName,
+        var nonSyntheticElement = conflictingElement.nonSynthetic2;
+        var nonSyntheticFragment = nonSyntheticElement.firstFragment;
+        var source = nonSyntheticFragment.libraryFragment?.source;
+        messages.add(
+          DiagnosticMessageImpl(
+            filePath: source!.fullName,
             message: message,
-            offset: nonSyntheticElement.nameOffset,
-            length: nonSyntheticElement.nameLength,
-            url: link.url));
+            offset: nonSyntheticFragment.nameOffset2!,
+            length: nonSyntheticElement.name3!.length,
+            url: link.url,
+          ),
+        );
       }
 
       if (fieldNameInfo != null) {
         for (var field in fieldNameInfo.conflictingFields) {
           addConflictMessage(
-              conflictingElement: field,
-              kind: 'non-promotable field',
-              enclosingElement: field.enclosingElement3,
-              link:
-                  NonPromotionDocumentationLink.conflictingNonPromotableField);
+            conflictingElement: field,
+            kind: 'non-promotable field',
+            enclosingElement: field.enclosingElement2,
+            link: NonPromotionDocumentationLink.conflictingNonPromotableField,
+          );
         }
         for (var getter in fieldNameInfo.conflictingGetters) {
           addConflictMessage(
-              conflictingElement: getter,
-              kind: 'getter',
-              enclosingElement: getter.enclosingElement3,
-              link: NonPromotionDocumentationLink.conflictingGetter);
+            conflictingElement: getter,
+            kind: 'getter',
+            enclosingElement: getter.enclosingElement2,
+            link: NonPromotionDocumentationLink.conflictingGetter,
+          );
         }
         for (var nsmClass in fieldNameInfo.conflictingNsmClasses) {
           addConflictMessage(
-              conflictingElement: nsmClass,
-              kind: 'noSuchMethod forwarder',
-              enclosingElement: nsmClass,
-              link: NonPromotionDocumentationLink
-                  .conflictingNoSuchMethodForwarder);
+            conflictingElement: nsmClass,
+            kind: 'noSuchMethod forwarder',
+            enclosingElement: nsmClass,
+            link:
+                NonPromotionDocumentationLink.conflictingNoSuchMethodForwarder,
+          );
         }
       }
       if (reason.fieldPromotionEnabled) {

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

@@ -9,6 +9,7 @@ import 'dart:typed_data';
 import 'package:_fe_analyzer_shared/src/type_inference/type_analyzer_operations.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/source/line_info.dart';
@@ -597,9 +598,9 @@ class LibraryElementLinkedData extends ElementLinkedData<LibraryElementImpl> {
         readKey: () => reader.readStringReference(),
         readValue: () {
           return FieldNameNonPromotabilityInfo(
-            conflictingFields: reader.readElementList(),
-            conflictingGetters: reader.readElementList(),
-            conflictingNsmClasses: reader.readElementList(),
+            conflictingFields: reader.readElementList2(),
+            conflictingGetters: reader.readElementList2(),
+            conflictingNsmClasses: reader.readElementList2(),
           );
         },
       );
@@ -2107,15 +2108,22 @@ class ResolutionReader {
     throw UnimplementedError('memberFlags: $memberFlags');
   }
 
+  Element2? readElement2() {
+    return readElement()?.asElement2;
+  }
+
   List<T> readElementList<T extends Element>() {
     return _reader.readTypedListCast<T>(readElement);
   }
 
+  List<T> readElementList2<T extends Element2>() {
+    return _reader.readTypedListCast<T>(readElement2);
+  }
+
   T readEnum<T extends Enum>(List<T> values) {
     return _reader.readEnum(values);
   }
 
-
   Map<K, V> readMap<K, V>({
     required K Function() readKey,
     required V Function() readValue,
@@ -2418,8 +2426,6 @@ class ResolutionReader {
     return readTypedList(_readInterfaceType);
   }
 
-
-
   List<T> _readNodeList<T>() {
     return readTypedList(() {
       return _readRequiredNode() as T;

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

@@ -26,6 +26,7 @@ import 'package:analyzer/src/summary2/data_writer.dart';
 import 'package:analyzer/src/summary2/element_flags.dart';
 import 'package:analyzer/src/summary2/export.dart';
 import 'package:analyzer/src/summary2/reference.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:analyzer/src/utilities/extensions/object.dart';
 
 class BundleWriter {
@@ -400,9 +401,9 @@ class BundleWriter {
           _resolutionSink._writeStringReference(key);
         },
         writeValue: (value) {
-          _resolutionSink._writeElementList(value.conflictingFields);
-          _resolutionSink._writeElementList(value.conflictingGetters);
-          _resolutionSink._writeElementList(value.conflictingNsmClasses);
+          _resolutionSink._writeElementList2(value.conflictingFields);
+          _resolutionSink._writeElementList2(value.conflictingGetters);
+          _resolutionSink._writeElementList2(value.conflictingNsmClasses);
         },
       );
     });
@@ -925,6 +926,11 @@ class ResolutionSink extends _SummaryDataWriter {
     }
   }
 
+  void _writeElementList2(List<Element2> elements2) {
+    var elements = elements2.map((e) => e.asElement!).toList();
+    _writeElementList(elements);
+  }
+
   void _writeFormalParameters(
     List<ParameterElement> parameters, {
     required bool withAnnotations,

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

@@ -964,9 +964,13 @@ class _FieldPromotability extends FieldPromotability<InterfaceElement,
     _libraryBuilder.element.fieldNameNonPromotabilityInfo = {
       for (var MapEntry(:key, :value) in fieldNonPromotabilityInfo.entries)
         key: element_model.FieldNameNonPromotabilityInfo(
-            conflictingFields: value.conflictingFields,
-            conflictingGetters: value.conflictingGetters,
-            conflictingNsmClasses: value.conflictingNsmClasses)
+          conflictingFields:
+              value.conflictingFields.map((e) => e.asElement2).toList(),
+          conflictingGetters:
+              value.conflictingGetters.map((e) => e.asElement2).toList(),
+          conflictingNsmClasses:
+              value.conflictingNsmClasses.map((e) => e.asElement2).toList(),
+        )
     };
   }
 

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

@@ -436,6 +436,12 @@ extension FormalParameterElementImplExtension on FormalParameterElementImpl {
   }
 }
 
+extension InstanceElement2Extension on InstanceElement2 {
+  InstanceElement get asElement {
+    return firstFragment as InstanceElement;
+  }
+}
+
 extension InterfaceElement2Extension on InterfaceElement2 {
   InterfaceElement get asElement {
     return firstFragment as InterfaceElement;

pkg/analyzer/test/src/summary/element_text.dart

@@ -176,15 +176,15 @@ abstract class _AbstractElementWriter {
       for (var entry in info.entries) {
         _sink.writelnWithIndent(entry.key);
         _sink.withIndent(() {
-          _elementPrinter.writeElementList(
+          _elementPrinter.writeElementList2(
             'conflictingFields',
             entry.value.conflictingFields,
           );
-          _elementPrinter.writeElementList(
+          _elementPrinter.writeElementList2(
             'conflictingGetters',
             entry.value.conflictingGetters,
           );
-          _elementPrinter.writeElementList(
+          _elementPrinter.writeElementList2(
             'conflictingNsmClasses',
             entry.value.conflictingNsmClasses,
           );