Elements. Migrate NullSafeApiVerifier.

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

Author: scheglov

pkg/analyzer/analyzer_use_new_elements.txt

@@ -114,7 +114,6 @@ lib/src/error/imports_verifier.dart
 lib/src/error/inheritance_override.dart
 lib/src/error/literal_element_verifier.dart
 lib/src/error/must_call_super_verifier.dart
-lib/src/error/null_safe_api_verifier.dart
 lib/src/error/nullable_dereference_verifier.dart
 lib/src/error/override_verifier.dart
 lib/src/error/redeclare_verifier.dart

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

@@ -292,6 +292,9 @@ abstract class ConstructorElement2 implements ExecutableElement2 {
   /// resolved.
   ConstructorElement2? get redirectedConstructor2;
 
+  @override
+  InterfaceType get returnType;
+
   /// The constructor of the superclass that this constructor invokes, or
   /// `null` if this constructor redirects to another constructor, or if the
   /// library containing this constructor has not yet been resolved.
@@ -1814,7 +1817,6 @@ abstract class Metadata {
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class MethodElement2 implements ExecutableElement2 {
-
   /// The name of the method that can be implemented by a class to allow its
   /// instances to be invoked as if they were a function.
   static final String CALL_METHOD_NAME = "call";

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

@@ -1129,7 +1129,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
     var seenConstructors = <ConstructorElement?>{};
     while (constructor is ConstructorElementImpl && constructor.isSynthetic) {
       var enclosing = constructor.enclosingElement3;
-      if (enclosing is ClassElement && enclosing.isMixinApplication) {
+      if (enclosing is ClassElementImpl && enclosing.isMixinApplication) {
         var superInvocation = constructor.constantInitializers
             .whereType<SuperConstructorInvocation>()
             .singleOrNull;

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

@@ -1422,7 +1422,7 @@ class ConstructorElementImpl extends ExecutableElementImpl
   }
 
   @override
-  InterfaceElement get enclosingElement3 =>
+  InterfaceElementImpl get enclosingElement3 =>
       super.enclosingElement3 as InterfaceElementImpl;
 
   @override
@@ -1433,7 +1433,7 @@ class ConstructorElementImpl extends ExecutableElementImpl
   bool get hasLiteral {
     if (super.hasLiteral) return true;
     var enclosingElement = enclosingElement3;
-    if (enclosingElement is! ExtensionTypeElement) return false;
+    if (enclosingElement is! ExtensionTypeElementImpl) return false;
     return this == enclosingElement.primaryConstructor &&
         enclosingElement.hasLiteral;
   }
@@ -1584,8 +1584,8 @@ class ConstructorElementImpl2 extends ExecutableElementImpl2
   ConstructorElement2 get baseElement => this;
 
   @override
-  InterfaceElement2 get enclosingElement2 =>
-      (firstFragment._enclosingElement3 as InterfaceFragment).element;
+  InterfaceElementImpl2 get enclosingElement2 =>
+      firstFragment.enclosingElement3.element;
 
   @override
   bool get isConst => firstFragment.isConst;
@@ -1608,6 +1608,11 @@ class ConstructorElementImpl2 extends ExecutableElementImpl2
               as ConstructorElementImpl?)
           ?.element;
 
+  @override
+  InterfaceType get returnType {
+    return firstFragment.returnType;
+  }
+
   @override
   ConstructorElement2? get superConstructor2 =>
       (firstFragment.superConstructor?.declaration as ConstructorElementImpl?)
@@ -3396,7 +3401,7 @@ class ElementLocationImpl implements ElementLocation {
         }
         ancestor = ancestor.enclosingElement2;
       } else {
-       components.insert(0, ancestor.identifier);
+        components.insert(0, ancestor.identifier);
         if (ancestor is LocalFunctionElementImpl) {
           ancestor = (ancestor.wrappedElement._enclosingElement3
                   as ExecutableElementImpl)
@@ -5745,6 +5750,9 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
   @override
   String get displayName => name;
 
+  @override
+  InterfaceElementImpl2 get element;
+
   @override
   List<InterfaceType> get interfaces {
     linkedData?.read(this);

pkg/analyzer/lib/src/dart/micro/utils.dart

@@ -44,7 +44,7 @@ ConstructorElement? _getActualConstructorElement(
   var seenConstructors = <ConstructorElement?>{};
   while (constructor is ConstructorElementImpl && constructor.isSynthetic) {
     var enclosing = constructor.enclosingElement3;
-    if (enclosing is ClassElement && enclosing.isMixinApplication) {
+    if (enclosing is ClassElementImpl && enclosing.isMixinApplication) {
       var superInvocation = constructor.constantInitializers
           .whereType<SuperConstructorInvocation>()
           .singleOrNull;

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

@@ -25,11 +25,11 @@ class NullSafeApiVerifier {
   /// Reports an error if the expression creates a `Future<T>.value` with a non-
   /// nullable value `T` and an argument that is effectively `null`.
   void instanceCreation(InstanceCreationExpression expression) {
-    var constructor = expression.constructorName.staticElement;
+    var constructor = expression.constructorName.element;
     if (constructor == null) return;
 
     var type = constructor.returnType;
-    var isFutureValue = type.isDartAsyncFuture && constructor.name == 'value';
+    var isFutureValue = type.isDartAsyncFuture && constructor.name3 == 'value';
 
     if (isFutureValue) {
       _checkTypes(expression, 'Future.value', type.typeArguments.single,
@@ -43,10 +43,10 @@ class NullSafeApiVerifier {
     var targetType = node.realTarget?.staticType;
     if (targetType is! InterfaceType) return;
 
-    var targetClass = targetType.element;
+    var targetClass = targetType.element3;
 
-    if (targetClass.library.isDartAsync == true &&
-        targetClass.name == 'Completer' &&
+    if (targetClass.library2.isDartAsync == true &&
+        targetClass.name3 == 'Completer' &&
         node.methodName.name == 'complete') {
       _checkTypes(node, 'Completer.complete', targetType.typeArguments.single,
           node.argumentList);