Elements. Migrate AstDataExtractor and _InheritanceDataComputer.

Also add `Element2.lookupName`, because of `unary-`.

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

Author: scheglov

pkg/analyzer/analyzer_use_new_elements.txt

@@ -162,7 +162,6 @@ lib/src/task/strong_mode.dart
 lib/src/test_utilities/find_element.dart
 lib/src/test_utilities/find_node.dart
 lib/src/test_utilities/mock_sdk_elements.dart
-lib/src/util/ast_data_extractor.dart
 lib/src/utilities/extensions/analysis_session.dart
 lib/src/utilities/extensions/ast.dart
 lib/src/utilities/extensions/element.dart
@@ -192,7 +191,6 @@ test/id_tests/definite_unassignment_test.dart
 test/id_tests/exhaustiveness_test.dart
 test/id_tests/inferred_type_arguments_test.dart
 test/id_tests/inferred_variable_types_test.dart
-test/id_tests/inheritance_test.dart
 test/id_tests/metadata_evaluate_test.dart
 test/id_tests/metadata_test.dart
 test/id_tests/nullability_test.dart

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

@@ -441,9 +441,24 @@ abstract class Element2 {
   /// The object can be used to locate this element at a later time.
   ElementLocation? get location;
 
+  /// The name to use for lookup in maps.
+  ///
+  /// It is usually the same as [name3], with a few special cases.
+  ///
+  /// Just like [name3], it can be `null` if the element does not have
+  /// a name, for example an unnamed extension, or because of parser recovery.
+  ///
+  /// For a [SetterElement] the result has `=` at the end.
+  ///
+  /// For an unary operator `-` the result is `unary-`.
+  /// For a binary operator `-` the result is just `-`.
+  String? get lookupName;
+
   /// The name of this element.
   ///
   /// Returns `null` if this element doesn't have a name.
+  ///
+  /// See [Fragment.name2] for details.
   String? get name3;
 
   /// The non-synthetic element that caused this element to be created.
@@ -978,6 +993,8 @@ abstract class Fragment {
   /// for such synthetic fragments.
   ///
   /// For a [SetterFragment] this is the identifier, without `=` at the end.
+  ///
+  /// For both unary and binary `-` operator this is `-`.
   String? get name2;
 
   /// The offset of the [name2] of this element.

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

@@ -2924,6 +2924,11 @@ abstract class ElementImpl implements Element, Element2 {
     return _cachedLocation ??= ElementLocationImpl.con1(this);
   }
 
+  @override
+  String? get lookupName {
+    return name3;
+  }
+
   @override
   List<ElementAnnotationImpl> get metadata {
     return _metadata;
@@ -3279,6 +3284,11 @@ abstract class ElementImpl2 implements Element2 {
     return _cachedLocation ??= ElementLocationImpl.fromElement(this);
   }
 
+  @override
+  String? get lookupName {
+    return name3;
+  }
+
   @override
   Element2 get nonSynthetic2 => this;
 
@@ -7782,6 +7792,14 @@ class MethodElementImpl2 extends ExecutableElementImpl2
   @override
   ElementKind get kind => ElementKind.METHOD;
 
+  @override
+  String? get lookupName {
+    if (name3 == '-' && formalParameters.isEmpty) {
+      return 'unary-';
+    }
+    return name3;
+  }
+
   @override
   T? accept2<T>(ElementVisitor2<T> visitor) {
     return visitor.visitMethodElement(this);
@@ -9756,6 +9774,14 @@ class SetterElementImpl extends PropertyAccessorElementImpl2
   @override
   ElementKind get kind => ElementKind.SETTER;
 
+  @override
+  String? get lookupName {
+    if (name3 case var name?) {
+      return '$name=';
+    }
+    return null;
+  }
+
   @override
   Element2 get nonSynthetic2 {
     if (!isSynthetic) {

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

@@ -68,6 +68,9 @@ class ConstructorMember extends ExecutableMember
   @override
   bool get isFactory => declaration.isFactory;
 
+  @override
+  String? get lookupName => _element2.lookupName;
+
   @override
   String get name => declaration.name;
 
@@ -557,6 +560,9 @@ class FieldMember extends VariableMember
   @override
   LibraryElement2? get library2 => _element2.library2;
 
+  @override
+  String? get lookupName => _element2.lookupName;
+
   @override
   String get name => declaration.name;
 
@@ -694,6 +700,9 @@ class GetterMember extends PropertyAccessorMember implements GetterElement {
   @override
   GetterFragment get firstFragment => _element2.firstFragment;
 
+  @override
+  String? get lookupName => _element2.lookupName;
+
   @override
   PropertyInducingElement2? get variable3 =>
       variable2.asElement2 as PropertyInducingElement2?;
@@ -990,6 +999,9 @@ class MethodMember extends ExecutableMember
   @override
   MethodFragment get firstFragment => _element2.firstFragment;
 
+  @override
+  String? get lookupName => name3;
+
   @override
   String get name => declaration.name;
 
@@ -1130,6 +1142,9 @@ class ParameterMember extends VariableMember
   @override
   LibraryElement2? get library2 => _element2.library2;
 
+  @override
+  String? get lookupName => _element2.lookupName;
+
   @override
   String get name => declaration.name;
 
@@ -1397,6 +1412,9 @@ class SetterMember extends PropertyAccessorMember implements SetterElement {
   @override
   SetterFragment get firstFragment => _element2.firstFragment;
 
+  @override
+  String? get lookupName => _element2.lookupName;
+
   @override
   PropertyInducingElement2? get variable3 =>
       variable2.asElement2 as PropertyInducingElement2?;

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

@@ -718,9 +718,9 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
           if (flowAnalysis.dataForTesting != null) {
             var nonPromotionReasonText = entry.value.shortName;
             var args = <String>[];
-            if (whyNotPromotedVisitor.propertyReference != null) {
-              var id =
-                  computeMemberId(whyNotPromotedVisitor.propertyReference!);
+            var propertyReference = whyNotPromotedVisitor.propertyReference;
+            if (propertyReference != null) {
+              var id = computeMemberId(propertyReference.asElement2);
               args.add('target: $id');
             }
             var propertyType = whyNotPromotedVisitor.propertyType;

pkg/analyzer/lib/src/util/ast_data_extractor.dart

@@ -5,25 +5,29 @@
 import 'package:_fe_analyzer_shared/src/testing/id.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 
-MemberId computeMemberId(Element element) {
-  var enclosingElement = element.enclosingElement3;
-  if (enclosingElement is CompilationUnitElement) {
-    var memberName = element.name!;
-    if (element is PropertyAccessorElement && element.isSetter) {
+MemberId computeMemberId(Element2 element) {
+  var enclosingElement = element.enclosingElement2;
+  if (enclosingElement is LibraryElement2) {
+    var memberName = element.name3!;
+    if (element is SetterElement) {
       memberName += '=';
     }
     return MemberId.internal(memberName);
-  } else if (enclosingElement is InterfaceElement) {
-    var memberName = element.name!;
-    var className = enclosingElement.name;
+  } else if (enclosingElement is InterfaceElement2) {
+    var memberName = element.lookupName!;
+    var className = enclosingElement.name3;
     return MemberId.internal(memberName, className: className);
-  } else if (enclosingElement is ExtensionElement) {
-    var memberName = element.name!;
-    var extensionName = enclosingElement.name;
-    if (element is PropertyAccessorElement) {
-      memberName = '${element.isGetter ? 'get' : 'set'}#$memberName';
+  } else if (enclosingElement is ExtensionElement2) {
+    var memberName = element.name3!;
+    var extensionName = enclosingElement.name3;
+    if (element is PropertyAccessorElement2) {
+      if (element is GetterElement) {
+        memberName = 'get#$memberName';
+      } else {
+        memberName = 'set#$memberName';
+      }
     }
     return MemberId.internal('$extensionName|$memberName');
   }
@@ -45,7 +49,7 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<void>
   NodeId computeDefaultNodeId(AstNode node) =>
       NodeId(_nodeOffset(node), IdKind.node);
 
-  T? computeElementValue(Id id, Element element) => null;
+  T? computeElementValue(Id id, Element2 element) => null;
 
   void computeForClass(Declaration node, Id? id) {
     if (id == null) return;
@@ -65,7 +69,7 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<void>
     registerValue(uri, _nodeOffset(node), id, value, node);
   }
 
-  void computeForLibrary(LibraryElement library, Id? id) {
+  void computeForLibrary(LibraryElement2 library, Id? id) {
     if (id == null) return;
     T? value = computeElementValue(id, library);
     registerValue(uri, 0, id, value, library);
@@ -101,12 +105,12 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<void>
   T? computeNodeValue(Id id, AstNode node);
 
   Id createClassId(Declaration node) {
-    var element = node.declaredElement!;
-    return ClassId(element.name!);
+    var element = node.declaredFragment!.element;
+    return ClassId(element.name3!);
   }
 
-  Id createLibraryId(LibraryElement node) {
-    Uri uri = node.source.uri;
+  Id createLibraryId(LibraryElement2 node) {
+    Uri uri = node.uri;
     if (uri.path.startsWith(r'/C:')) {
       // The `MemoryResourceProvider.convertPath` inserts '/C:' on Windows.
       uri = Uri(scheme: uri.scheme, path: uri.path.substring(3));
@@ -115,7 +119,7 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<void>
   }
 
   Id createMemberId(Declaration node) {
-    var element = node.declaredElement!;
+    var element = node.declaredFragment!.element;
     return computeMemberId(element);
   }
 
@@ -151,7 +155,7 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<void>
 
   @override
   void visitCompilationUnit(CompilationUnit node) {
-    var library = node.declaredElement!.library;
+    var library = node.declaredFragment!.element;
     computeForLibrary(library, createLibraryId(library));
     super.visitCompilationUnit(node);
   }

pkg/analyzer/test/id_tests/inheritance_test.dart

@@ -7,7 +7,7 @@ import 'dart:io';
 import 'package:_fe_analyzer_shared/src/testing/id.dart';
 import 'package:_fe_analyzer_shared/src/testing/id_testing.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/src/dart/analysis/testing_data.dart';
@@ -31,7 +31,7 @@ main(List<String> args) async {
 
 String supertypeToString(InterfaceType type) {
   var sb = StringBuffer();
-  sb.write(type.element.name);
+  sb.write(type.element3.name3);
   if (type.typeArguments.isNotEmpty) {
     sb.write('<');
     var comma = '';
@@ -63,7 +63,7 @@ class _InheritanceDataComputer extends DataComputer<String> {
   @override
   void computeUnitData(TestingData testingData, CompilationUnit unit,
       Map<Id, ActualData<String>> actualMap) {
-    _InheritanceDataExtractor(unit.declaredElement!.source.uri, actualMap)
+    _InheritanceDataExtractor(unit.declaredFragment!.source.uri, actualMap)
         .run(unit);
   }
 }
@@ -74,48 +74,48 @@ class _InheritanceDataExtractor extends AstDataExtractor<String> {
   _InheritanceDataExtractor(super.uri, super.actualMap);
 
   @override
-  String? computeElementValue(Id id, Element element) {
+  String? computeElementValue(Id id, Element2 element) {
     return null;
   }
 
   @override
   void computeForClass(Declaration node, Id? id) {
     super.computeForClass(node, id);
     if (node is ClassDeclaration) {
-      var element = node.declaredElement!;
+      var element = node.declaredFragment!.element;
 
       void registerMember(
           MemberId id, int offset, Object object, DartType type) {
         registerValue(uri, offset, id, type.getDisplayString(), object);
       }
 
-      var interface = inheritance.getInterface(element);
-      for (var name in interface.map.keys) {
-        var executable = interface.map[name]!;
+      var interface = inheritance.getInterface2(element);
+      for (var name in interface.map2.keys) {
+        var executable = interface.map2[name]!;
 
-        var enclosingClass = executable.enclosingElement3 as InterfaceElement;
-        if (enclosingClass is ClassElement && enclosingClass.isDartCoreObject) {
+        var enclosingClass = executable.enclosingElement2 as InterfaceElement2;
+        if (enclosingClass is ClassElement2 &&
+            enclosingClass.isDartCoreObject) {
           continue;
         }
 
         var id = MemberId.internal(
           name.name,
-          className: element.name,
+          className: element.name3,
         );
 
         var offset = enclosingClass == element
-            ? executable.nameOffset
-            : element.nameOffset;
+            ? executable.firstFragment.nameOffset2
+            : element.firstFragment.nameOffset2;
+        offset ??= -1;
 
         DartType type;
-        if (executable is MethodElement) {
+        if (executable is MethodElement2) {
           type = executable.type;
-        } else if (executable is PropertyAccessorElement) {
-          if (executable.isGetter) {
-            type = executable.returnType;
-          } else {
-            type = executable.parameters.first.type;
-          }
+        } else if (executable is GetterElement) {
+          type = executable.returnType;
+        } else if (executable is SetterElement) {
+          type = executable.formalParameters.first.type;
         } else {
           throw UnimplementedError('(${executable.runtimeType}) $executable');
         }
@@ -128,7 +128,7 @@ class _InheritanceDataExtractor extends AstDataExtractor<String> {
   @override
   String? computeNodeValue(Id id, AstNode node) {
     if (node is ClassDeclaration) {
-      var cls = node.declaredElement!;
+      var cls = node.declaredFragment!.element;
       var supertypes = <String>[];
       supertypes.add(supertypeToString(cls.thisType));
       for (var supertype in cls.allSupertypes) {

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

@@ -449,6 +449,23 @@ class _Element2Writer extends _AbstractElementWriter {
   void _writeElementName(Element2 e) {
     var name = e.name3 ?? '<null-name>';
     _sink.write(name);
+
+    switch (e) {
+      case MethodElement2():
+        if (e.name3 == '-' && e.formalParameters.isEmpty) {
+          expect(e.lookupName, 'unary-');
+        } else {
+          expect(e.lookupName, e.name3);
+        }
+      case SetterElement():
+        if (e.name3 case var name?) {
+          expect(e.lookupName, '$name=');
+        } else {
+          expect(e.lookupName, isNull);
+        }
+      default:
+        expect(e.lookupName, e.name3);
+    }
   }
 
   void _writeElementReference(String name, Element2? e) {