Elements. Migrate PostfixExpressionResolver.

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

Author: scheglov

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

@@ -14170,6 +14170,10 @@ final class PostfixExpressionImpl extends ExpressionImpl
   @override
   MethodElement2? get element => staticElement?.asElement2;
 
+  set element(MethodElement2? value) {
+    staticElement = value?.asElement;
+  }
+
   @override
   Token get endToken => operator;
 

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

@@ -4260,7 +4260,7 @@ class FieldElementImpl extends PropertyInducingElementImpl
   bool inheritsCovariant = false;
 
   /// The element corresponding to this fragment.
-  FieldElement2? _element;
+  FieldElementImpl2? _element;
 
   /// Initialize a newly created synthetic field element to have the given
   /// [name] at the given [offset].
@@ -4275,7 +4275,7 @@ class FieldElementImpl extends PropertyInducingElementImpl
   FieldElement get declaration => this;
 
   @override
-  FieldElement2 get element {
+  FieldElementImpl2 get element {
     if (_element != null) {
       return _element!;
     }
@@ -4290,7 +4290,7 @@ class FieldElementImpl extends PropertyInducingElementImpl
     return FieldElementImpl2(firstFragment as FieldElementImpl);
   }
 
-  set element(FieldElement2 element) => _element = element;
+  set element(FieldElementImpl2 element) => _element = element;
 
   @override
   bool get isAbstract {
@@ -5502,6 +5502,11 @@ class GenericFunctionTypeElementImpl2 extends FunctionTypedElementImpl2
   }
 }
 
+/// Common base class for all analyzer-internal classes that implement
+/// [GetterElement].
+abstract class GetterElement2OrMember
+    implements PropertyAccessorElement2OrMember, GetterElement {}
+
 class GetterElementImpl extends PropertyAccessorElementImpl2
     with
         FragmentedExecutableElementMixin<GetterFragment>,
@@ -5510,7 +5515,7 @@ class GetterElementImpl extends PropertyAccessorElementImpl2
         FragmentedAnnotatableElementMixin<GetterFragment>,
         FragmentedElementMixin<GetterFragment>,
         _HasSinceSdkVersionMixin
-    implements GetterElement {
+    implements GetterElement2OrMember {
   @override
   final PropertyAccessorElementImpl firstFragment;
 
@@ -9942,7 +9947,10 @@ abstract class PromotableElementImpl2 extends VariableElementImpl2
 /// Common base class for all analyzer-internal classes that implement
 /// `PropertyAccessorElement2`.
 abstract class PropertyAccessorElement2OrMember
-    implements PropertyAccessorElement2, ExecutableElement2OrMember {}
+    implements PropertyAccessorElement2, ExecutableElement2OrMember {
+  @override
+  PropertyInducingElement2OrMember? get variable3;
+}
 
 /// A concrete implementation of a [PropertyAccessorElement].
 class PropertyAccessorElementImpl extends ExecutableElementImpl
@@ -10165,7 +10173,9 @@ abstract class PropertyAccessorElementImpl2 extends ExecutableElementImpl2
   String? get name3 => firstFragment.name2;
 
   @override
-  PropertyInducingElement2? get variable3 => firstFragment.variable2?.element;
+  PropertyInducingElementImpl2? get variable3 {
+    return firstFragment.variable2?.element;
+  }
 }
 
 /// Implicit getter for a [PropertyInducingElementImpl].
@@ -10310,6 +10320,11 @@ abstract class PropertyAccessorElementOrMember
   PropertyInducingElementOrMember? get variable2;
 }
 
+/// Common base class for all analyzer-internal classes that implement
+/// [PropertyInducingElement2].
+abstract class PropertyInducingElement2OrMember
+    implements VariableElement2OrMember, PropertyInducingElement2 {}
+
 /// A concrete implementation of a [PropertyInducingElement].
 abstract class PropertyInducingElementImpl
     extends NonParameterVariableElementImpl
@@ -10351,6 +10366,9 @@ abstract class PropertyInducingElementImpl
   @override
   List<Fragment> get children3 => const [];
 
+  @override
+  PropertyInducingElementImpl2 get element;
+
   @override
   Fragment? get enclosingFragment => enclosingElement3 as Fragment;
 
@@ -10491,7 +10509,7 @@ abstract class PropertyInducingElementImpl
 }
 
 abstract class PropertyInducingElementImpl2 extends VariableElementImpl2
-    implements PropertyInducingElement2 {
+    implements PropertyInducingElement2OrMember {
   @override
   bool get hasInitializer {
     return _fragments.any((f) => f.hasInitializer);
@@ -10529,6 +10547,11 @@ abstract class PropertyInducingElementTypeInference {
   TypeImpl perform();
 }
 
+/// Common base class for all analyzer-internal classes that implement
+/// [SetterElement].
+abstract class SetterElement2OrMember
+    implements PropertyAccessorElement2OrMember, SetterElement {}
+
 class SetterElementImpl extends PropertyAccessorElementImpl2
     with
         FragmentedExecutableElementMixin<SetterFragment>,
@@ -10537,7 +10560,7 @@ class SetterElementImpl extends PropertyAccessorElementImpl2
         FragmentedAnnotatableElementMixin<SetterFragment>,
         FragmentedElementMixin<SetterFragment>,
         _HasSinceSdkVersionMixin
-    implements SetterElement {
+    implements SetterElement2OrMember {
   @override
   final PropertyAccessorElementImpl firstFragment;
 

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

@@ -510,7 +510,8 @@ class FieldMember extends VariableMember
         FieldElementOrMember,
         FieldElement2,
         VariableElement2OrMember,
-        PropertyInducingElementOrMember {
+        PropertyInducingElementOrMember,
+        PropertyInducingElement2OrMember {
   /// Initialize a newly created element to represent a field, based on the
   /// [declaration], with applied [substitution].
   FieldMember(
@@ -726,7 +727,8 @@ class FieldMember extends VariableMember
 
 /// A getter element defined in a parameterized type where the values of the
 /// type parameters are known.
-class GetterMember extends PropertyAccessorMember implements GetterElement {
+class GetterMember extends PropertyAccessorMember
+    implements GetterElement2OrMember {
   GetterMember._(
     super.declaration,
     super.augmentationSubstitution,
@@ -763,8 +765,8 @@ class GetterMember extends PropertyAccessorMember implements GetterElement {
   String? get lookupName => _element2.lookupName;
 
   @override
-  PropertyInducingElement2? get variable3 =>
-      variable2.asElement2 as PropertyInducingElement2?;
+  PropertyInducingElement2OrMember? get variable3 =>
+      variable2.asElement2 as PropertyInducingElement2OrMember?;
 
   @override
   GetterElement get _element2 => declaration.asElement2 as GetterElement;
@@ -1484,7 +1486,8 @@ abstract class PropertyAccessorMember extends ExecutableMember
 
 /// A setter element defined in a parameterized type where the values of the
 /// type parameters are known.
-class SetterMember extends PropertyAccessorMember implements SetterElement {
+class SetterMember extends PropertyAccessorMember
+    implements SetterElement2OrMember {
   SetterMember._(
     super.declaration,
     super.augmentationSubstitution,
@@ -1521,8 +1524,8 @@ class SetterMember extends PropertyAccessorMember implements SetterElement {
   String? get lookupName => _element2.lookupName;
 
   @override
-  PropertyInducingElement2? get variable3 =>
-      variable2.asElement2 as PropertyInducingElement2?;
+  PropertyInducingElement2OrMember? get variable3 =>
+      variable2.asElement2 as PropertyInducingElement2OrMember?;
 
   @override
   SetterElement get _element2 => declaration.asElement2 as SetterElement;

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

@@ -63,7 +63,7 @@ class AssignmentExpressionResolver {
     if (hasRead) {
       _resolver.setReadElement(
         left,
-        readElement,
+        readElement.asElement2,
         atDynamicTarget: leftResolution.atDynamicTarget,
       );
       {
@@ -76,7 +76,7 @@ class AssignmentExpressionResolver {
     }
     _resolver.setWriteElement(
       left,
-      writeElement,
+      writeElement.asElement2,
       atDynamicTarget: leftResolution.atDynamicTarget,
     );
 

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

@@ -2,12 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// ignore_for_file: analyzer_use_new_elements
-
 import 'package:_fe_analyzer_shared/src/types/shared_type.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/ast/token.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/listener.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
@@ -21,7 +19,6 @@ import 'package:analyzer/src/dart/resolver/invocation_inferrer.dart';
 import 'package:analyzer/src/dart/resolver/type_property_resolver.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/generated/resolver.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// Helper for resolving [PostfixExpression]s.
 class PostfixExpressionResolver {
@@ -52,8 +49,8 @@ class PostfixExpressionResolver {
       hasRead: true,
     );
 
-    var readElement = operandResolution.readElement;
-    var writeElement = operandResolution.writeElement;
+    var readElement = operandResolution.readElement2;
+    var writeElement = operandResolution.writeElement2;
 
     var operand = node.operand;
     _resolver.setReadElement(
@@ -98,8 +95,8 @@ class PostfixExpressionResolver {
   /// @return the static return type that was computed
   ///
   // TODO(scheglov): this is duplicate
-  TypeImpl _computeStaticReturnType(Element? element) {
-    if (element is PropertyAccessorElement) {
+  TypeImpl _computeStaticReturnType(Element2? element) {
+    if (element is PropertyAccessorElement2) {
       //
       // This is a function invocation expression disguised as something else.
       // We are invoking a getter and then invoking the returned function.
@@ -108,7 +105,7 @@ class PostfixExpressionResolver {
       return InvocationInferrer.computeInvokeReturnType(
         propertyType.returnType,
       );
-    } else if (element is ExecutableElement) {
+    } else if (element is ExecutableElement2) {
       return InvocationInferrer.computeInvokeReturnType(element.type);
     }
     return DynamicTypeImpl.instance;
@@ -145,7 +142,7 @@ class PostfixExpressionResolver {
       propertyErrorEntity: node.operator,
       nameErrorEntity: operand,
     );
-    node.staticElement = result.getter2?.asElement as MethodElement?;
+    node.element = result.getter2 as MethodElement2?;
     if (result.needsGetterError) {
       if (operand is SuperExpression) {
         _errorReporter.atToken(
@@ -174,7 +171,7 @@ class PostfixExpressionResolver {
         // No need to check for `intVar++`, the result is `int`.
         operatorReturnType = receiverType;
       } else {
-        var operatorElement = node.staticElement;
+        var operatorElement = node.element;
         operatorReturnType = _computeStaticReturnType(operatorElement);
         _checkForInvalidAssignmentIncDec(node, operand, operatorReturnType);
       }

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

@@ -68,12 +68,12 @@ class PrefixExpressionResolver {
 
       _resolver.setReadElement(
         operand,
-        readElement,
+        readElement.asElement2,
         atDynamicTarget: operandResolution.atDynamicTarget,
       );
       _resolver.setWriteElement(
         operand,
-        writeElement,
+        writeElement.asElement2,
         atDynamicTarget: operandResolution.atDynamicTarget,
       );