support renamed parameters when adding super calls

Bug: #59745
Change-Id: I177e4f748954ddfea1b300085800c8c9a87bed3f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/408840
Auto-Submit: Jake Macdonald <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: jakemac53

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

@@ -43,24 +43,30 @@ class AddCallSuper extends ResolvedCorrectionProducer {
     var nameObj = Name.forLibrary(classElement.library2, name);
     var overridden = InheritanceManager3().getInherited4(classElement, nameObj);
     if (overridden == null) return;
-    var overriddenParameters = overridden.formalParameters.map((p) => p.name3);
+    var overriddenNamedParameters = overridden.formalParameters
+        .where((p) => p.isNamed)
+        .map((p) => p.name3);
 
     var body = methodDeclaration.body;
     var parameters = methodDeclaration.parameters?.parameters;
-    var argumentList =
-        parameters
-            ?.map((p) {
-              var name = p.name?.lexeme;
-              if (overriddenParameters.contains(name)) {
-                return p.isNamed ? '$name: $name' : name;
-              }
-              return null;
-            })
-            .nonNulls
-            .join(', ') ??
-        '';
-
-    _addition = '$name($argumentList)';
+    var arguments = <String>[];
+    if (parameters != null) {
+      for (var i = 0; i < parameters.length; i++) {
+        var p = parameters[i];
+        var name = p.name?.lexeme;
+        if (name == null) continue;
+        if (p.isPositional) {
+          if (i < overridden.formalParameters.length &&
+              overridden.formalParameters[i].isPositional) {
+            arguments.add(name);
+          }
+        } else if (overriddenNamedParameters.contains(name)) {
+          arguments.add(p.isNamed ? '$name: $name' : name);
+        }
+      }
+    }
+
+    _addition = '$name(${arguments.join(', ')})';
 
     if (body is BlockFunctionBody) {
       await _block(builder, body.block);

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

@@ -177,6 +177,35 @@ class B extends A {
 ''', matchFixMessage: "Add 'super.a(i)'");
   }
 
+  Future<void> test_body_renamed_parameters() async {
+    await resolveTestCode('''
+import 'package:meta/meta.dart';
+
+class A {
+  @mustCallSuper
+  void m(int x, bool y) {}
+}
+class B extends A {
+  @override
+  void m(int x, bool z) {}
+}
+''');
+    await assertHasFix('''
+import 'package:meta/meta.dart';
+
+class A {
+  @mustCallSuper
+  void m(int x, bool y) {}
+}
+class B extends A {
+  @override
+  void m(int x, bool z) {
+    super.m(x, z);
+  }
+}
+''', matchFixMessage: "Add 'super.m(x, z)'");
+  }
+
   Future<void> test_body_required() async {
     await resolveTestCode('''
 import 'package:meta/meta.dart';