Elements. Migrate, remove v1 getters from SimpleResolutionResult.

scheglov · Commit Queue · commit f72732c351d7 · 2025-01-27T11:17:34.000-08:00
Change-Id: I4eb55afe0a04bd2ff16daa8d29d88d2847fb9c08 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/406100 Reviewed-by: Phil Quitslund <pquitslund@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/dart/element/extensions.dart b/pkg/analyzer/lib/src/dart/element/extensions.dart
@@ -170,6 +170,19 @@ extension ElementExtension on Element {
   }
 }
 
+extension ExecutableElement2OrMemberQuestionExtension
+    on ExecutableElement2OrMember? {
+  TypeImpl? get firstParameterType {
+    var self = this;
+    if (self is MethodElement2OrMember) {
+      // TODO(paulberry): eliminate this cast by changing this extension to
+      // apply to `ExecutableElementOrMember?`.
+      return self.formalParameters.firstOrNull?.type as TypeImpl?;
+    }
+    return null;
+  }
+}
+
 extension ExecutableElementExtension on ExecutableElement {
   /// Whether the enclosing element is the class `Object`.
   bool get isObjectMember {
@@ -178,7 +191,8 @@ extension ExecutableElementExtension on ExecutableElement {
   }
 }
 
-extension ExecutableElementExtensionQuestion on ExecutableElement? {
+extension ExecutableElementOrMemberQuestionExtension
+    on ExecutableElementOrMember? {
   TypeImpl? get firstParameterType {
     var self = this;
     if (self is MethodElementOrMember) {
diff --git a/pkg/analyzer/lib/src/dart/resolver/assignment_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/assignment_expression_resolver.dart
@@ -21,6 +21,7 @@ import 'package:analyzer/src/dart/element/type_system.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 [AssignmentExpression]s.
 class AssignmentExpressionResolver {
@@ -254,7 +255,7 @@ class AssignmentExpressionResolver {
       propertyErrorEntity: operator,
       nameErrorEntity: operator,
     );
-    node.staticElement = result.getter as MethodElement?;
+    node.staticElement = result.getter2?.asElement as MethodElement?;
     if (result.needsGetterError) {
       _errorReporter.atToken(
         operator,
diff --git a/pkg/analyzer/lib/src/dart/resolver/binary_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/binary_expression_resolver.dart
@@ -24,6 +24,7 @@ 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/generated/super_context.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// Helper for resolving [BinaryExpression]s.
 class BinaryExpressionResolver {
@@ -454,8 +455,8 @@ class BinaryExpressionResolver {
       nameErrorEntity: node,
     );
 
-    node.staticElement = result.getter as MethodElement?;
-    node.staticInvokeType = result.getter?.type;
+    node.staticElement = result.getter2?.asElement as MethodElement?;
+    node.staticInvokeType = result.getter2?.type;
     if (result.needsGetterError) {
       if (leftOperand is SuperExpression) {
         _errorReporter.atToken(
diff --git a/pkg/analyzer/lib/src/dart/resolver/comment_reference_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/comment_reference_resolver.dart
@@ -14,6 +14,7 @@ import 'package:analyzer/src/dart/element/type_provider.dart';
 import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/dart/resolver/type_property_resolver.dart';
 import 'package:analyzer/src/generated/resolver.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 class CommentReferenceResolver {
   final TypeProviderImpl _typeProvider;
@@ -181,7 +182,7 @@ class CommentReferenceResolver {
         propertyErrorEntity: identifier,
         nameErrorEntity: identifier,
       );
-      element = result.getter ?? result.setter;
+      element = result.getter2?.asElement ?? result.setter2?.asElement;
     }
     return element;
   }
diff --git a/pkg/analyzer/lib/src/dart/resolver/extension_member_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/extension_member_resolver.dart
@@ -479,15 +479,9 @@ enum ExtensionResolutionError implements ExtensionResolutionResult {
   /// Resolution failed because multiple elements were found.
   ambiguous;
 
-  @override
-  ExecutableElementOrMember? get getter => null;
-
   @override
   ExecutableElement2OrMember? get getter2 => null;
 
-  @override
-  ExecutableElement? get setter => null;
-
   @override
   ExecutableElement2? get setter2 => null;
 }
diff --git a/pkg/analyzer/lib/src/dart/resolver/function_expression_invocation_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/function_expression_invocation_resolver.dart
@@ -17,6 +17,7 @@ import 'package:analyzer/src/dart/resolver/type_property_resolver.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/error/nullable_dereference_verifier.dart';
 import 'package:analyzer/src/generated/resolver.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// Helper for resolving [FunctionExpressionInvocation]s.
 class FunctionExpressionInvocationResolver {
@@ -83,7 +84,7 @@ class FunctionExpressionInvocationResolver {
       propertyErrorEntity: function,
       nameErrorEntity: function,
     );
-    var callElement = result.getter;
+    var callElement = result.getter2?.asElement;
 
     if (callElement == null) {
       if (result.needsGetterError) {
@@ -169,7 +170,7 @@ class FunctionExpressionInvocationResolver {
       function,
       FunctionElement.CALL_METHOD_NAME,
     );
-    var callElement = result.getter;
+    var callElement = result.getter2?.asElement;
     node.staticElement = callElement;
 
     if (callElement == null) {
diff --git a/pkg/analyzer/lib/src/dart/resolver/function_reference_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/function_reference_resolver.dart
@@ -17,6 +17,7 @@ import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/dart/resolver/extension_member_resolver.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/generated/resolver.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// A resolver for [FunctionReference] nodes.
 ///
@@ -166,13 +167,17 @@ class FunctionReferenceResolver {
       // applies.
       return _extensionResolver
           .findExtension(type, node, callMethodName)
-          .getter;
+          .getter2
+          ?.asElement;
     }
     // Otherwise, a 'call' method on the interface, or on an applicable
     // extension method applies.
     return type.lookUpMethod2(
             FunctionElement.CALL_METHOD_NAME, type.element.library) ??
-        _extensionResolver.findExtension(type, node, callMethodName).getter;
+        _extensionResolver
+            .findExtension(type, node, callMethodName)
+            .getter2
+            ?.asElement;
   }
 
   void _reportInvalidAccessToStaticMember(
@@ -357,7 +362,7 @@ class FunctionReferenceResolver {
     var propertyName = function.propertyName;
     var result =
         _extensionResolver.getOverrideMember(override, propertyName.name);
-    var member = result.getter;
+    var member = result.getter2?.asElement;
 
     if (member == null) {
       node.recordStaticType(InvalidTypeImpl.instance, resolver: _resolver);
@@ -406,7 +411,8 @@ class FunctionReferenceResolver {
           propertyErrorEntity: methodName,
           nameErrorEntity: methodName,
         )
-        .getter;
+        .getter2
+        ?.asElement;
     if (methodElement != null && methodElement.isStatic) {
       _reportInvalidAccessToStaticMember(methodName, methodElement,
           implicitReceiver: false);
@@ -586,7 +592,8 @@ class FunctionReferenceResolver {
           propertyErrorEntity: function.propertyName,
           nameErrorEntity: function,
         )
-        .getter;
+        .getter2
+        ?.asElement;
 
     if (propertyElement is TypeParameterElement) {
       _resolve(node: node, rawType: propertyElement!.type);
@@ -699,7 +706,7 @@ class FunctionReferenceResolver {
         nameErrorEntity: function,
       );
 
-      var method = result.getter;
+      var method = result.getter2?.asElement;
       if (method != null) {
         if (method.isStatic) {
           _reportInvalidAccessToStaticMember(function, method,
@@ -916,7 +923,8 @@ class FunctionReferenceResolver {
           propertyErrorEntity: name,
           nameErrorEntity: nameErrorEntity,
         )
-        .getter;
+        .getter2
+        ?.asElement;
     name.staticElement = element;
     if (element != null && element.isStatic) {
       _reportInvalidAccessToStaticMember(name, element,
diff --git a/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart
@@ -24,6 +24,7 @@ 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/generated/variable_type_provider.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 class MethodInvocationResolver with ScopeHelpers {
   /// The resolver driving this participant.
@@ -414,7 +415,7 @@ class MethodInvocationResolver with ScopeHelpers {
       List<WhyNotPromotedGetter> whyNotPromotedArguments,
       {required TypeImpl contextType}) {
     var result = _extensionResolver.getOverrideMember(override, name);
-    var member = result.getter;
+    var member = result.getter2?.asElement;
 
     if (member == null) {
       _setInvalidTypeResolution(node,
@@ -853,7 +854,7 @@ class MethodInvocationResolver with ScopeHelpers {
       return _rewriteAsFunctionExpressionInvocation(node, recordField.type);
     }
 
-    var target = result.getter;
+    var target = result.getter2?.asElement;
     if (target != null) {
       nameNode.staticElement = target;
 
diff --git a/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart
@@ -21,6 +21,7 @@ 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 {
@@ -144,7 +145,7 @@ class PostfixExpressionResolver {
       propertyErrorEntity: node.operator,
       nameErrorEntity: operand,
     );
-    node.staticElement = result.getter as MethodElement?;
+    node.staticElement = result.getter2?.asElement as MethodElement?;
     if (result.needsGetterError) {
       if (operand is SuperExpression) {
         _errorReporter.atToken(
diff --git a/pkg/analyzer/lib/src/dart/resolver/prefix_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/prefix_expression_resolver.dart
@@ -21,6 +21,7 @@ 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 [PrefixExpression]s.
 class PrefixExpressionResolver {
@@ -192,7 +193,7 @@ class PrefixExpressionResolver {
         propertyErrorEntity: node.operator,
         nameErrorEntity: operand,
       );
-      node.staticElement = result.getter as MethodElement?;
+      node.staticElement = result.getter2?.asElement as MethodElement?;
       if (result.needsGetterError) {
         if (operand is SuperExpression) {
           _errorReporter.atToken(
diff --git a/pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart
@@ -55,7 +55,7 @@ class PropertyElementResolver with ScopeHelpers {
 
       // TODO(scheglov): Change ExtensionResolver to set `needsGetterError`.
       if (hasRead &&
-          result.getter == null &&
+          result.getter2 == null &&
           result != ExtensionResolutionError.ambiguous) {
         // Extension overrides can only refer to named extensions, so it is safe
         // to assume that `target.staticElement!.name` is non-`null`.
@@ -67,7 +67,7 @@ class PropertyElementResolver with ScopeHelpers {
       }
 
       if (hasWrite &&
-          result.setter == null &&
+          result.setter2 == null &&
           result != ExtensionResolutionError.ambiguous) {
         // Extension overrides can only refer to named extensions, so it is safe
         // to assume that `target.staticElement!.name` is non-`null`.
@@ -498,7 +498,7 @@ class PropertyElementResolver with ScopeHelpers {
 
     TypeImpl? getType;
     if (hasRead) {
-      var unpromotedType = switch (result.getter) {
+      var unpromotedType = switch (result.getter2?.asElement) {
         MethodElementOrMember(:var type) => type,
         PropertyAccessorElementOrMember(:var returnType) => returnType,
         _ => result.recordField?.type ?? _typeSystem.typeProvider.dynamicType
@@ -511,12 +511,12 @@ class PropertyElementResolver with ScopeHelpers {
                           as PropertyTarget<ExpressionImpl>
                       : ExpressionPropertyTarget(target),
                   propertyName.name,
-                  result.getter,
+                  result.getter2?.asElement,
                   SharedTypeView(unpromotedType))
               ?.unwrapTypeView() ??
           unpromotedType;
 
-      _checkForStaticMember(target, propertyName, result.getter);
+      _checkForStaticMember(target, propertyName, result.getter2?.asElement);
       if (result.needsGetterError) {
         errorReporter.atNode(
           propertyName,
@@ -527,7 +527,7 @@ class PropertyElementResolver with ScopeHelpers {
     }
 
     if (hasWrite) {
-      _checkForStaticMember(target, propertyName, result.setter);
+      _checkForStaticMember(target, propertyName, result.setter2?.asElement);
       if (result.needsSetterError) {
         AssignmentVerifier(errorReporter).verify(
           node: propertyName,
@@ -539,10 +539,10 @@ class PropertyElementResolver with ScopeHelpers {
     }
 
     return PropertyElementResolverResult(
-      readElementRequested: result.getter,
-      readElementRecovery: result.setter,
-      writeElementRequested: result.setter,
-      writeElementRecovery: result.getter,
+      readElementRequested: result.getter2?.asElement,
+      readElementRecovery: result.setter2?.asElement,
+      writeElementRequested: result.setter2?.asElement,
+      writeElementRecovery: result.getter2?.asElement,
       atDynamicTarget: _typeSystem.isDynamicBounded(targetType),
       recordField: result.recordField,
       getType: getType,
@@ -632,7 +632,7 @@ class PropertyElementResolver with ScopeHelpers {
     ExecutableElement? readElement;
     DartType? getType;
     if (hasRead) {
-      readElement = result.getter;
+      readElement = result.getter2?.asElement;
       if (readElement == null) {
         // This method is only called for extension overrides, and extension
         // overrides can only refer to named extensions.  So it is safe to
@@ -650,7 +650,7 @@ class PropertyElementResolver with ScopeHelpers {
 
     ExecutableElement? writeElement;
     if (hasWrite) {
-      writeElement = result.setter;
+      writeElement = result.setter2?.asElement;
       if (writeElement == null) {
         // This method is only called for extension overrides, and extension
         // overrides can only refer to named extensions.  So it is safe to
@@ -904,8 +904,8 @@ class PropertyElementResolver with ScopeHelpers {
     required bool hasRead,
     required bool hasWrite,
   }) {
-    var readElement = result.getter;
-    var writeElement = result.setter;
+    var readElement = result.getter2?.asElement;
+    var writeElement = result.setter2?.asElement;
 
     var contextType = hasRead
         ? readElement.firstParameterType
diff --git a/pkg/analyzer/lib/src/dart/resolver/resolution_result.dart b/pkg/analyzer/lib/src/dart/resolver/resolution_result.dart
@@ -4,12 +4,10 @@
 
 // ignore_for_file: analyzer_use_new_elements
 
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/type.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// The result of attempting to resolve an identifier to elements.
 class ResolutionResult extends SimpleResolutionResult {
@@ -63,8 +61,4 @@ class SimpleResolutionResult {
   final ExecutableElement2? setter2;
 
   const SimpleResolutionResult({this.getter2, this.setter2});
-
-  ExecutableElementOrMember? get getter => getter2?.asElement;
-
-  ExecutableElement? get setter => setter2?.asElement;
 }
diff --git a/pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart
@@ -244,14 +244,14 @@ class TypePropertyResolver {
     _reportedGetterError = result == ExtensionResolutionError.ambiguous;
     _reportedSetterError = result == ExtensionResolutionError.ambiguous;
 
-    if (result.getter != null) {
+    if (result.getter2 != null) {
       _needsGetterError = false;
-      _getterRequested = result.getter;
+      _getterRequested = result.getter2?.asElement;
     }
 
-    if (result.setter != null) {
+    if (result.setter2 != null) {
       _needsSetterError = false;
-      _setterRequested = result.setter;
+      _setterRequested = result.setter2?.asElement;
     }
   }
 
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
