Elements. Require MethodElementImpl for MethodMember.

Change-Id: I5daca9f7fe0464279bd67414532bb070406ba5e7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/416822
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

Author: scheglov

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

@@ -1248,12 +1248,8 @@ class InheritanceManager3 {
     }
 
     element.methods2.map((e) => e.asElement).forEach(addMember);
-    element.getters2
-        .map((e) => e.asElement as PropertyAccessorElementImpl)
-        .forEach(addMember);
-    element.setters2
-        .map((e) => e.asElement as PropertyAccessorElementImpl)
-        .forEach(addMember);
+    element.getters2.map((e) => e.asElement).forEach(addMember);
+    element.setters2.map((e) => e.asElement).forEach(addMember);
 
     return declared;
   }

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

@@ -1027,7 +1027,7 @@ abstract class Member implements Element, ElementOrMember {
 class MethodMember extends ExecutableMember
     implements MethodElementOrMember, MethodElement2OrMember {
   factory MethodMember({
-    required MethodElement declaration,
+    required MethodElementImpl declaration,
     required MapSubstitution substitution,
   }) {
     var freshTypeParameters = _SubstitutedTypeParameters(
@@ -1042,13 +1042,13 @@ class MethodMember extends ExecutableMember
   }
 
   MethodMember._({
-    required MethodElement super.declaration,
+    required MethodElementImpl super.declaration,
     required super.substitution,
     required super.typeParameters,
   });
 
   @override
-  MethodElement2 get baseElement => _element2;
+  MethodElementImpl2 get baseElement => _element2;
 
   @override
   MethodElementImpl get declaration => _declaration as MethodElementImpl;
@@ -1085,7 +1085,7 @@ class MethodMember extends ExecutableMember
   Source get source => _declaration.source!;
 
   @override
-  MethodElement2 get _element2 => declaration.asElement2;
+  MethodElementImpl2 get _element2 => declaration.asElement2;
 
   @Deprecated('Use Element2 and accept2() instead')
   @override

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

@@ -146,11 +146,11 @@ class ExtensionMemberResolver {
   ///
   /// The [node] is fully resolved, and its type arguments are set.
   ExtensionResolutionResult getOverrideMember(
-      ExtensionOverride node, String name) {
+      ExtensionOverrideImpl node, String name) {
     var element = node.element2;
 
-    ExecutableElement2? getter;
-    ExecutableElement2? setter;
+    ExecutableElementImpl2? getter;
+    ExecutableElementImpl2? setter;
     if (name == '[]') {
       getter = element.getMethod2('[]');
       setter = element.getMethod2('[]=');

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

@@ -160,7 +160,7 @@ class FunctionExpressionInvocationResolver {
 
   void _resolveReceiverExtensionOverride(
       FunctionExpressionInvocationImpl node,
-      ExtensionOverride function,
+      ExtensionOverrideImpl function,
       List<WhyNotPromotedGetter> whyNotPromotedArguments,
       {required TypeImpl contextType}) {
     var result = _extensionResolver.getOverrideMember(

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

@@ -350,7 +350,7 @@ class FunctionReferenceResolver {
   void _resolveExtensionOverride(
     FunctionReferenceImpl node,
     PropertyAccessImpl function,
-    ExtensionOverride override,
+    ExtensionOverrideImpl override,
   ) {
     var propertyName = function.propertyName;
     var result =

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

@@ -406,7 +406,7 @@ class MethodInvocationResolver with ScopeHelpers {
   /// process, then returns that new node. Otherwise, returns `null`.
   FunctionExpressionInvocationImpl? _resolveExtensionOverride(
       MethodInvocationImpl node,
-      ExtensionOverride override,
+      ExtensionOverrideImpl override,
       SimpleIdentifierImpl nameNode,
       String name,
       List<WhyNotPromotedGetter> whyNotPromotedArguments,

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

@@ -605,7 +605,7 @@ class PropertyElementResolver with ScopeHelpers {
   }
 
   PropertyElementResolverResult _resolveTargetExtensionOverride({
-    required ExtensionOverride target,
+    required ExtensionOverrideImpl target,
     required SimpleIdentifier propertyName,
     required bool hasRead,
     required bool hasWrite,

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

@@ -374,6 +374,12 @@ extension ExecutableElementExtension on ExecutableElement {
   }
 }
 
+extension ExecutableElementImpl2Extension on ExecutableElementImpl2 {
+  ExecutableElementImpl get asElement {
+    return lastFragment;
+  }
+}
+
 extension ExecutableElementImplExtension on ExecutableElementImpl {
   ExecutableElementImpl2 get asElement2 {
     return element;
@@ -486,6 +492,12 @@ extension FormalParameterElementMixinExtension on FormalParameterElementMixin {
   }
 }
 
+extension GetterElementImplExtension on GetterElementImpl {
+  PropertyAccessorElementImpl get asElement {
+    return lastFragment;
+  }
+}
+
 extension InstanceElement2Extension on InstanceElement2 {
   InstanceElement get asElement {
     return firstFragment as InstanceElement;
@@ -635,6 +647,12 @@ extension MethodElementExtension on MethodElement {
   }
 }
 
+extension MethodElementImpl2Extension on MethodElementImpl2 {
+  MethodElementImpl get asElement {
+    return lastFragment;
+  }
+}
+
 extension MethodElementImplExtension on MethodElementImpl {
   MethodElementImpl2 get asElement2 {
     return element;
@@ -772,12 +790,24 @@ extension PropertyInducingElementExtension on PropertyInducingElement2 {
   }
 }
 
+extension SetterElementImplExtension on SetterElementImpl {
+  PropertyAccessorElementImpl get asElement {
+    return lastFragment;
+  }
+}
+
 extension TopLevelFunctionElementExtension on TopLevelFunctionElement {
   FunctionElement get asElement {
     return (this as TopLevelFunctionElementImpl).lastFragment;
   }
 }
 
+extension TopLevelFunctionElementImplExtension on TopLevelFunctionElementImpl {
+  FunctionElementImpl get asElement {
+    return lastFragment;
+  }
+}
+
 extension TopLevelVariableElement2Extension on TopLevelVariableElement2 {
   TopLevelVariableElement get asElement {
     return baseElement.firstFragment as TopLevelVariableElement;