[DAS] Adds null-aware fix to function invocations

No specific issue but I noticed this at a comment on the first one and some related work about `call` is being done at the second.

Bug: #42762
Bug: #61319
Change-Id: Iac73d62884ae70dd27c47ee135748eca23ed06b2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449142
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>

Author: FMorschel

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

@@ -15,6 +15,7 @@ class ReplaceWithNullAware extends ResolvedCorrectionProducer {
 
   /// The operator to replace.
   String _operator = '.';
+  String _operatorPrefix = '?';
 
   ReplaceWithNullAware.inChain({required super.context})
     : _correctionKind = _CorrectionKind.inChain;
@@ -30,7 +31,7 @@ class ReplaceWithNullAware extends ResolvedCorrectionProducer {
       CorrectionApplicability.singleLocation;
 
   @override
-  List<String> get fixArguments => [_operator, '?$_operator'];
+  List<String> get fixArguments => [_operator, '$_operatorPrefix$_operator'];
 
   @override
   FixKind get fixKind => DartFixKind.REPLACE_WITH_NULL_AWARE;
@@ -81,25 +82,36 @@ class ReplaceWithNullAware extends ResolvedCorrectionProducer {
         node = parent.cascadeSections.first;
       }
     }
-    if (node is MethodInvocation) {
-      await _insert(builder, node.operator);
-    } else if (node is PrefixedIdentifier) {
-      await _insert(builder, node.period);
-    } else if (node is PropertyAccess) {
-      await _insert(builder, node.operator);
-    } else if (node is IndexExpression) {
-      await _insert(builder, node.period);
+    switch (node) {
+      case MethodInvocation():
+        await _insert(builder, node.operator);
+      case PrefixedIdentifier():
+        await _insert(builder, node.period);
+      case PropertyAccess():
+        await _insert(builder, node.operator);
+      case IndexExpression():
+        await _insert(builder, node.period);
+      case FunctionExpressionInvocation(:var argumentList):
+        await _insertCall(builder, argumentList);
     }
   }
 
   Future<void> _insert(ChangeBuilder builder, Token? token) async {
     if (token != null) {
       _operator = token.lexeme;
       await builder.addDartFileEdit(file, (builder) {
-        builder.addSimpleInsertion(token.offset, '?');
+        builder.addSimpleInsertion(token.offset, _operatorPrefix);
       });
     }
   }
+
+  Future<void> _insertCall(ChangeBuilder builder, ArgumentList node) async {
+    _operator = '(';
+    _operatorPrefix = '?.call';
+    await builder.addDartFileEdit(file, (builder) {
+      builder.addSimpleInsertion(node.offset, _operatorPrefix);
+    });
+  }
 }
 
 /// The kinds of corrections supported by [ReplaceWithNullAware].

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

@@ -887,7 +887,10 @@ final _builtInNonLintGenerators = <DiagnosticCode, List<ProducerGenerator>>{
   CompileTimeErrorCode.superInvocationNotLast: [MakeSuperInvocationLast.new],
   CompileTimeErrorCode.switchCaseCompletesNormally: [AddSwitchCaseBreak.new],
   CompileTimeErrorCode.typeTestWithUndefinedName: [ChangeTo.classOrMixin],
-  CompileTimeErrorCode.uncheckedInvocationOfNullableValue: [AddNullCheck.new],
+  CompileTimeErrorCode.uncheckedInvocationOfNullableValue: [
+    AddNullCheck.new,
+    ReplaceWithNullAware.single,
+  ],
   CompileTimeErrorCode.uncheckedMethodInvocationOfNullableValue: [
     AddNullCheck.new,
     ExtractLocalVariable.new,

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

@@ -21,6 +21,19 @@ class ReplaceWithNullAwareTest extends FixProcessorTest {
   @override
   FixKind get kind => DartFixKind.REPLACE_WITH_NULL_AWARE;
 
+  Future<void> test_function() async {
+    await resolveTestCode('''
+void foo(void Function()? f) {
+  f();
+}
+''');
+    await assertHasFix('''
+void foo(void Function()? f) {
+  f?.call();
+}
+''');
+  }
+
   Future<void> test_indexExpression() async {
     await resolveTestCode('''
 void f(List<int>? l) {