Elements. Fix a TypeImpl cast in BinaryExpressionResolver.

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

Author: scheglov

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

@@ -886,7 +886,7 @@ final class AssignmentExpressionImpl extends ExpressionImpl
   ExpressionImpl _rightHandSide;
 
   @override
-  MethodElement? staticElement;
+  MethodElementOrMember? staticElement;
 
   /// Initializes a newly created assignment expression.
   AssignmentExpressionImpl({
@@ -904,9 +904,9 @@ final class AssignmentExpressionImpl extends ExpressionImpl
 
   @experimental
   @override
-  MethodElement2? get element => staticElement?.asElement2;
+  MethodElement2OrMember? get element => staticElement?.asElement2;
 
-  set element(MethodElement2? element) {
+  set element(MethodElement2OrMember? element) {
     staticElement = element?.asElement;
   }
 
@@ -1837,7 +1837,7 @@ final class BinaryExpressionImpl extends ExpressionImpl
   MethodElement? staticElement;
 
   @override
-  FunctionType? staticInvokeType;
+  FunctionTypeImpl? staticInvokeType;
 
   /// Initializes a newly created binary expression.
   BinaryExpressionImpl({

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

@@ -5985,7 +5985,7 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   }
 
   @override
-  MethodElement2? getMethod2(String name) {
+  MethodElement2OrMember? getMethod2(String name) {
     return methods2.firstWhereOrNull((e) => e.lookupName == name);
   }
 

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

@@ -1526,11 +1526,11 @@ class TypeSystemImpl implements TypeSystem {
   /// Determine the type of a binary expression with the given [operator] whose
   /// left operand has the type [leftType] and whose right operand has the type
   /// [rightType], given that resolution has so far produced the [currentType].
-  DartType refineBinaryExpressionType(
+  TypeImpl refineBinaryExpressionType(
       DartType leftType,
       TokenType operator,
       DartType rightType,
-      DartType currentType,
+      TypeImpl currentType,
       MethodElement2? operatorElement) {
     if (operatorElement == null) return currentType;
     return _refineNumericInvocationTypeNullSafe(
@@ -1562,11 +1562,11 @@ class TypeSystemImpl implements TypeSystem {
   /// produced so far by resolution is [currentType].
   ///
   // TODO(scheglov): I expected that [methodElement] is [MethodElement].
-  DartType refineNumericInvocationType(
+  TypeImpl refineNumericInvocationType(
       DartType targetType,
       Element2? methodElement,
       List<DartType> argumentTypes,
-      DartType currentType) {
+      TypeImpl currentType) {
     if (methodElement is MethodElement2) {
       return _refineNumericInvocationTypeNullSafe(
           targetType, methodElement, argumentTypes, currentType);
@@ -1960,11 +1960,11 @@ class TypeSystemImpl implements TypeSystem {
     return currentType;
   }
 
-  DartType _refineNumericInvocationTypeNullSafe(
+  TypeImpl _refineNumericInvocationTypeNullSafe(
       DartType targetType,
       MethodElement2 methodElement,
       List<DartType> argumentTypes,
-      DartType currentType) {
+      TypeImpl currentType) {
     // If the method being invoked comes from an extension, don't refine the
     // type because we can only make guarantees about methods defined in the
     // SDK, and the numeric methods we refine are all instance methods.

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

@@ -252,7 +252,7 @@ class AssignmentExpressionResolver {
       propertyErrorEntity: operator,
       nameErrorEntity: operator,
     );
-    node.element = result.getter2 as MethodElement2?;
+    node.element = result.getter2 as MethodElement2OrMember?;
     if (result.needsGetterError) {
       _errorReporter.atToken(
         operator,

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

@@ -291,12 +291,7 @@ class BinaryExpressionResolver {
       // using the operator method's parameter type.
       var rightParam = invokeType.formalParameters[0];
       rightContextType = _typeSystem.refineNumericInvocationContext2(
-          left.staticType,
-          node.element,
-          contextType,
-          // TODO(paulberry): eliminate this cast by changing the type of
-          // `FunctionTypeImpl.parameters` to `List<ParameterElementMixin>`.
-          rightParam.type as TypeImpl);
+          left.staticType, node.element, contextType, rightParam.type);
     } else {
       rightContextType = UnknownInferredType.instance;
     }
@@ -370,7 +365,7 @@ class BinaryExpressionResolver {
     left.setPseudoExpressionStaticType(InvalidTypeImpl.instance);
 
     switch (augmentationTarget) {
-      case MethodFragment fragment:
+      case MethodElementImpl fragment:
         left.fragment = fragment;
         left.setPseudoExpressionStaticType(
             _resolver.thisType ?? InvalidTypeImpl.instance);

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

@@ -315,7 +315,7 @@ abstract class FullInvocationInferrer<Node extends AstNodeImpl>
     ];
   }
 
-  DartType _refineReturnType(DartType returnType) => returnType;
+  TypeImpl _refineReturnType(TypeImpl returnType) => returnType;
 
   void _reportWrongNumberOfTypeArguments(TypeArgumentList typeArgumentList,
       FunctionType rawType, List<TypeParameterElement2> typeParameters) {
@@ -639,7 +639,7 @@ class MethodInvocationInferrer
   }
 
   @override
-  DartType _refineReturnType(DartType returnType) {
+  TypeImpl _refineReturnType(TypeImpl returnType) {
     var targetType = node.realTarget?.staticType;
     if (targetType != null) {
       returnType = resolver.typeSystem.refineNumericInvocationType(

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

@@ -273,7 +273,7 @@ class AstBinaryReader {
       operator: Tokens.fromType(operatorType),
       rightHandSide: rightHandSide,
     );
-    node.staticElement = _reader.readElement() as MethodElement?;
+    node.staticElement = _reader.readElement() as MethodElementOrMember?;
     node.readElement = _reader.readElement();
     node.readType = _reader.readType();
     node.writeElement = _reader.readElement();

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

@@ -2146,7 +2146,7 @@ class ResolutionReader {
     );
   }
 
-  FunctionType? readOptionalFunctionType() {
+  FunctionTypeImpl? readOptionalFunctionType() {
     var type = readType();
     return type is FunctionTypeImpl ? type : null;
   }

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

@@ -555,6 +555,15 @@ extension MethodElement2Extension on MethodElement2 {
   }
 }
 
+extension MethodElement2OrMemberExtension on MethodElement2OrMember {
+  MethodElementOrMember get asElement {
+    if (this case MethodMember member) {
+      return member;
+    }
+    return (this as MethodElementImpl2).lastFragment;
+  }
+}
+
 extension MethodElementExtension on MethodElement {
   MethodElement2 get asElement2 {
     return switch (this) {