Elements. Migrate ErrorHandlerVerifier.

Change-Id: I830443b807c04dffe6ffd1c14c099bd48f7072af
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/395048
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>

Author: scheglov

pkg/analyzer/analyzer_use_new_elements.txt

@@ -108,7 +108,6 @@ lib/src/error/correct_override.dart
 lib/src/error/dead_code_verifier.dart
 lib/src/error/deprecated_member_use_verifier.dart
 lib/src/error/duplicate_definition_verifier.dart
-lib/src/error/error_handler_verifier.dart
 lib/src/error/getter_setter_types_verifier.dart
 lib/src/error/imports_verifier.dart
 lib/src/error/inheritance_override.dart

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

@@ -188,7 +188,7 @@ class ErrorHandlerVerifier {
       );
     }
 
-    var parameters = expressionType.parameters;
+    var parameters = expressionType.formalParameters;
     if (parameters.isEmpty) {
       return report();
     }
@@ -226,8 +226,8 @@ class ErrorHandlerVerifier {
       var callbackType = callback.staticType as FunctionType;
       _checkErrorHandlerFunctionType(
           callback, callbackType, expectedReturnType);
-      var catchErrorOnErrorExecutable = EnclosingExecutableContext(
-          callback.declaredElement,
+      var catchErrorOnErrorExecutable = EnclosingExecutableContext.tmp(
+          callback.declaredElement2,
           isAsynchronous: true,
           catchErrorOnErrorReturnType: expectedReturnType);
       var returnStatementVerifier =
@@ -263,8 +263,8 @@ class ErrorHandlerVerifier {
   /// the 'dart:async' library.
   bool _isDartCoreAsyncType(DartType type, String typeName) =>
       type is InterfaceType &&
-      type.element.name == typeName &&
-      type.element.library.isDartAsync;
+      type.element3.name3 == typeName &&
+      type.element3.library2.isDartAsync;
 }
 
 /// Visits a function body, looking for return statements.

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

@@ -105,6 +105,15 @@ class EnclosingExecutableContext {
 
   EnclosingExecutableContext.empty() : this(null);
 
+  factory EnclosingExecutableContext.tmp(ExecutableElement2? element,
+      {bool? isAsynchronous, InterfaceType? catchErrorOnErrorReturnType}) {
+    return EnclosingExecutableContext(
+      element.asElement,
+      isAsynchronous: isAsynchronous,
+      catchErrorOnErrorReturnType: catchErrorOnErrorReturnType,
+    );
+  }
+
   String? get displayName {
     return element?.displayName;
   }
@@ -835,7 +844,8 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
           .addConstructors(errorReporter, declaredElement, members);
       _checkForNonCovariantTypeParameterPositionInRepresentationType(
           node, declaredFragment);
-      _checkForExtensionTypeRepresentationDependsOnItself(node, declaredFragment);
+      _checkForExtensionTypeRepresentationDependsOnItself(
+          node, declaredFragment);
       _checkForExtensionTypeRepresentationTypeBottom(node, declaredFragment);
       _checkForExtensionTypeImplementsDeferred(node);
       _checkForExtensionTypeImplementsItself(node, declaredFragment);

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

@@ -201,6 +201,12 @@ extension ExecutableElement2Extension on ExecutableElement2 {
   }
 }
 
+extension ExecutableElement2OrNullExtension on ExecutableElement2? {
+  ExecutableElement? get asElement {
+    return this?.asElement;
+  }
+}
+
 extension ExecutableElementExtension on ExecutableElement {
   ExecutableElement2 get asElement2 {
     return switch (this) {