[DAS] Fixes add super invocation avoiding existing parameters

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

Author: FMorschel

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

@@ -103,6 +103,23 @@ class _AddInvocation extends ResolvedCorrectionProducer {
         _constructor.formalParameters.any((p) => p.name3 == null)) {
       return;
     }
+    var currentConstructor =
+        node.thisOrAncestorOfType<ConstructorDeclaration>();
+    var positionalParameters = 0;
+    var namedParameters = <String>{};
+    if (currentConstructor case ConstructorDeclaration(:var parameters)) {
+      for (var parameter in parameters.parameters) {
+        if (parameter case SuperFormalParameter(
+          :var isPositional,
+        ) when isPositional) {
+          positionalParameters++;
+        } else if (parameter case DefaultFormalParameter(
+          :SuperFormalParameter parameter,
+        ) when parameter.isNamed) {
+          namedParameters.add(parameter.name.lexeme);
+        }
+      }
+    }
     await builder.addDartFileEdit(file, (builder) {
       builder.addInsertion(_insertOffset, (builder) {
         builder.write(_prefix);
@@ -115,11 +132,20 @@ class _AddInvocation extends ResolvedCorrectionProducer {
         // add arguments
         builder.write('(');
         var firstParameter = true;
-        for (var parameter in _constructor.formalParameters) {
+        for (var (index, parameter) in _constructor.formalParameters.indexed) {
           // skip non-required parameters
           if (parameter.isOptional) {
             break;
           }
+          if (parameter.isNamed && namedParameters.contains(parameter.name3)) {
+            // skip already initialized named parameters
+            continue;
+          }
+          if (parameter.isPositional && index < positionalParameters) {
+            // skip already initialized positional parameters
+            continue;
+          }
+
           // comma
           if (firstParameter) {
             firstParameter = false;

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

@@ -17,7 +17,83 @@ void main() {
 
 @reflectiveTest
 class AddSuperConstructorInvocationTest extends FixProcessorTest
-    with AddSuperConstructorInvocationTestCases {}
+    with AddSuperConstructorInvocationTestCases {
+  Future<void> test_optionalPositional() async {
+    await resolveTestCode('''
+class A {
+  A(int p1, int p2, [int? p3]);
+}
+class B extends A {
+  B(super.p1);
+}
+''');
+    await assertHasFix('''
+class A {
+  A(int p1, int p2, [int? p3]);
+}
+class B extends A {
+  B(super.p1) : super(0);
+}
+''');
+  }
+
+  Future<void> test_requiredNamed_missingFirst() async {
+    await resolveTestCode('''
+class A {
+  A({required int p1, required int p2});
+}
+class B extends A {
+  B({required super.p2});
+}
+''');
+    await assertHasFix('''
+class A {
+  A({required int p1, required int p2});
+}
+class B extends A {
+  B({required super.p2}) : super(p1: 0);
+}
+''');
+  }
+
+  Future<void> test_requiredNamed_missingLast() async {
+    await resolveTestCode('''
+class A {
+  A({required int p1, required int p2});
+}
+class B extends A {
+  B({required super.p1});
+}
+''');
+    await assertHasFix('''
+class A {
+  A({required int p1, required int p2});
+}
+class B extends A {
+  B({required super.p1}) : super(p2: 0);
+}
+''');
+  }
+
+  Future<void> test_requiredPositional_oneNamed() async {
+    await resolveTestCode('''
+class A {
+  A(int p1, int p2, {required int p3});
+}
+class B extends A {
+  B(super.p1);
+}
+''');
+    await assertHasFix('''
+class A {
+  A(int p1, int p2, {required int p3});
+}
+class B extends A {
+  B(super.p1) : super(0, p3: 0);
+}
+''');
+  }
+}
 
 @reflectiveTest
 class AddSuperConstructorInvocationTest_language215 extends FixProcessorTest