[DAS] Fixes Add final initializing formal parameters quick-fix on enum

Fixes: #61798
Change-Id: I2ef9a8086efc091207b1651d45b4a9e4b665f8e1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/457400
Commit-Queue: Paul Berry <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

Author: FMorschel

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

@@ -17,8 +17,6 @@ typedef _FieldRecord = ({bool isRequired, String parameter});
 class AddFieldFormalParameters extends ResolvedCorrectionProducer {
   final _Style _style;
 
-  bool _useRequired = false;
-
   @override
   final FixKind fixKind;
 
@@ -43,13 +41,10 @@ class AddFieldFormalParameters extends ResolvedCorrectionProducer {
     }
     List<FormalParameter> parameters = constructor.parameters.parameters;
 
-    var classNode = constructor.parent;
-    if (classNode is! ClassDeclaration) {
-      return;
-    }
-
-    var superType = classNode.declaredFragment!.element.supertype;
-    if (superType == null) {
+    var instanceNodeDeclaration = constructor.parent;
+    if (instanceNodeDeclaration is! NamedCompilationUnitMember ||
+        instanceNodeDeclaration is TypeAlias ||
+        instanceNodeDeclaration is FunctionDeclaration) {
       return;
     }
 
@@ -78,10 +73,6 @@ class AddFieldFormalParameters extends ResolvedCorrectionProducer {
       }
     }
 
-    if (_style == _Style.requiredNamed) {
-      _useRequired = true;
-    }
-
     var fieldsRecords = fields.map(_parameterForField).toList();
     var requiredFirst = getCodeStyleOptions(
       unitResult.file,
@@ -125,6 +116,9 @@ class AddFieldFormalParameters extends ResolvedCorrectionProducer {
             write += fieldParametersCode;
           }
           builder.addSimpleInsertion(parameters.last.end, write);
+        } else {
+          var offset = constructor.parameters.leftParenthesis.end;
+          builder.addSimpleInsertion(offset, '{$fieldParametersCode}');
         }
       } else if (lastRequiredParameter != null) {
         return builder.addSimpleInsertion(
@@ -144,7 +138,8 @@ class AddFieldFormalParameters extends ResolvedCorrectionProducer {
   _FieldRecord _parameterForField(FieldElement field) {
     var prefix = '';
     var isRequired = false;
-    if (typeSystem.isPotentiallyNonNullable(field.type) && _useRequired) {
+    if (typeSystem.isPotentiallyNonNullable(field.type) &&
+        _style == _Style.requiredNamed) {
       isRequired = true;
       prefix = 'required ';
     }

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

@@ -21,6 +21,27 @@ class AddFieldFormalNamedParametersTest extends FixProcessorTest {
   @override
   FixKind get kind => DartFixKind.addInitializingFormalNamesParameters;
 
+  Future<void> test_enum() async {
+    await resolveTestCode('''
+enum MyEnum {
+  a;
+
+  const MyEnum();
+
+  final int value;
+}
+''');
+    await assertHasFix('''
+enum MyEnum {
+  a;
+
+  const MyEnum({required this.value});
+
+  final int value;
+}
+''');
+  }
+
   Future<void> test_flutter_nullable() async {
     writeTestPackageConfig(flutter: true);
     await resolveTestCode('''
@@ -206,6 +227,27 @@ class AddFieldFormalParametersTest extends FixProcessorTest {
   @override
   FixKind get kind => DartFixKind.addInitializingFormalParameters;
 
+  Future<void> test_enum() async {
+    await resolveTestCode('''
+enum MyEnum {
+  a;
+
+  const MyEnum();
+
+  final int value;
+}
+''');
+    await assertHasFix('''
+enum MyEnum {
+  a;
+
+  const MyEnum(this.value);
+
+  final int value;
+}
+''');
+  }
+
   Future<void> test_flutter() async {
     writeTestPackageConfig(flutter: true);
     await resolveTestCode('''

pkg/analyzer/lib/src/generated/error_verifier.dart

@@ -6342,8 +6342,32 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     ConstructorDeclaration constructor,
   ) {
     var fields = <FieldElement>{};
-    var classDeclaration = constructor.parent as ClassDeclaration;
-    for (ClassMember fieldDeclaration in classDeclaration.members) {
+    var unitMemberDeclaration =
+        constructor.parent as NamedCompilationUnitMember;
+    late NodeList<ClassMember> membersList;
+    switch (unitMemberDeclaration) {
+      case TypeAlias() || FunctionDeclaration():
+        assert(
+          false,
+          'How can a constructor be declared in type alias or function?',
+        );
+        return [];
+      case ExtensionTypeDeclaration():
+        // Extension types do not have fields to be initialized.
+        return [];
+      case ClassDeclaration(:var members) ||
+          MixinDeclaration(:var members) ||
+          EnumDeclaration(:var members):
+        membersList = members;
+      default:
+        assert(
+          false,
+          'Unexpected parent of constructor: '
+          '${unitMemberDeclaration.runtimeType}',
+        );
+        return [];
+    }
+    for (ClassMember fieldDeclaration in membersList) {
       if (fieldDeclaration is FieldDeclaration) {
         for (VariableDeclaration field in fieldDeclaration.fields.variables) {
           if (field.initializer == null) {