use-super-parameters when use_super_parameters is enabled

Fixes: #49556

Change-Id: Ia22a4f2734b7dd3affe8984ea41984e5b2c263a8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/252961
Commit-Queue: Phil Quitslund <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: pq

pkg/analysis_server/lib/src/services/refactoring/extract_widget.dart

@@ -408,6 +408,9 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
     builder.addInsertion(_enclosingUnitMember!.end, (builder) {
       builder.writeln();
       builder.writeln();
+      var useSuperParameters = _featureSet.isEnabled(Feature.super_parameters);
+      var paramsToInitialize =
+          _parameters.where((p) => p.constructorName != p.name).toList();
       builder.writeClassDeclaration(
         name,
         superclass: classStatelessWidget!.instantiate(
@@ -425,15 +428,19 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
 
               // Add the required `key` parameter.
               builder.write('    ');
-              builder.writeParameter(
-                'key',
-                type: classKey!.instantiate(
-                  typeArguments: const [],
-                  nullabilitySuffix: _isNonNullable
-                      ? NullabilitySuffix.question
-                      : NullabilitySuffix.star,
-                ),
-              );
+              if (useSuperParameters) {
+                builder.write('super.key');
+              } else {
+                builder.writeParameter(
+                  'key',
+                  type: classKey!.instantiate(
+                    typeArguments: const [],
+                    nullabilitySuffix: _isNonNullable
+                        ? NullabilitySuffix.question
+                        : NullabilitySuffix.star,
+                  ),
+                );
+              }
               builder.writeln(',');
 
               // Add parameters for fields, local, and method parameters.
@@ -459,17 +466,25 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
 
               builder.write('  }');
             },
-            initializerWriter: () {
-              for (var parameter in _parameters) {
-                if (parameter.constructorName != parameter.name) {
-                  builder.write(parameter.name);
-                  builder.write(' = ');
-                  builder.write(parameter.constructorName);
-                  builder.write(', ');
-                }
-              }
-              builder.write('super(key: key)');
-            },
+            initializerWriter: useSuperParameters && paramsToInitialize.isEmpty
+                ? null
+                : () {
+                    for (var i = 0; i < paramsToInitialize.length; ++i) {
+                      var parameter = paramsToInitialize[i];
+                      if (i > 0) {
+                        builder.write(', ');
+                      }
+                      builder.write(parameter.name);
+                      builder.write(' = ');
+                      builder.write(parameter.constructorName);
+                    }
+                    if (!useSuperParameters) {
+                      if (paramsToInitialize.isNotEmpty) {
+                        builder.write(', ');
+                      }
+                      builder.write('super(key: key)');
+                    }
+                  },
           );
           builder.writeln();
           builder.writeln();

pkg/analysis_server/test/lsp/code_actions_refactor_test.dart

@@ -677,9 +677,11 @@ void foo(int arg) {}
 class ExtractWidgetRefactorCodeActionsTest extends AbstractCodeActionsTest {
   final extractWidgetTitle = 'Extract Widget';
 
-  /// Nullability suffix expected in this test class.
-  String get expectedNullableSuffix => '?';
-
+  String get expectedNewWidgetConstructorDeclaration => '''
+const NewWidget({
+    super.key,
+  });
+''';
   @override
   void setUp() {
     super.setUp();
@@ -728,10 +730,7 @@ class MyWidget extends StatelessWidget {
 }
 
 class NewWidget extends StatelessWidget {
-  const NewWidget({
-    Key$expectedNullableSuffix key,
-  }) : super(key: key);
-
+  $expectedNewWidgetConstructorDeclaration
   @override
   Widget build(BuildContext context) {
     return new Column(
@@ -776,7 +775,11 @@ void f() {}
 class ExtractWidgetRefactorCodeActionsWithoutNullSafetyTest
     extends ExtractWidgetRefactorCodeActionsTest {
   @override
-  String get expectedNullableSuffix => '';
+  String get expectedNewWidgetConstructorDeclaration => '''
+const NewWidget({
+    Key key,
+  }) : super(key: key);
+''';
 
   @override
   String get testPackageLanguageVersion => '2.9';