Perform more resolution of method invocations involving extension methods

bwilkerson · commit-bot@chromium.org · commit 3e3d6473bc05 · 2019-07-24T21:09:59.000Z
Change-Id: Ia8060a8a595003341657422bdb68a7b53153f272 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110346 Reviewed-by: Phil Quitslund <pquitslund@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart
@@ -328,6 +328,7 @@ class MethodInvocationResolver {
       return;
     }
     nameNode.staticElement = member;
+    _setResolution(node, member.type);
     return;
   }
 
diff --git a/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart b/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart
@@ -23,8 +23,21 @@ class ExtensionMethodTest extends DriverResolutionTest {
     ..contextFeatures = new FeatureSet.forTesting(
         sdkVersion: '2.3.0', additionalFeatures: [Feature.extension_methods]);
 
+  test_accessStaticWithinInstance() async {
+    await assertNoErrorsInCode('''
+class A {}
+extension E on A {
+  static void a() {}
+  void b() { a(); }
+}
+''');
+    var invocation = findNode.methodInvocation('a();');
+    assertElement(invocation, findElement.method('a'));
+    assertInvokeType(invocation, 'void Function()');
+  }
+
   test_getter_noMatch() async {
-    await assertErrorCodesInCode(r'''
+    await assertErrorsInCode(r'''
 class B { }
 
 extension A on B { }
@@ -33,7 +46,10 @@ f() {
   B b = B();
   int x = b.a;
 }
-''', [StaticTypeWarningCode.UNDEFINED_GETTER]);
+''', [
+      error(HintCode.UNUSED_LOCAL_VARIABLE, 60, 1),
+      error(StaticTypeWarningCode.UNDEFINED_GETTER, 66, 1),
+    ]);
   }
 
   test_getter_oneMatch() async {
@@ -78,18 +94,6 @@ f() {
     expect(invocation.identifier.staticElement, declaration.declaredElement);
   }
 
-  test_accessStaticWithinInstance() async {
-    await assertNoErrorsInCode('''
-class A {}
-extension E on A {
-  static void a() {}
-  void b() { a(); }
-}
-''');
-    var invocation = findNode.methodInvocation('a();');
-    assertElement(invocation, findElement.method('a'));
-  }
-
   test_method_moreSpecificThanPlatform() async {
     //
     // An extension with on type clause T1 is more specific than another
@@ -125,6 +129,7 @@ f() {
 
     var invocation = findNode.methodInvocation('c.a()');
     assertElement(invocation, findElement.method('a', of: 'Core2_Ext'));
+    assertInvokeType(invocation, 'void Function()');
   }
 
   test_method_noMatch() async {
@@ -181,6 +186,7 @@ f() {
 
     var invocation = findNode.methodInvocation('b.a()');
     assertElement(invocation, findElement.method('a'));
+    assertInvokeType(invocation, 'void Function()');
   }
 
   test_method_privateExtension() async {
@@ -242,6 +248,7 @@ f() {
 
     var invocation = findNode.methodInvocation('b.a()');
     assertElement(invocation, findElement.method('a', of: 'B_Ext'));
+    assertInvokeType(invocation, 'void Function()');
   }
 
   @failingTest
@@ -270,6 +277,7 @@ main() {
 
     var invocation = findNode.methodInvocation('x.f(o)');
     assertElement(invocation, findElement.method('f', of: 'B_Ext'));
+    assertInvokeType(invocation, 'void Function(T)');
   }
 
   test_method_specificSubtypeMatchPlatform() async {
@@ -300,6 +308,7 @@ f() {
 
     var invocation = findNode.methodInvocation('c.a()');
     assertElement(invocation, findElement.method('a', of: 'Core2_Ext'));
+    assertInvokeType(invocation, 'void Function()');
   }
 
   test_method_unnamedExtension() async {
@@ -331,7 +340,7 @@ extension E2 on A {}
   }
 
   test_setter_noMatch() async {
-    await assertErrorCodesInCode(r'''
+    await assertErrorsInCode(r'''
 class B { }
 
 extension A on B {
@@ -341,7 +350,9 @@ f() {
   B b = B();
   b.a = 1;
 }
-''', [StaticTypeWarningCode.UNDEFINED_SETTER]);
+''', [
+      error(StaticTypeWarningCode.UNDEFINED_SETTER, 58, 1),
+    ]);
   }
 
   test_setter_oneMatch() async {

Original file line number	Diff line number	Diff line change
`@@ -328,6 +328,7 @@ class MethodInvocationResolver {`
`328`	`328`	`return;`
`329`	`329`	`}`
`330`	`330`	`nameNode.staticElement = member;`
	`331`	`+ _setResolution(node, member.type);`
`331`	`332`	`return;`
`332`	`333`	`}`
`333`	`334`