[DAS] Fixes Wrap in unawaited quick-fix for nullable futures

Fixes: #61144
Change-Id: Ib9e2e80295fe92e258f923aa959818f639329728
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/442508
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>

Author: FMorschel

pkg/analysis_server/lib/src/services/correction/dart/wrap_in_unawaited.dart

@@ -6,6 +6,7 @@ import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/precedence.dart';
+import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
@@ -79,6 +80,12 @@ class WrapInUnawaited extends ResolvedCorrectionProducer {
     if (type.isDartAsyncFutureOr) {
       return true;
     }
-    return typeSystem.isAssignableTo(type, typeProvider.futureDynamicType);
+    return typeSystem.isAssignableTo(
+      type,
+      typeProvider.futureElement.instantiate(
+        typeArguments: [typeProvider.dynamicType],
+        nullabilitySuffix: NullabilitySuffix.question,
+      ),
+    );
   }
 }

pkg/analysis_server/test/src/services/correction/fix/wrap_in_unawaited_test.dart

@@ -105,7 +105,22 @@ class C {
 }
 
 void main() async {
-  C()..something(); 
+  C()..something();
+}
+''');
+    await assertNoFix();
+  }
+
+  Future<void> test_cascadeExpression_getter() async {
+    await resolveTestCode('''
+class C {
+  Future<String> get something {
+    return Future.value('hello');
+  }
+}
+
+void f(C Function() fn) async {
+  fn()..something;
 }
 ''');
     await assertNoFix();
@@ -224,6 +239,25 @@ Future<void> f() async {
 ''');
   }
 
+  Future<void> test_nullableFuture() async {
+    await resolveTestCode('''
+Future<void> f() async {
+  g();
+}
+
+Future<void>? g() async { }
+''');
+    await assertHasFix('''
+import 'dart:async';
+
+Future<void> f() async {
+  unawaited(g());
+}
+
+Future<void>? g() async { }
+''');
+  }
+
   Future<void> test_subTypeOfFuture() async {
     await resolveTestCode('''
 abstract class MyFuture implements Future<void> {}