Elements. Migrate ErrorDetectionHelpers.

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

Author: scheglov

pkg/analysis_server/lib/src/cider/local_library_contributor.dart

@@ -167,7 +167,7 @@ class LibraryElementSuggestionBuilder extends GeneralizingElementVisitor<void> {
           if (element.isGetter) {
             if (variable is FieldElement) {
               builder.suggestField(
-                variable.asElement2 as FieldElement2,
+                variable.asElement2,
                 inheritanceDistance: 0.0,
               );
             }
@@ -281,7 +281,7 @@ class LibraryElementSuggestionBuilder extends GeneralizingElementVisitor<void> {
               }
             } else {
               builder.suggestStaticField(
-                field.asElement2 as FieldElement2,
+                field.asElement2,
                 prefix: prefix,
               );
             }

pkg/analysis_server/lib/src/services/completion/dart/candidate_suggestion.dart

@@ -1218,13 +1218,13 @@ extension SuggestionBuilderExtension on SuggestionBuilder {
       case EnumConstantSuggestion():
         if (suggestion.includeEnumName) {
           suggestEnumConstant(
-            suggestion.element.asElement2 as FieldElement2,
+            suggestion.element.asElement2,
             suggestion.completion,
             relevance: relevance,
           );
         } else {
           suggestField(
-            suggestion.element.asElement2 as FieldElement2,
+            suggestion.element.asElement2,
             inheritanceDistance: 0.0,
             relevance: relevance,
           );
@@ -1246,7 +1246,7 @@ extension SuggestionBuilderExtension on SuggestionBuilder {
         var fieldElement = suggestion.element;
         if (fieldElement.isEnumConstant) {
           suggestEnumConstant(
-            fieldElement.asElement2 as FieldElement2,
+            fieldElement.asElement2,
             suggestion.completion,
             relevance: relevance,
           );
@@ -1259,7 +1259,7 @@ extension SuggestionBuilderExtension on SuggestionBuilder {
                   ? fieldElement.declaration.asElement2
                   : fieldElement.asElement2;
           suggestField(
-            field as FieldElement2,
+            field,
             inheritanceDistance: inheritanceDistance,
             relevance: relevance,
           );
@@ -1320,7 +1320,7 @@ extension SuggestionBuilderExtension on SuggestionBuilder {
           request.featureComputer,
         );
         suggestMethod(
-          suggestion.element.asElement2 as MethodElement2,
+          suggestion.element.asElement2,
           kind: kind,
           inheritanceDistance: inheritanceDistance,
           relevance: relevance,
@@ -1387,7 +1387,7 @@ extension SuggestionBuilderExtension on SuggestionBuilder {
           request.featureComputer,
         );
         suggestSetStateMethod(
-          suggestion.element.asElement2 as MethodElement2,
+          suggestion.element.asElement2,
           kind: suggestion.kind,
           completion: suggestion.completion,
           displayText: suggestion.displayText,
@@ -1397,7 +1397,7 @@ extension SuggestionBuilderExtension on SuggestionBuilder {
         );
       case StaticFieldSuggestion():
         suggestStaticField(
-          suggestion.element.asElement2 as FieldElement2,
+          suggestion.element.asElement2,
           prefix: suggestion.prefix,
           relevance: relevance,
           completion: suggestion.completion,

pkg/analyzer/analyzer_use_new_elements.txt

@@ -112,7 +112,6 @@ lib/src/error/required_parameters_verifier.dart
 lib/src/error/unused_local_elements_verifier.dart
 lib/src/generated/element_resolver.dart
 lib/src/generated/element_walker.dart
-lib/src/generated/error_detection_helpers.dart
 lib/src/generated/error_verifier.dart
 lib/src/generated/exhaustiveness.dart
 lib/src/generated/ffi_verifier.dart

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -1829,7 +1829,7 @@ final class BinaryExpressionImpl extends ExpressionImpl
 
   @experimental
   @override
-  MethodElement2? get element => staticElement?.asElement2 as MethodElement2?;
+  MethodElement2? get element => staticElement?.asElement2;
 
   @override
   Token get endToken => _rightOperand.endToken;
@@ -10137,7 +10137,7 @@ final class IndexExpressionImpl extends ExpressionImpl
 
   @experimental
   @override
-  MethodElement2? get element => staticElement?.asElement2 as MethodElement2?;
+  MethodElement2? get element => staticElement?.asElement2;
 
   @override
   Token get endToken => rightBracket;

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

@@ -3524,7 +3524,7 @@ class EnumElementImpl extends InterfaceElementImpl
 
   @override
   List<FieldElement2> get constants2 =>
-      constants.map((e) => e.asElement2 as FieldElement2).toList();
+      constants.map((e) => e.asElement2).toList();
 
   @override
   EnumElementImpl2 get element {
@@ -3583,7 +3583,7 @@ class EnumElementImpl2 extends InterfaceElementImpl2
 
   @override
   List<FieldElement2> get constants2 =>
-      constants.map((e) => e.asElement2 as FieldElement2).toList();
+      constants.map((e) => e.asElement2).toList();
 
   @override
   T? accept2<T>(ElementVisitor2<T> visitor) {
@@ -4048,8 +4048,7 @@ class ExtensionTypeElementImpl2 extends InterfaceElementImpl2
   ConstructorElement2 get primaryConstructor2 => primaryConstructor.element;
 
   @override
-  FieldElement2 get representation2 =>
-      representation.asElement2 as FieldElement2;
+  FieldElement2 get representation2 => representation.asElement2;
 
   @override
   T? accept2<T>(ElementVisitor2<T> visitor) {

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

@@ -589,7 +589,7 @@ class FieldMember extends VariableMember
   @override
   Source? get source => _declaration.source;
 
-  FieldElement2 get _element2 => declaration.asElement2 as FieldElement2;
+  FieldElement2 get _element2 => declaration.asElement2;
 
   @override
   T? accept<T>(ElementVisitor<T> visitor) => visitor.visitFieldElement(this);
@@ -1000,7 +1000,7 @@ class MethodMember extends ExecutableMember
   Source get source => _declaration.source!;
 
   @override
-  MethodElement2 get _element2 => declaration.asElement2 as MethodElement2;
+  MethodElement2 get _element2 => declaration.asElement2;
 
   @override
   T? accept<T>(ElementVisitor<T> visitor) => visitor.visitMethodElement(this);

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

@@ -5,6 +5,7 @@
 import 'package:_fe_analyzer_shared/src/flow_analysis/flow_analysis.dart';
 import 'package:_fe_analyzer_shared/src/types/shared_type.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/error/listener.dart';
@@ -23,6 +24,7 @@ import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/scope_helpers.dart';
 import 'package:analyzer/src/generated/super_context.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 class PropertyElementResolver with ScopeHelpers {
   final ResolverVisitor _resolver;
@@ -944,7 +946,15 @@ class PropertyElementResolverResult {
     return readElementRequested ?? readElementRecovery;
   }
 
+  Element2? get readElement2 {
+    return readElement.asElement2;
+  }
+
   Element? get writeElement {
     return writeElementRequested ?? writeElementRecovery;
   }
+
+  Element2? get writeElement2 {
+    return writeElement.asElement2;
+  }
 }

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

@@ -6,23 +6,27 @@ import 'package:_fe_analyzer_shared/src/flow_analysis/flow_analysis.dart';
 import 'package:_fe_analyzer_shared/src/types/shared_type.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.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/diagnostic/diagnostic.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
+import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/error/codes.dart';
+import 'package:analyzer/src/utilities/extensions/object.dart';
 
 /// Methods useful in detecting errors.  This mixin exists to allow code to be
 /// more easily shared between the two visitors that do the majority of error
 /// reporting (ResolverVisitor and ErrorVerifier).
 mixin ErrorDetectionHelpers {
   ErrorReporter get errorReporter;
 
+  InheritanceManager3 get inheritance;
+
   bool get strictCasts;
 
   TypeSystemImpl get typeSystem;
@@ -61,7 +65,7 @@ mixin ErrorDetectionHelpers {
           whyNotPromoted}) {
     _checkForArgumentTypeNotAssignableForArgument(
       argument: argument is NamedExpression ? argument.expression : argument,
-      parameter: argument.staticParameterElement,
+      parameter: argument.correspondingParameter,
       promoteParameterToNullable: promoteParameterToNullable,
       whyNotPromoted: whyNotPromoted,
     );
@@ -166,7 +170,7 @@ mixin ErrorDetectionHelpers {
   /// See [CompileTimeErrorCode.CONST_FIELD_INITIALIZER_NOT_ASSIGNABLE], and
   /// [CompileTimeErrorCode.FIELD_INITIALIZER_NOT_ASSIGNABLE].
   void checkForFieldInitializerNotAssignable(
-      ConstructorFieldInitializer initializer, FieldElement fieldElement,
+      ConstructorFieldInitializer initializer, FieldElement2 fieldElement,
       {required bool isConstConstructor,
       required Map<SharedTypeView<DartType>, NonPromotionReason> Function()?
           whyNotPromoted}) {
@@ -256,13 +260,13 @@ mixin ErrorDetectionHelpers {
 
   void checkIndexExpressionIndex(
     Expression index, {
-    required ExecutableElement? readElement,
-    required ExecutableElement? writeElement,
+    required ExecutableElement2? readElement,
+    required ExecutableElement2? writeElement,
     required Map<SharedTypeView<DartType>, NonPromotionReason> Function()?
         whyNotPromoted,
   }) {
-    if (readElement is MethodElement) {
-      var parameters = readElement.parameters;
+    if (readElement is MethodElement2) {
+      var parameters = readElement.formalParameters;
       if (parameters.isNotEmpty) {
         _checkForArgumentTypeNotAssignableForArgument(
           argument: index,
@@ -273,8 +277,8 @@ mixin ErrorDetectionHelpers {
       }
     }
 
-    if (writeElement is MethodElement) {
-      var parameters = writeElement.parameters;
+    if (writeElement is MethodElement2) {
+      var parameters = writeElement.formalParameters;
       if (parameters.isNotEmpty) {
         _checkForArgumentTypeNotAssignableForArgument(
           argument: index,
@@ -309,7 +313,7 @@ mixin ErrorDetectionHelpers {
   /// > Let `e` be an expression whose static type is an interface type that has
   /// > a method named `call`. In the case where the context type for `e`
   /// > is a function type or the type `Function`, `e` is treated as `e.call`.
-  MethodElement? getImplicitCallMethod(
+  MethodElement2? getImplicitCallMethod(
       DartType type, DartType context, SyntacticEntity errorNode) {
     var visitedTypes = {type};
     while (type is TypeParameterType) {
@@ -326,19 +330,26 @@ mixin ErrorDetectionHelpers {
     if (typeSystem.acceptsFunctionType(context) &&
         type is InterfaceType &&
         type.nullabilitySuffix != NullabilitySuffix.question) {
-      return type.lookUpMethod2(
-          FunctionElement.CALL_METHOD_NAME, type.element.library);
+      return inheritance
+          .getMember3(
+            type,
+            Name.forLibrary(
+              type.element3.library2,
+              MethodElement2.CALL_METHOD_NAME,
+            ),
+          )
+          .ifTypeOrNull();
     } else {
       return null;
     }
   }
 
   /// Return the variable element represented by the given [expression], or
   /// `null` if there is no such element.
-  VariableElement? getVariableElement(Expression? expression) {
+  VariableElement2? getVariableElement(Expression? expression) {
     if (expression is Identifier) {
-      var element = expression.staticElement;
-      if (element is VariableElement) {
+      var element = expression.element;
+      if (element is VariableElement2) {
         return element;
       }
     }
@@ -347,7 +358,7 @@ mixin ErrorDetectionHelpers {
 
   void _checkForArgumentTypeNotAssignableForArgument({
     required Expression argument,
-    required ParameterElement? parameter,
+    required FormalParameterElement? parameter,
     required bool promoteParameterToNullable,
     Map<SharedTypeView<DartType>, NonPromotionReason> Function()?
         whyNotPromoted,

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

@@ -312,6 +312,9 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     assert(_enclosingExecutable.element == null);
   }
 
+  @override
+  InheritanceManager3 get inheritance => _inheritanceManager;
+
   @override
   bool get strictCasts => options.strictCasts;
 

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

@@ -22,6 +22,7 @@ import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/scope.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/dart/element/type_provider.dart';
@@ -86,6 +87,7 @@ import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:analyzer/src/generated/variable_type_provider.dart';
 import 'package:analyzer/src/task/inference_error.dart';
 import 'package:analyzer/src/util/ast_data_extractor.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:analyzer/src/utilities/extensions/object.dart';
 
 /// Function determining which source files should have inference logging
@@ -181,6 +183,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   AugmentableElement? enclosingAugmentation;
 
   /// The manager for the inheritance mappings.
+  @override
   final InheritanceManager3 inheritance;
 
   /// The feature set that is enabled for the current unit.
@@ -1452,8 +1455,9 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
       var whyNotPromoted = flowAnalysis.flow?.whyNotPromoted(node.index);
       checkIndexExpressionIndex(
         node.index,
-        readElement: hasRead ? result.readElement as ExecutableElement? : null,
-        writeElement: result.writeElement as ExecutableElement?,
+        readElement:
+            hasRead ? result.readElement2 as ExecutableElement2? : null,
+        writeElement: result.writeElement2 as ExecutableElement2?,
         whyNotPromoted: whyNotPromoted,
       );
 
@@ -2379,7 +2383,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
     var whyNotPromoted = flowAnalysis.flow?.whyNotPromoted(expression);
     if (fieldElement != null) {
       var enclosingConstructor = enclosingFunction as ConstructorElement;
-      checkForFieldInitializerNotAssignable(node, fieldElement,
+      checkForFieldInitializerNotAssignable(node, fieldElement.asElement2,
           isConstConstructor: enclosingConstructor.isConst,
           whyNotPromoted: whyNotPromoted);
     }
@@ -3033,7 +3037,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
     var whyNotPromoted = flowAnalysis.flow?.whyNotPromoted(node.index);
     checkIndexExpressionIndex(
       node.index,
-      readElement: result.readElement as ExecutableElement?,
+      readElement: result.readElement2 as ExecutableElement2?,
       writeElement: null,
       whyNotPromoted: whyNotPromoted,
     );
@@ -4155,7 +4159,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
 
     var callReference = ImplicitCallReferenceImpl(
       expression: expression,
-      staticElement: callMethod,
+      staticElement: callMethod.asElement,
       typeArguments: null,
       typeArgumentTypes: typeArgumentTypes,
     );