Look into the interface for a getter / setter only if necessary.

scheglov · Commit Queue · commit 24261bd5b53a · 2025-05-02T14:14:28.000-07:00
Change-Id: Id586108c8dcd55180b87519565cfc7f9ddf258cf Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/426280 Commit-Queue: Konstantin Shcheglov <scheglov@google.com> Reviewed-by: Paul Berry <paulberry@google.com>
diff --git a/pkg/analyzer/lib/src/dart/resolver/assignment_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/assignment_expression_resolver.dart
@@ -265,6 +265,8 @@ class AssignmentExpressionResolver {
       receiver: left,
       receiverType: leftType,
       name: methodName,
+      hasRead: operatorType != TokenType.EQ,
+      hasWrite: true,
       propertyErrorEntity: operator,
       nameErrorEntity: 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
@@ -431,6 +431,8 @@ class BinaryExpressionResolver {
       receiver: leftOperand,
       receiverType: leftType,
       name: methodName,
+      hasRead: true,
+      hasWrite: false,
       propertyErrorEntity: node.operator,
       nameErrorEntity: node,
     );
diff --git a/pkg/analyzer/lib/src/dart/resolver/comment_reference_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/comment_reference_resolver.dart
@@ -185,6 +185,8 @@ class CommentReferenceResolver {
         receiver: null,
         receiverType: enclosingType,
         name: identifier.name,
+        hasRead: true,
+        hasWrite: true,
         propertyErrorEntity: identifier,
         nameErrorEntity: identifier,
       );
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
@@ -92,6 +92,8 @@ class FunctionExpressionInvocationResolver {
       receiver: function,
       receiverType: receiverType,
       name: MethodElement.CALL_METHOD_NAME,
+      hasRead: true,
+      hasWrite: false,
       propertyErrorEntity: function,
       nameErrorEntity: function,
     );
diff --git a/pkg/analyzer/lib/src/dart/resolver/function_reference_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/function_reference_resolver.dart
@@ -420,6 +420,8 @@ class FunctionReferenceResolver {
               receiver: receiver,
               receiverType: receiverType,
               name: methodName.name,
+              hasRead: true,
+              hasWrite: false,
               propertyErrorEntity: methodName,
               nameErrorEntity: methodName,
             )
@@ -603,6 +605,8 @@ class FunctionReferenceResolver {
               receiver: function.realTarget,
               receiverType: targetType,
               name: function.propertyName.name,
+              hasRead: true,
+              hasWrite: false,
               propertyErrorEntity: function.propertyName,
               nameErrorEntity: function,
             )
@@ -721,6 +725,8 @@ class FunctionReferenceResolver {
         receiver: null,
         receiverType: receiverType,
         name: function.name,
+        hasRead: true,
+        hasWrite: false,
         propertyErrorEntity: function,
         nameErrorEntity: function,
       );
@@ -950,6 +956,8 @@ class FunctionReferenceResolver {
               receiver: receiver,
               receiverType: receiverType,
               name: name.name,
+              hasRead: true,
+              hasWrite: false,
               propertyErrorEntity: name,
               nameErrorEntity: nameErrorEntity,
             )
diff --git a/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart
@@ -1069,6 +1069,8 @@ class MethodInvocationResolver with ScopeHelpers {
       receiver: receiver,
       receiverType: receiverType,
       name: name,
+      hasRead: true,
+      hasWrite: false,
       propertyErrorEntity: nameNode,
       nameErrorEntity: nameNode,
     );
diff --git a/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart
@@ -143,6 +143,8 @@ class PostfixExpressionResolver {
       receiver: operand,
       receiverType: receiverType,
       name: methodName,
+      hasRead: true,
+      hasWrite: false,
       propertyErrorEntity: node.operator,
       nameErrorEntity: operand,
     );
diff --git a/pkg/analyzer/lib/src/dart/resolver/prefix_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/prefix_expression_resolver.dart
@@ -186,6 +186,8 @@ class PrefixExpressionResolver {
         receiver: operand,
         receiverType: readType,
         name: methodName,
+        hasRead: true,
+        hasWrite: false,
         propertyErrorEntity: node.operator,
         nameErrorEntity: operand,
       );
diff --git a/pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart
@@ -167,6 +167,8 @@ class PropertyElementResolver with ScopeHelpers {
       receiver: target,
       receiverType: targetType,
       name: '[]',
+      hasRead: hasRead,
+      hasWrite: hasWrite,
       propertyErrorEntity: node.leftBracket,
       nameErrorEntity: target,
     );
@@ -540,6 +542,8 @@ class PropertyElementResolver with ScopeHelpers {
       receiver: target,
       receiverType: targetType,
       name: propertyName.name,
+      hasRead: hasRead,
+      hasWrite: hasWrite,
       propertyErrorEntity: propertyName,
       nameErrorEntity: propertyName,
     );
@@ -579,10 +583,20 @@ class PropertyElementResolver with ScopeHelpers {
     if (hasWrite) {
       _checkForStaticMember(target, propertyName, result.setter2);
       if (result.needsSetterError) {
+        var readResult = _resolver.typePropertyResolver.resolve(
+          receiver: target,
+          receiverType: targetType,
+          name: propertyName.name,
+          hasRead: true,
+          hasWrite: false,
+          propertyErrorEntity: propertyName,
+          nameErrorEntity: propertyName,
+        );
+
         AssignmentVerifier(errorReporter).verify(
           node: propertyName,
           requested: null,
-          recovery: result.getter2,
+          recovery: readResult.getter2,
           receiverType: targetType,
         );
       }
diff --git a/pkg/analyzer/lib/src/dart/resolver/this_lookup.dart b/pkg/analyzer/lib/src/dart/resolver/this_lookup.dart
@@ -33,6 +33,8 @@ class ThisLookup {
       receiver: null,
       receiverType: thisType,
       name: id,
+      hasRead: true,
+      hasWrite: false,
       propertyErrorEntity: node,
       nameErrorEntity: node,
     );
@@ -74,6 +76,8 @@ class ThisLookup {
       receiver: null,
       receiverType: thisType,
       name: id,
+      hasRead: false,
+      hasWrite: true,
       propertyErrorEntity: node,
       nameErrorEntity: node,
     );
diff --git a/pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart
@@ -31,6 +31,8 @@ class TypePropertyResolver {
   late Expression? _receiver;
   late SyntacticEntity _nameErrorEntity;
   late String _name;
+  late bool _hasRead;
+  late bool _hasWrite;
 
   bool _needsGetterError = false;
   bool _reportedGetterError = false;
@@ -64,12 +66,16 @@ class TypePropertyResolver {
     required ExpressionImpl? receiver,
     required TypeImpl receiverType,
     required String name,
+    required bool hasRead,
+    required bool hasWrite,
     required SyntacticEntity propertyErrorEntity,
     required SyntacticEntity nameErrorEntity,
     AstNode? parentNode,
   }) {
     _receiver = receiver;
     _name = name;
+    _hasRead = hasRead;
+    _hasWrite = hasWrite;
     _nameErrorEntity = nameErrorEntity;
     _resetResult();
 
@@ -264,35 +270,58 @@ class TypePropertyResolver {
   }) {
     var isSuper = _receiver is SuperExpression;
 
-    var getterName = Name(_definingLibrary.source.uri, _name);
-    _getterRequested =
-        _resolver.inheritance
-            .getMember(type, getterName, forSuper: isSuper)
-            ?.asElement2;
-    _needsGetterError = _getterRequested == null;
-
-    if (_getterRequested == null && recoverWithStatic) {
-      var classElement = type.element3;
-      _getterRecovery ??=
-          classElement.lookupStaticGetter(_name, _definingLibrary) ??
-          classElement.lookupStaticMethod(_name, _definingLibrary);
-      _needsGetterError = _getterRecovery == null;
+    if (_hasRead) {
+      var getterName = Name(_definingLibrary.source.uri, _name);
+      _getterRequested =
+          _resolver.inheritance
+              .getMember(type, getterName, forSuper: isSuper)
+              ?.asElement2;
+      _needsGetterError = _getterRequested == null;
+
+      if (_getterRequested == null && recoverWithStatic) {
+        var classElement = type.element3;
+        _getterRecovery ??=
+            classElement.lookupStaticGetter(_name, _definingLibrary) ??
+            classElement.lookupStaticMethod(_name, _definingLibrary);
+        _needsGetterError = _getterRecovery == null;
+      }
     }
 
-    var setterName = Name(_definingLibrary.source.uri, '$_name=');
-    _setterRequested =
-        _resolver.inheritance
-            .getMember(type, setterName, forSuper: isSuper)
-            ?.asElement2;
-    _needsSetterError = _setterRequested == null;
-
-    if (_setterRequested == null && recoverWithStatic) {
-      var classElement = type.element3;
-      _setterRecovery ??= classElement.lookupStaticSetter(
-        _name,
-        _definingLibrary,
-      );
-      _needsSetterError = _setterRecovery == null;
+    if (_hasWrite) {
+      var setterName = Name(_definingLibrary.source.uri, '$_name=');
+      _setterRequested =
+          _resolver.inheritance
+              .getMember(type, setterName, forSuper: isSuper)
+              ?.asElement2;
+      _needsSetterError = _setterRequested == null;
+
+      if (_setterRequested == null && recoverWithStatic) {
+        var classElement = type.element3;
+        _setterRecovery ??= classElement.lookupStaticSetter(
+          _name,
+          _definingLibrary,
+        );
+        _needsSetterError = _setterRecovery == null;
+      }
+    }
+
+    // If we wanted a getter, but it is not in the interface, then check
+    // if there is the setter, i.e. the basename at all. If there is, we
+    // should not check extensions.
+    if (_hasRead && _getterRequested == null) {
+      var setterName = Name(_definingLibrary.source.uri, '$_name=');
+      _setterRequested =
+          _resolver.inheritance
+              .getMember(type, setterName, forSuper: isSuper)
+              ?.asElement2;
+    }
+
+    if (_hasWrite && _setterRequested == null) {
+      var getterName = Name(_definingLibrary.source.uri, _name);
+      _getterRequested =
+          _resolver.inheritance
+              .getMember(type, getterName, forSuper: isSuper)
+              ?.asElement2;
     }
   }
 
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -1612,6 +1612,8 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
       receiver: null,
       receiverType: receiverType.unwrapTypeView(),
       name: nameToken.lexeme,
+      hasRead: true,
+      hasWrite: false,
       propertyErrorEntity: objectPattern.type,
       nameErrorEntity: nameToken,
     );
@@ -1665,6 +1667,8 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
       receiver: null,
       receiverType: matchedType.unwrapTypeView(),
       name: methodName,
+      hasRead: true,
+      hasWrite: false,
       propertyErrorEntity: node.operator,
       nameErrorEntity: node,
       parentNode: node,
diff --git a/pkg/analyzer/test/src/dart/analysis/driver_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_test.dart
