Migration: handle method invocations that resolve to a getter.

stereotype441 · commit-bot@chromium.org · commit 326e970b81b8 · 2019-07-02T07:41:45.000Z
Change-Id: I9a41190d883ee50a63d8cd60699da14084da09d7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107748 Commit-Queue: Paul Berry <paulberry@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/nnbd_migration/lib/src/edge_builder.dart b/pkg/nnbd_migration/lib/src/edge_builder.dart
@@ -607,6 +607,9 @@ class EdgeBuilder extends GeneralizingAstVisitor<DecoratedType> {
       _unimplemented(node, 'Unresolved method name');
     }
     var calleeType = getOrComputeElementType(callee, targetType: targetType);
+    if (callee is PropertyAccessorElement) {
+      calleeType = calleeType.returnType;
+    }
     var expressionType = _handleInvocationArguments(node,
         node.argumentList.arguments, node.typeArguments, calleeType, null);
     if (isConditional) {
diff --git a/pkg/nnbd_migration/test/api_test.dart b/pkg/nnbd_migration/test/api_test.dart
@@ -938,6 +938,30 @@ int? test(C c) {
     await _checkSingleFileChanges(content, expected);
   }
 
+  test_function_expression_invocation_via_getter() async {
+    var content = '''
+abstract class C {
+  void Function(int) get f;
+  int/*?*/ Function() get g;
+}
+int test(C c) {
+  c.f(null);
+  return c.g();
+}
+''';
+    var expected = '''
+abstract class C {
+  void Function(int?) get f;
+  int?/*?*/ Function() get g;
+}
+int? test(C c) {
+  c.f(null);
+  return c.g();
+}
+''';
+    await _checkSingleFileChanges(content, expected);
+  }
+
   test_generic_function_type_syntax_inferred_dynamic_return() async {
     var content = '''
 abstract class C {
diff --git a/pkg/nnbd_migration/test/edge_builder_test.dart b/pkg/nnbd_migration/test/edge_builder_test.dart
@@ -1582,6 +1582,21 @@ void g(C c, int j) {
         assertEdge(nullable_j.node, never, hard: true));
   }
 
+  test_methodInvocation_resolves_to_getter() async {
+    await analyze('''
+abstract class C {
+  int/*1*/ Function(int/*2*/ i) get f;
+}
+int/*3*/ g(C c, int/*4*/ i) => c.f(i);
+''');
+    assertEdge(decoratedTypeAnnotation('int/*4*/').node,
+        decoratedTypeAnnotation('int/*2*/').node,
+        hard: true);
+    assertEdge(decoratedTypeAnnotation('int/*1*/').node,
+        decoratedTypeAnnotation('int/*3*/').node,
+        hard: false);
+  }
+
   test_methodInvocation_return_type() async {
     await analyze('''
 class C {
