Fix the field formal parameter to normal parameter assist

This disables the assist if the field formal parameter happens to also
be an older style function typed parameter. As written the assist
produces invalid code, and the older style is strongly discouraged so
not supporting it shouldn't impact very many users.

Change-Id: I44a3942b4656265bb1cbbba29e68fff61962b689
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/433260
Reviewed-by: Samuel Rawlins <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>

Author: bwilkerson

CHANGELOG.md

@@ -18,6 +18,7 @@ constraint][language version] lower bound to 3.9 or greater (`sdk: '^3.9.0'`).
 
 - Add the [`switch_on_type`][] lint rule.
 - Add the [`unnecessary_unawaited`][] lint rule.
+- Add an assist to convert a field formal parameter to a normal parameter.
 
 [`switch_on_type`]: http://dart.dev/lints/switch_on_type
 [`unnecessary_unawaited`]: http://dart.dev/lints/unnecessary_unawaited

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

@@ -23,7 +23,7 @@ class ConvertFieldFormalToNormal extends ResolvedCorrectionProducer {
   @override
   Future<void> compute(ChangeBuilder builder) async {
     var parameter = node;
-    if (parameter is! FieldFormalParameter) {
+    if (parameter is! FieldFormalParameter || parameter.parameters != null) {
       return;
     }
     var field = parameter.declaredFragment?.element.field2;

pkg/analysis_server/test/src/services/correction/assist/convert_field_formal_to_normal_test.dart

@@ -281,19 +281,30 @@ class C {
 ''');
   }
 
-  Future<void> test_withFunctionTypedField() async {
+  Future<void> test_withFunctionTypedField_functionTypedParameter() async {
     await resolveTestCode('''
 class C {
   void Function() f;
 
   C({required this.f^()});
 }
+''');
+    await assertNoAssist();
+  }
+
+  Future<void> test_withFunctionTypedField_normalParameter() async {
+    await resolveTestCode('''
+class C {
+  void Function() f;
+
+  C({required this.f^});
+}
 ''');
     await assertHasAssist('''
 class C {
   void Function() f;
 
-  C({required void Function() f()}) : f = f;
+  C({required void Function() f}) : f = f;
 }
 ''');
   }