[analyzer] Resolve nullability of generic function types

Change-Id: Ie14ae8844b83f54b5e2c9d1d5424ca8f015bb5d0 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/101463 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Mike Fairhurst <[email protected]>
dart-lang · May 6, 2019 · 7928dbd · 7928dbd
1 parent 36c315e
commit 7928dbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -7908,6 +7908,12 @@ class TypeResolverVisitor extends ScopedVisitor {
   @override
   void visitGenericFunctionType(GenericFunctionType node) {
     GenericFunctionTypeElementImpl element = node.type?.element;
+    if (node.type != null) {
+      var nullability =
+          _typeNameResolver._getNullability(node.question != null);
+      (node as GenericFunctionTypeImpl).type =
+          (node.type as TypeImpl).withNullability(nullability);
+    }
     if (element != null) {
       super.visitGenericFunctionType(node);
       element.returnType =

diff --git a/pkg/analyzer/test/src/diagnostics/unchecked_use_of_nullable_value_test.dart b/pkg/analyzer/test/src/diagnostics/unchecked_use_of_nullable_value_test.dart
@@ -177,10 +177,7 @@ m() {
 ''');
   }
 
-  @failingTest
   test_invoke_nullable() async {
-    // test is failing because nullable function invocations aren't being
-    // resolved correctly
     await assertErrorCodesInCode(r'''
 m() {
   Function()? x;