Elements. Migrate ClassHierarchy.

Change-Id: I10560227b6124849f905e4cd4669280d76751595
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/407181
Reviewed-by: Samuel Rawlins <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

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

@@ -2,9 +2,6 @@
 // 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/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/element.dart';
@@ -14,36 +11,33 @@ import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/utilities/extensions/collection.dart';
 
 class ClassHierarchy {
-  final Map<InterfaceElementImpl, _Hierarchy> _map = {};
+  final Map<InterfaceElementImpl2, _Hierarchy> _map = {};
 
-  List<ClassHierarchyError> errors(InterfaceElementImpl element) {
+  List<ClassHierarchyError> errors(InterfaceElementImpl2 element) {
     return _getHierarchy(element).errors;
   }
 
-  List<InterfaceType> implementedInterfaces(InterfaceElementImpl element) {
+  List<InterfaceType> implementedInterfaces(InterfaceElementImpl2 element) {
     return _getHierarchy(element).interfaces;
   }
 
-  void remove(InterfaceElementImpl element) {
-    assert(element.augmentationTarget == null);
+  void remove(InterfaceElementImpl2 element) {
     element.resetCachedAllSupertypes();
     _map.remove(element);
   }
 
   /// Remove hierarchies for classes defined in specified libraries.
   void removeOfLibraries(Set<Uri> uriSet) {
     _map.removeWhere((element, _) {
-      if (uriSet.contains(element.librarySource.uri)) {
+      if (uriSet.contains(element.library2.uri)) {
         element.resetCachedAllSupertypes();
         return true;
       }
       return false;
     });
   }
 
-  _Hierarchy _getHierarchy(InterfaceElementImpl element) {
-    var augmented = element.augmented;
-
+  _Hierarchy _getHierarchy(InterfaceElementImpl2 element) {
     var hierarchy = _map[element];
     if (hierarchy != null) {
       return hierarchy;
@@ -55,8 +49,7 @@ class ClassHierarchy {
     );
     _map[element] = hierarchy;
 
-    var library = element.library;
-    var typeSystem = library.typeSystem;
+    var typeSystem = element.library2.typeSystem;
     var interfacesMerger = InterfacesMerger(typeSystem);
 
     void append(InterfaceTypeImpl? type) {
@@ -67,7 +60,7 @@ class ClassHierarchy {
       interfacesMerger.add(type);
 
       var substitution = Substitution.fromInterfaceType(type);
-      var element = type.element;
+      var element = type.element3;
       var rawInterfaces = implementedInterfaces(element);
       for (var rawInterface in rawInterfaces) {
         var newInterface =
@@ -77,15 +70,15 @@ class ClassHierarchy {
     }
 
     append(element.supertype);
-    if (augmented is MixinElementImpl2) {
-      for (var type in augmented.superclassConstraints) {
+    if (element is MixinElementImpl2) {
+      for (var type in element.superclassConstraints) {
         append(type);
       }
     }
-    for (var type in augmented.interfaces) {
+    for (var type in element.interfaces) {
       append(type);
     }
-    for (var type in augmented.mixins) {
+    for (var type in element.mixins) {
       append(type);
     }
 
@@ -127,7 +120,7 @@ class IncompatibleInterfacesClassHierarchyError extends ClassHierarchyError {
 
 class InterfacesMerger {
   final TypeSystemImpl _typeSystem;
-  final Map<InterfaceElement, _ClassInterfaceType> _map = {};
+  final Map<InterfaceElementImpl2, _ClassInterfaceType> _map = {};
 
   InterfacesMerger(this._typeSystem);
 
@@ -136,12 +129,12 @@ class InterfacesMerger {
   }
 
   void add(InterfaceTypeImpl type) {
-    var element = type.element;
+    var element = type.element3;
     var classResult = _map[element];
     if (classResult == null) {
       classResult = _ClassInterfaceType(
         _typeSystem,
-        element is ClassElementImpl && element.isDartCoreObject,
+        element is ClassElementImpl2 && element.isDartCoreObject,
       );
       _map[element] = classResult;
     }

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

@@ -3022,7 +3022,7 @@ abstract class ElementImpl implements Element, Element2 {
   LibraryElementImpl? get library => thisOrAncestorOfType();
 
   @override
-  LibraryElement2? get library2 => thisOrAncestorOfType2();
+  LibraryElementImpl? get library2 => thisOrAncestorOfType2();
 
   @override
   Source? get librarySource => library?.source;
@@ -5802,7 +5802,7 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   ElementKind get kind => firstFragment.kind;
 
   @override
-  LibraryElement2 get library2 => firstFragment.library2!;
+  LibraryElementImpl get library2 => firstFragment.library2!;
 
   @override
   List<ElementAnnotation> get metadata => firstFragment.metadata;
@@ -6147,7 +6147,7 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
   @override
   List<InterfaceType> get allSupertypes {
     return _allSupertypes ??=
-        library.session.classHierarchy.implementedInterfaces(this);
+        library.session.classHierarchy.implementedInterfaces(element);
   }
 
   @override
@@ -6605,8 +6605,7 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
   }
 
   InheritanceManager3 get inheritanceManager {
-    var library = library2 as LibraryElementImpl;
-    return library.session.inheritanceManager;
+    return library2.session.inheritanceManager;
   }
 
   @override
@@ -6785,6 +6784,10 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
         )
         .ifTypeOrNull();
   }
+
+  void resetCachedAllSupertypes() {
+    firstFragment._allSupertypes = null;
+  }
 }
 
 class JoinPatternVariableElementImpl extends PatternVariableElementImpl
@@ -6951,12 +6954,12 @@ class LabelElementImpl extends ElementImpl
   ElementKind get kind => ElementKind.LABEL;
 
   @override
-  LibraryElement2 get library2 {
+  LibraryElementImpl get library2 {
     return libraryFragment.element;
   }
 
   @override
-  LibraryFragment get libraryFragment => enclosingUnit as LibraryFragment;
+  CompilationUnitElementImpl get libraryFragment => enclosingUnit;
 
   @override
   String get name => super.name!;
@@ -7295,7 +7298,7 @@ class LibraryElementImpl extends ElementImpl
   LibraryElementImpl get library => this;
 
   @override
-  LibraryElement2 get library2 => this;
+  LibraryElementImpl get library2 => this;
 
   LibraryDeclarations get libraryDeclarations {
     return _libraryDeclarations ??= LibraryDeclarations(this);
@@ -7832,12 +7835,12 @@ class LocalVariableElementImpl extends NonParameterVariableElementImpl
   ElementKind get kind => ElementKind.LOCAL_VARIABLE;
 
   @override
-  LibraryElement2 get library2 {
+  LibraryElementImpl get library2 {
     return libraryFragment.element;
   }
 
   @override
-  LibraryFragment get libraryFragment => enclosingUnit as LibraryFragment;
+  CompilationUnitElementImpl get libraryFragment => enclosingUnit;
 
   @override
   // TODO(scheglov): make it a nullable field
@@ -9767,7 +9770,7 @@ class PrefixElementImpl extends _ExistingElementImpl implements PrefixElement {
   ElementKind get kind => ElementKind.PREFIX;
 
   @override
-  LibraryElement2 get library2 => library as LibraryElement2;
+  LibraryElementImpl get library2 => library;
 
   @override
   String get name {

pkg/analyzer/lib/src/error/correct_override.dart

@@ -18,6 +18,7 @@ import 'package:analyzer/src/dart/element/type_algebra.dart';
 import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/diagnostic/diagnostic_factory.dart';
 import 'package:analyzer/src/error/codes.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 class CorrectOverrideHelper {
   final TypeSystemImpl _typeSystem;
@@ -147,7 +148,8 @@ class CovariantParametersVerifier {
   List<_SuperMember> _superMembers() {
     var classHierarchy = _session.classHierarchy;
     var classElement = _thisMember.enclosingElement3 as InterfaceElementImpl;
-    var interfaces = classHierarchy.implementedInterfaces(classElement);
+    var interfaces =
+        classHierarchy.implementedInterfaces(classElement.asElement2);
 
     var superMembers = <_SuperMember>[];
     for (var interface in interfaces) {

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

@@ -2683,7 +2683,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     }
 
     var analysisSession = _currentLibrary.session;
-    var errors = analysisSession.classHierarchy.errors(element);
+    var errors = analysisSession.classHierarchy.errors(element.asElement2);
 
     for (var error in errors) {
       if (error is IncompatibleInterfacesClassHierarchyError) {

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

@@ -707,7 +707,7 @@ class _MixinsInference {
   void _resetHierarchies() {
     for (var declaration in _declarations.values) {
       var element = declaration.element;
-      element.library.session.classHierarchy.remove(element);
+      element.library.session.classHierarchy.remove(element.asElement2);
     }
   }
 }

pkg/analyzer/test/generated/elements_types_mixin.dart

@@ -120,6 +120,7 @@ mixin ElementsTypesMixin {
   TypeImpl get unknownInferredType => UnknownInferredType.instance;
 
   VoidTypeImpl get voidNone => VoidTypeImpl.instance;
+
   ClassElementImpl class_({
     required String name,
     bool isAbstract = false,

pkg/analyzer/test/src/dart/element/class_hierarchy_test.dart

@@ -7,6 +7,7 @@ import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/class_hierarchy.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/type.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -96,10 +97,10 @@ mixin _AbstractClassHierarchyMixin on ElementsTypesMixin {
 
     var classHierarchy = ClassHierarchy();
 
-    var actualInterfaces = classHierarchy.implementedInterfaces(X);
+    var actualInterfaces = classHierarchy.implementedInterfaces(X.asElement2);
     _assertInterfaces(actualInterfaces, interfaces);
 
-    var actualErrors = classHierarchy.errors(X);
+    var actualErrors = classHierarchy.errors(X.asElement2);
     _assertErrors(actualErrors, errors);
   }