Report errors on the compound assignment operator, not the left expression.

scheglov · commit-bot@chromium.org · commit a08054586cf7 · 2020-09-14T18:19:09.000Z
Change-Id: Icc53a35082cdbbb05db3f009eb9d6b743ef9e7a7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/162782 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Reviewed-by: Samuel Rawlins <srawlins@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@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
@@ -192,16 +192,15 @@ class AssignmentExpressionResolver {
       return;
     }
 
-    operatorType = operatorFromCompoundAssignment(operatorType);
-    var methodName = operatorType.lexeme;
-    // TODO(brianwilkerson) Change the [methodNameNode] from the left hand
-    //  side to the operator.
+    var binaryOperatorType = operatorFromCompoundAssignment(operatorType);
+    var methodName = binaryOperatorType.lexeme;
+
     var result = _typePropertyResolver.resolve(
       receiver: leftHandSide,
       receiverType: leftType,
       name: methodName,
       receiverErrorNode: leftHandSide,
-      nameErrorNode: leftHandSide,
+      nameErrorEntity: operator,
     );
     node.staticElement = result.getter;
     if (_shouldReportInvalidMember(leftType, result)) {
diff --git a/pkg/analyzer/lib/src/dart/resolver/binary_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/binary_expression_resolver.dart
@@ -339,7 +339,7 @@ class BinaryExpressionResolver {
       receiverType: leftType,
       name: methodName,
       receiverErrorNode: leftOperand,
-      nameErrorNode: node,
+      nameErrorEntity: node,
     );
 
     node.staticElement = result.getter;
diff --git a/pkg/analyzer/lib/src/dart/resolver/extension_member_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/extension_member_resolver.dart
@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/scope.dart';
 import 'package:analyzer/dart/element/type.dart';
@@ -40,12 +41,12 @@ class ExtensionMemberResolver {
   ///
   /// If no applicable extensions, return [ResolutionResult.none].
   ///
-  /// If the match is ambiguous, report an error and return
-  /// [ResolutionResult.ambiguous].
+  /// If the match is ambiguous, report an error on the [nameEntity], and
+  /// return [ResolutionResult.ambiguous].
   ResolutionResult findExtension(
     DartType type,
+    SyntacticEntity nameEntity,
     String name,
-    Expression target,
   ) {
     var extensions = _getApplicable(type, name);
 
@@ -62,9 +63,10 @@ class ExtensionMemberResolver {
       return extension.asResolutionResult;
     }
 
-    _errorReporter.reportErrorForNode(
+    _errorReporter.reportErrorForOffset(
       CompileTimeErrorCode.AMBIGUOUS_EXTENSION_MEMBER_ACCESS,
-      target,
+      nameEntity.offset,
+      nameEntity.length,
       [
         name,
         extensions[0].extension.name,
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
@@ -121,7 +121,7 @@ class FunctionExpressionInvocationResolver {
       receiverType: receiverType,
       name: FunctionElement.CALL_METHOD_NAME,
       receiverErrorNode: function,
-      nameErrorNode: function,
+      nameErrorEntity: function,
     );
     var callElement = result.getter;
 
diff --git a/pkg/analyzer/lib/src/dart/resolver/lexical_lookup.dart b/pkg/analyzer/lib/src/dart/resolver/lexical_lookup.dart
@@ -58,7 +58,7 @@ class LexicalLookup {
       receiverType: thisType,
       name: id,
       receiverErrorNode: node,
-      nameErrorNode: node,
+      nameErrorEntity: node,
     );
 
     if (setter) {
diff --git a/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart
@@ -638,7 +638,7 @@ class MethodInvocationResolver {
       receiverType: receiverType,
       name: name,
       receiverErrorNode: receiverErrorNode,
-      nameErrorNode: nameNode,
+      nameErrorEntity: nameNode,
     );
 
     if (result.isAmbiguous) {
diff --git a/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/postfix_expression_resolver.dart
@@ -158,7 +158,7 @@ class PostfixExpressionResolver {
       receiverType: receiverType,
       name: methodName,
       receiverErrorNode: operand,
-      nameErrorNode: operand,
+      nameErrorEntity: operand,
     );
     node.staticElement = result.getter;
     if (_shouldReportInvalidMember(receiverType, result)) {
diff --git a/pkg/analyzer/lib/src/dart/resolver/prefix_expression_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/prefix_expression_resolver.dart
@@ -192,7 +192,7 @@ class PrefixExpressionResolver {
         receiverType: readType,
         name: methodName,
         receiverErrorNode: operand,
-        nameErrorNode: operand,
+        nameErrorEntity: operand,
       );
       node.staticElement = result.getter;
       if (_shouldReportInvalidMember(readType, result)) {
diff --git a/pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart
@@ -174,7 +174,7 @@ class PropertyElementResolver {
       receiverType: targetType,
       name: propertyName.name,
       receiverErrorNode: target,
-      nameErrorNode: propertyName,
+      nameErrorEntity: propertyName,
     );
 
     if (targetType is DynamicTypeImpl || targetType is NeverTypeImpl) {
diff --git a/pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart
@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/element.dart';
@@ -24,8 +25,8 @@ class TypePropertyResolver {
   final ExtensionMemberResolver _extensionResolver;
 
   Expression _receiver;
+  SyntacticEntity _nameErrorEntity;
   String _name;
-  AstNode _nameErrorNode;
 
   ResolutionResult _result = ResolutionResult.none;
 
@@ -43,18 +44,18 @@ class TypePropertyResolver {
   /// The [receiverErrorNode] is the node to report nullable dereference,
   /// if the [receiverType] is potentially nullable.
   ///
-  /// The [nameErrorNode] is used to report the ambiguous extension issue.
+  /// The [nameErrorEntity] is used to report the ambiguous extension issue.
   ResolutionResult resolve({
     @required Expression receiver,
     @required DartType receiverType,
     @required String name,
     @required AstNode receiverErrorNode,
-    @required Expression nameErrorNode,
+    @required SyntacticEntity nameErrorEntity,
   }) {
     assert(receiverType != null);
     _receiver = receiver;
     _name = name;
-    _nameErrorNode = nameErrorNode;
+    _nameErrorEntity = nameErrorEntity;
     _result = ResolutionResult.none;
 
     receiverType = _resolveTypeParameter(receiverType);
@@ -95,7 +96,7 @@ class TypePropertyResolver {
   }
 
   void _lookupExtension(DartType type) {
-    _result = _extensionResolver.findExtension(type, _name, _nameErrorNode);
+    _result = _extensionResolver.findExtension(type, _nameErrorEntity, _name);
   }
 
   void _lookupInterfaceType(InterfaceType type) {
diff --git a/pkg/analyzer/lib/src/generated/element_resolver.dart b/pkg/analyzer/lib/src/generated/element_resolver.dart
@@ -418,7 +418,7 @@ class ElementResolver extends SimpleAstVisitor<void> {
         receiverType: targetType,
         name: getterMethodName,
         receiverErrorNode: target,
-        nameErrorNode: target,
+        nameErrorEntity: target,
       );
     }
 
@@ -761,7 +761,7 @@ class ElementResolver extends SimpleAstVisitor<void> {
         receiverType: enclosingType,
         name: node.name,
         receiverErrorNode: node,
-        nameErrorNode: node,
+        nameErrorEntity: node,
       );
       node.auxiliaryElements = AuxiliaryElements(
         result.getter,
@@ -1275,7 +1275,7 @@ class ElementResolver extends SimpleAstVisitor<void> {
             receiverType: enclosingClass.thisType,
             name: identifier.name,
             receiverErrorNode: identifier,
-            nameErrorNode: identifier,
+            nameErrorEntity: identifier,
           );
           setter = result.setter;
         }
@@ -1316,7 +1316,7 @@ class ElementResolver extends SimpleAstVisitor<void> {
           receiverType: enclosingType,
           name: identifier.name,
           receiverErrorNode: identifier,
-          nameErrorNode: identifier,
+          nameErrorEntity: identifier,
         );
         if (identifier.inSetterContext() ||
             identifier.parent is CommentReference) {
diff --git a/pkg/analyzer/test/src/diagnostics/ambiguous_extension_member_access_test.dart b/pkg/analyzer/test/src/diagnostics/ambiguous_extension_member_access_test.dart
@@ -144,7 +144,6 @@ f(SubTarget<num> t) {
   }
 
   test_operator_binary() async {
-    // There is no error reported.
     await assertErrorsInCode('''
 class A {}
 
@@ -162,6 +161,26 @@ A f(A a) => a + a;
     ]);
   }
 
+  test_operator_binary_compoundAssignment() async {
+    await assertErrorsInCode('''
+class A {}
+
+extension E1 on A {
+  A operator +(_) => this;
+}
+
+extension E2 on A {
+  A operator +(_) => this;
+}
+
+void f(A a) {
+  a += 0;
+}
+''', [
+      error(CompileTimeErrorCode.AMBIGUOUS_EXTENSION_MEMBER_ACCESS, 130, 2),
+    ]);
+  }
+
   test_operator_index_index() async {
     await assertErrorsInCode('''
 class A {}
