Issue 61940. Fix for reporting fieldInitializedInParameterAndInitializer and fieldInitializedByMultipleInitializers when the field declaration has initializer.

Bug: #61940
Change-Id: I682e4a226a3458d1c53dbeb2d7727e03bc34ee65
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/462541
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/error/constructor_fields_verifier.dart

@@ -206,6 +206,7 @@ class _Constructor {
                 diag.fieldInitializedInInitializerAndDeclaration,
               );
             }
+            fields[fieldElement] = _InitState.initInInitializer;
           } else if (state == _InitState.initInFieldFormal) {
             diagnosticReporter.atNode(
               fieldName,
@@ -244,6 +245,7 @@ class _Constructor {
               arguments: [fieldElement.displayName],
             );
           }
+          fields[fieldElement] = _InitState.initInFieldFormal;
         } else if (state == _InitState.initInFieldFormal) {
           // Reported in DuplicateDefinitionVerifier._checkDuplicateIdentifier
         }

pkg/analyzer/test/src/diagnostics/field_initialized_by_multiple_initializers_test.dart

@@ -169,7 +169,19 @@ class A {
 ''');
   }
 
-  test_class_two_initializers() async {
+  test_class_two_initializers_initInDeclaration() async {
+    await assertErrorsInCode(
+      r'''
+class A {
+  int x = 0;
+  A() : x = 0, x = 1 {}
+}
+''',
+      [error(_errorCode, 38, 1)],
+    );
+  }
+
+  test_class_two_initializers_noInitInDeclaration() async {
     await assertErrorsInCode(
       r'''
 class A {

pkg/analyzer/test/src/diagnostics/field_initialized_in_parameter_and_initializer_test.dart

@@ -44,7 +44,19 @@ augment class A {
     ]);
   }
 
-  test_class_fieldFormalParameter_initializer() async {
+  test_class_fieldFormalParameter_initializer_initInDeclaration() async {
+    await assertErrorsInCode(
+      r'''
+class A {
+  int x = 0;
+  A(this.x) : x = 1 {}
+}
+''',
+      [error(diag.fieldInitializedInParameterAndInitializer, 37, 1)],
+    );
+  }
+
+  test_class_fieldFormalParameter_initializer_noInitInDeclaration() async {
     await assertErrorsInCode(
       r'''
 class A {