[cfe] Report conflicts through _Declaration

The reports the declaration conflicts through the _Declaration objects,
which streamlines the code and helps providing more targeted messages.

Change-Id: I013c9974de87c5a1c541ba6aa5d78a1ba63e1074
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/437241
Reviewed-by: Chloe Stefantsova <cstefantsova@google.com>

pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart

@@ -1586,62 +1586,6 @@ Message _withArgumentsConflictsWithImplicitSetterCause(String name) {
   );
 }
 
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const Template<Message Function(String name)> templateConflictsWithSetter =
-    const Template<Message Function(String name)>(
-  "ConflictsWithSetter",
-  problemMessageTemplate: r"""Conflicts with setter '#name'.""",
-  withArguments: _withArgumentsConflictsWithSetter,
-);
-
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const Code<Message Function(String name)> codeConflictsWithSetter =
-    const Code<Message Function(String name)>(
-  "ConflictsWithSetter",
-  analyzerCodes: <String>["CONFLICTS_WITH_MEMBER"],
-);
-
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-Message _withArgumentsConflictsWithSetter(String name) {
-  if (name.isEmpty) throw 'No name provided';
-  name = demangleMixinApplicationName(name);
-  return new Message(
-    codeConflictsWithSetter,
-    problemMessage: """Conflicts with setter '${name}'.""",
-    arguments: {
-      'name': name,
-    },
-  );
-}
-
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const Template<Message Function(String name)> templateConflictsWithSetterCause =
-    const Template<Message Function(String name)>(
-  "ConflictsWithSetterCause",
-  problemMessageTemplate: r"""Conflicting setter '#name'.""",
-  withArguments: _withArgumentsConflictsWithSetterCause,
-);
-
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const Code<Message Function(String name)> codeConflictsWithSetterCause =
-    const Code<Message Function(String name)>(
-  "ConflictsWithSetterCause",
-  severity: Severity.context,
-);
-
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-Message _withArgumentsConflictsWithSetterCause(String name) {
-  if (name.isEmpty) throw 'No name provided';
-  name = demangleMixinApplicationName(name);
-  return new Message(
-    codeConflictsWithSetterCause,
-    problemMessage: """Conflicting setter '${name}'.""",
-    arguments: {
-      'name': name,
-    },
-  );
-}
-
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Template<Message Function(String name)>
     templateConflictsWithTypeParameter =

pkg/front_end/lib/src/fragment/enum_element.dart

@@ -104,6 +104,7 @@ class EnumElementDeclaration
   TypeBuilder get type => _fragment.type;
 
   @override
+  // Coverage-ignore(suite): Not run.
   UriOffsetLength get uriOffset => _fragment.uriOffset;
 
   @override

pkg/front_end/lib/src/fragment/primary_constructor_field.dart

@@ -98,6 +98,7 @@ class PrimaryConstructorFieldDeclaration
   TypeBuilder get type => _fragment.type;
 
   @override
+  // Coverage-ignore(suite): Not run.
   UriOffsetLength get uriOffset => _fragment.uriOffset;
 
   // Coverage-ignore(suite): Not run.

pkg/front_end/lib/src/source/source_class_builder.dart

@@ -1573,8 +1573,7 @@ class SourceClassBuilder extends ClassBuilderImpl
           }
           DartType computedBound = substitution.substituteType(interfaceBound);
           if (!types
-              .performMutualSubtypesCheck(
-                  declaredBound, computedBound)
+              .performMutualSubtypesCheck(declaredBound, computedBound)
               .isSuccess()) {
             reportInvalidOverride(
                 isInterfaceCheck,

pkg/front_end/lib/src/type_inference/closure_context.dart

@@ -472,8 +472,7 @@ class _AsyncClosureContext implements ClosureContext {
           ..parent = statement;
       } else if (flattenedExpressionType is! VoidType &&
           !inferrer.typeSchemaEnvironment
-              .performSubtypeCheck(
-                  flattenedExpressionType, emittedValueType!)
+              .performSubtypeCheck(flattenedExpressionType, emittedValueType!)
               .isSuccess()) {
         // It is a compile-time error if s is `return e;`, flatten(S) is not
         // void, S is not assignable to T_v, and flatten(S) is not a subtype

pkg/front_end/lib/src/type_inference/standard_bounds.dart

@@ -25,8 +25,7 @@ mixin TypeSchemaStandardBounds on StandardBounds {
   }
 
   @override
-  DartType getStandardLowerBoundInternal(
-      DartType type1, DartType type2) {
+  DartType getStandardLowerBoundInternal(DartType type1, DartType type2) {
     //  - We add the axiom that `DOWN(T, _) == T` and the symmetric version.
     if (type1 is UnknownType) return type2;
     if (type2 is UnknownType) return type1;
@@ -35,8 +34,7 @@ mixin TypeSchemaStandardBounds on StandardBounds {
   }
 
   @override
-  DartType getStandardUpperBoundInternal(
-      DartType type1, DartType type2) {
+  DartType getStandardUpperBoundInternal(DartType type1, DartType type2) {
     //  - We add the axiom that `UP(T, _) == T` and the symmetric version.
     if (type1 is UnknownType) return type2;
     if (type2 is UnknownType) return type1;

pkg/front_end/lib/src/type_inference/type_inference_engine.dart

@@ -719,8 +719,7 @@ class OperationsCfe
   bool isAssignableTo(SharedTypeView fromType, SharedTypeView toType) {
     if (fromType is DynamicType) return true;
     return typeEnvironment
-        .performSubtypeCheck(
-            fromType.unwrapTypeView(), toType.unwrapTypeView())
+        .performSubtypeCheck(fromType.unwrapTypeView(), toType.unwrapTypeView())
         .isSuccess();
   }
 
@@ -981,16 +980,14 @@ class OperationsCfe
   @override
   DartType greatestClosureOfTypeInternal(
       DartType type, List<SharedTypeParameter> typeParametersToEliminate) {
-    return new FreeTypeParameterEliminator(
-            coreTypes: typeEnvironment.coreTypes)
+    return new FreeTypeParameterEliminator(coreTypes: typeEnvironment.coreTypes)
         .eliminateToGreatest(type);
   }
 
   @override
   DartType leastClosureOfTypeInternal(
       DartType type, List<SharedTypeParameter> typeParametersToEliminate) {
-    return new FreeTypeParameterEliminator(
-            coreTypes: typeEnvironment.coreTypes)
+    return new FreeTypeParameterEliminator(coreTypes: typeEnvironment.coreTypes)
         .eliminateToLeast(type);
   }
 

pkg/front_end/messages.yaml

@@ -2907,17 +2907,6 @@ ConflictsWithImplicitSetterCause:
   problemMessage: "Field '#name' with the implicit setter."
   severity: CONTEXT
 
-ConflictsWithSetter:
-  problemMessage: "Conflicts with setter '#name'."
-  analyzerCode: CONFLICTS_WITH_MEMBER
-  script: |
-    void set foo(_) {}
-    int? foo;
-
-ConflictsWithSetterCause:
-  problemMessage: "Conflicting setter '#name'."
-  severity: CONTEXT
-
 ConflictsWithTypeParameter:
   problemMessage: "Conflicts with type variable '#name'."
   analyzerCode: CONFLICTING_TYPE_VARIABLE_AND_MEMBER

pkg/front_end/test/coverage_suite_expected.dart

@@ -520,7 +520,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/fragment/enum_element.dart": (
-    hitCount: 290,
+    hitCount: 287,
     missCount: 0,
   ),
   // 100.0%.
@@ -635,7 +635,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/fragment/primary_constructor_field.dart": (
-    hitCount: 130,
+    hitCount: 127,
     missCount: 0,
   ),
   // 100.0%.
@@ -1026,7 +1026,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/source/type_parameter_scope_builder.dart": (
-    hitCount: 1553,
+    hitCount: 1421,
     missCount: 0,
   ),
   // 100.0%.

pkg/front_end/testcases/enhanced_enums/missed_checks.dart

@@ -37,4 +37,28 @@ abstract class A2 extends SuperclassWithHashCode implements Enum {} // Error.
 
 abstract class A3 extends SuperclassWithValues implements Enum {} // Error.
 
+enum E4 {
+  E4
+}
+
+enum E5 {
+  a;
+  get E5 => null;
+}
+
+enum E6 {
+  a;
+  set E6(_) {}
+}
+
+enum E7 {
+  a;
+  E7() {}
+}
+
+enum E8 {
+  a;
+  factory E8.values() => a;
+}
+
 main() {}

pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.expect

@@ -2,6 +2,16 @@ library;
 //
 // Problems in library:
 //
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:46:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   get E5 => null;
+//       ^^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:51:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set E6(_) {}
+//       ^^
+//
 // pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
@@ -20,6 +30,15 @@ library;
 // enum values { // Error.
 //      ^^^^^^
 //
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:41:3: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   E4
+//   ^^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:56:3: Error: Generative enum constructors must be marked as 'const'.
+//   E7() {}
+//   ^
+//
 // pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
@@ -36,6 +55,23 @@ library;
 //   element;
 //   ^
 //
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:41:3: Error: Couldn't find constructor 'E4'.
+//   E4
+//   ^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:45:3: Error: Couldn't find constructor 'E5'.
+//   a;
+//   ^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:50:3: Error: Couldn't find constructor 'E6'.
+//   a;
+//   ^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:55:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+// Try using a constructor or factory that is 'const'.
+//   a;
+//   ^
+//
 import self as self;
 import "dart:core" as core;
 
@@ -111,6 +147,61 @@ abstract class A3 extends self::SuperclassWithValues implements core::Enum {
     : super self::SuperclassWithValues::•()
     ;
 }
+class E4 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E4 E4 = #C12;
+  static const field core::List<self::E4> values = #C13;
+  const synthetic constructor •(core::int #index, core::String #name) → self::E4
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E4.${this.{core::_Enum::_name}{core::String}}";
+}
+class E5 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E5 a = #C15;
+  static const field core::List<self::E5> values = #C16;
+  const synthetic constructor •(core::int #index, core::String #name) → self::E5
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E5.${this.{core::_Enum::_name}{core::String}}";
+  get E5() → dynamic
+    return null;
+}
+class E6 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E6 a = #C17;
+  static const field core::List<self::E6> values = #C18;
+  const synthetic constructor •(core::int #index, core::String #name) → self::E6
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E6.${this.{core::_Enum::_name}{core::String}}";
+  set E6(wildcard dynamic _#wc0#formal) → void {}
+}
+class E7 extends core::_Enum /*isEnum*/  {
+  enum-element static const field invalid-type a = invalid-expression "pkg/front_end/testcases/enhanced_enums/missed_checks.dart:55:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+Try using a constructor or factory that is 'const'.
+  a;
+  ^";
+  static const field core::List<self::E7> values = invalid-expression "pkg/front_end/testcases/enhanced_enums/missed_checks.dart:55:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+Try using a constructor or factory that is 'const'.
+  a;
+  ^";
+  constructor •(core::int #index, core::String #name) → self::E7
+    : super core::_Enum::•(#index, #name) {}
+  method core::_enumToString() → core::String
+    return "E7.${this.{core::_Enum::_name}{core::String}}";
+}
+class E8 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E8 a = #C19;
+  static const field core::List<self::E8> values = #C20;
+  const synthetic constructor •(core::int #index, core::String #name) → self::E8
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E8.${this.{core::_Enum::_name}{core::String}}";
+  static factory values() → self::E8
+    return #C19;
+}
 static method main() → dynamic {}
 
 constants  {
@@ -124,6 +215,16 @@ constants  {
   #C8 = <self::E3<dynamic>>[#C7]
   #C9 = self::values {index:#C1, _name:#C2}
   #C10 = <self::values>[#C9]
+  #C11 = "E4"
+  #C12 = self::E4 {index:#C1, _name:#C11}
+  #C13 = <self::E4>[#C12]
+  #C14 = "a"
+  #C15 = self::E5 {index:#C1, _name:#C14}
+  #C16 = <self::E5>[#C15]
+  #C17 = self::E6 {index:#C1, _name:#C14}
+  #C18 = <self::E6>[#C17]
+  #C19 = self::E8 {index:#C1, _name:#C14}
+  #C20 = <self::E8>[#C19]
 }
 
 
@@ -135,3 +236,7 @@ org-dartlang-testcase:///missed_checks.dart:
 - E2. (from org-dartlang-testcase:///missed_checks.dart:10:6)
 - E3. (from org-dartlang-testcase:///missed_checks.dart:14:6)
 - values. (from org-dartlang-testcase:///missed_checks.dart:18:6)
+- E4. (from org-dartlang-testcase:///missed_checks.dart:40:6)
+- E5. (from org-dartlang-testcase:///missed_checks.dart:44:6)
+- E6. (from org-dartlang-testcase:///missed_checks.dart:49:6)
+- E8. (from org-dartlang-testcase:///missed_checks.dart:59:6)

pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.modular.expect

@@ -2,6 +2,16 @@ library;
 //
 // Problems in library:
 //
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:46:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   get E5 => null;
+//       ^^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:51:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set E6(_) {}
+//       ^^
+//
 // pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
@@ -20,6 +30,15 @@ library;
 // enum values { // Error.
 //      ^^^^^^
 //
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:41:3: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   E4
+//   ^^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:56:3: Error: Generative enum constructors must be marked as 'const'.
+//   E7() {}
+//   ^
+//
 // pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
@@ -36,6 +55,23 @@ library;
 //   element;
 //   ^
 //
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:41:3: Error: Couldn't find constructor 'E4'.
+//   E4
+//   ^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:45:3: Error: Couldn't find constructor 'E5'.
+//   a;
+//   ^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:50:3: Error: Couldn't find constructor 'E6'.
+//   a;
+//   ^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:55:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+// Try using a constructor or factory that is 'const'.
+//   a;
+//   ^
+//
 import self as self;
 import "dart:core" as core;
 
@@ -111,6 +147,61 @@ abstract class A3 extends self::SuperclassWithValues implements core::Enum {
     : super self::SuperclassWithValues::•()
     ;
 }
+class E4 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E4 E4 = #C12;
+  static const field core::List<self::E4> values = #C13;
+  const synthetic constructor •(core::int #index, core::String #name) → self::E4
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E4.${this.{core::_Enum::_name}{core::String}}";
+}
+class E5 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E5 a = #C15;
+  static const field core::List<self::E5> values = #C16;
+  const synthetic constructor •(core::int #index, core::String #name) → self::E5
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E5.${this.{core::_Enum::_name}{core::String}}";
+  get E5() → dynamic
+    return null;
+}
+class E6 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E6 a = #C17;
+  static const field core::List<self::E6> values = #C18;
+  const synthetic constructor •(core::int #index, core::String #name) → self::E6
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E6.${this.{core::_Enum::_name}{core::String}}";
+  set E6(wildcard dynamic _#wc0#formal) → void {}
+}
+class E7 extends core::_Enum /*isEnum*/  {
+  enum-element static const field invalid-type a = invalid-expression "pkg/front_end/testcases/enhanced_enums/missed_checks.dart:55:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+Try using a constructor or factory that is 'const'.
+  a;
+  ^";
+  static const field core::List<self::E7> values = invalid-expression "pkg/front_end/testcases/enhanced_enums/missed_checks.dart:55:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+Try using a constructor or factory that is 'const'.
+  a;
+  ^";
+  constructor •(core::int #index, core::String #name) → self::E7
+    : super core::_Enum::•(#index, #name) {}
+  method core::_enumToString() → core::String
+    return "E7.${this.{core::_Enum::_name}{core::String}}";
+}
+class E8 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E8 a = #C19;
+  static const field core::List<self::E8> values = #C20;
+  const synthetic constructor •(core::int #index, core::String #name) → self::E8
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E8.${this.{core::_Enum::_name}{core::String}}";
+  static factory values() → self::E8
+    return #C19;
+}
 static method main() → dynamic {}
 
 constants  {
@@ -124,6 +215,16 @@ constants  {
   #C8 = <self::E3<dynamic>>[#C7]
   #C9 = self::values {index:#C1, _name:#C2}
   #C10 = <self::values>[#C9]
+  #C11 = "E4"
+  #C12 = self::E4 {index:#C1, _name:#C11}
+  #C13 = <self::E4>[#C12]
+  #C14 = "a"
+  #C15 = self::E5 {index:#C1, _name:#C14}
+  #C16 = <self::E5>[#C15]
+  #C17 = self::E6 {index:#C1, _name:#C14}
+  #C18 = <self::E6>[#C17]
+  #C19 = self::E8 {index:#C1, _name:#C14}
+  #C20 = <self::E8>[#C19]
 }
 
 
@@ -135,3 +236,7 @@ org-dartlang-testcase:///missed_checks.dart:
 - E2. (from org-dartlang-testcase:///missed_checks.dart:10:6)
 - E3. (from org-dartlang-testcase:///missed_checks.dart:14:6)
 - values. (from org-dartlang-testcase:///missed_checks.dart:18:6)
+- E4. (from org-dartlang-testcase:///missed_checks.dart:40:6)
+- E5. (from org-dartlang-testcase:///missed_checks.dart:44:6)
+- E6. (from org-dartlang-testcase:///missed_checks.dart:49:6)
+- E8. (from org-dartlang-testcase:///missed_checks.dart:59:6)

pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.outline.expect

@@ -2,6 +2,16 @@ library;
 //
 // Problems in library:
 //
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:46:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   get E5 => null;
+//       ^^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:51:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set E6(_) {}
+//       ^^
+//
 // pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
@@ -20,6 +30,15 @@ library;
 // enum values { // Error.
 //      ^^^^^^
 //
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:41:3: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   E4
+//   ^^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:56:3: Error: Generative enum constructors must be marked as 'const'.
+//   E7() {}
+//   ^
+//
 // pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
@@ -36,6 +55,23 @@ library;
 //   element;
 //   ^
 //
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:41:3: Error: Couldn't find constructor 'E4'.
+//   E4
+//   ^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:45:3: Error: Couldn't find constructor 'E5'.
+//   a;
+//   ^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:50:3: Error: Couldn't find constructor 'E6'.
+//   a;
+//   ^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:55:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+// Try using a constructor or factory that is 'const'.
+//   a;
+//   ^
+//
 import self as self;
 import "dart:core" as core;
 
@@ -105,6 +141,59 @@ abstract class A3 extends self::SuperclassWithValues implements core::Enum {
   synthetic constructor •() → self::A3
     ;
 }
+class E4 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E4 E4 = const self::E4::•(0, "E4");
+  static const field core::List<self::E4> values = const <self::E4>[self::E4::E4];
+  const synthetic constructor •(core::int #index, core::String #name) → self::E4
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E4.${this.{core::_Enum::_name}{core::String}}";
+}
+class E5 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E5 a = const self::E5::•(0, "a");
+  static const field core::List<self::E5> values = const <self::E5>[self::E5::a];
+  const synthetic constructor •(core::int #index, core::String #name) → self::E5
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E5.${this.{core::_Enum::_name}{core::String}}";
+  get E5() → dynamic
+    ;
+}
+class E6 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E6 a = const self::E6::•(0, "a");
+  static const field core::List<self::E6> values = const <self::E6>[self::E6::a];
+  const synthetic constructor •(core::int #index, core::String #name) → self::E6
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E6.${this.{core::_Enum::_name}{core::String}}";
+  set E6(wildcard dynamic _#wc0#formal) → void
+    ;
+}
+class E7 extends core::_Enum /*isEnum*/  {
+  enum-element static const field invalid-type a = invalid-expression "pkg/front_end/testcases/enhanced_enums/missed_checks.dart:55:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+Try using a constructor or factory that is 'const'.
+  a;
+  ^";
+  static const field core::List<self::E7> values = const <self::E7>[self::E7::a];
+  constructor •(core::int #index, core::String #name) → self::E7
+    ;
+  method core::_enumToString() → core::String
+    return "E7.${this.{core::_Enum::_name}{core::String}}";
+}
+class E8 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E8 a = const self::E8::•(0, "a");
+  static const field core::List<self::E8> values = const <self::E8>[self::E8::a];
+  const synthetic constructor •(core::int #index, core::String #name) → self::E8
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E8.${this.{core::_Enum::_name}{core::String}}";
+  static factory values() → self::E8
+    ;
+}
 static method main() → dynamic
   ;
 
@@ -118,4 +207,12 @@ Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:1
 Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:14:6 -> ListConstant(const <E3<dynamic>>[const E3<dynamic>{_Enum.index: 0, _Enum._name: "element"}])
 Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:19:3 -> InstanceConstant(const values{_Enum.index: 0, _Enum._name: "element"})
 Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:18:6 -> ListConstant(const <values>[const values{_Enum.index: 0, _Enum._name: "element"}])
-Extra constant evaluation: evaluated: 28, effectively constant: 8
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:41:3 -> InstanceConstant(const E4{_Enum.index: 0, _Enum._name: "E4"})
+Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:40:6 -> ListConstant(const <E4>[const E4{_Enum.index: 0, _Enum._name: "E4"}])
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:45:3 -> InstanceConstant(const E5{_Enum.index: 0, _Enum._name: "a"})
+Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:44:6 -> ListConstant(const <E5>[const E5{_Enum.index: 0, _Enum._name: "a"}])
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:50:3 -> InstanceConstant(const E6{_Enum.index: 0, _Enum._name: "a"})
+Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:49:6 -> ListConstant(const <E6>[const E6{_Enum.index: 0, _Enum._name: "a"}])
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:60:3 -> InstanceConstant(const E8{_Enum.index: 0, _Enum._name: "a"})
+Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:59:6 -> ListConstant(const <E8>[const E8{_Enum.index: 0, _Enum._name: "a"}])
+Extra constant evaluation: evaluated: 61, effectively constant: 16

pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.transformed.expect

@@ -2,6 +2,16 @@ library;
 //
 // Problems in library:
 //
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:46:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   get E5 => null;
+//       ^^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:51:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set E6(_) {}
+//       ^^
+//
 // pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
@@ -20,6 +30,15 @@ library;
 // enum values { // Error.
 //      ^^^^^^
 //
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:41:3: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   E4
+//   ^^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:56:3: Error: Generative enum constructors must be marked as 'const'.
+//   E7() {}
+//   ^
+//
 // pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
@@ -36,6 +55,23 @@ library;
 //   element;
 //   ^
 //
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:41:3: Error: Couldn't find constructor 'E4'.
+//   E4
+//   ^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:45:3: Error: Couldn't find constructor 'E5'.
+//   a;
+//   ^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:50:3: Error: Couldn't find constructor 'E6'.
+//   a;
+//   ^
+//
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:55:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+// Try using a constructor or factory that is 'const'.
+//   a;
+//   ^
+//
 import self as self;
 import "dart:core" as core;
 
@@ -111,6 +147,61 @@ abstract class A3 extends self::SuperclassWithValues implements core::Enum {
     : super self::SuperclassWithValues::•()
     ;
 }
+class E4 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E4 E4 = #C12;
+  static const field core::List<self::E4> values = #C13;
+  const synthetic constructor •(core::int #index, core::String #name) → self::E4
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E4.${this.{core::_Enum::_name}{core::String}}";
+}
+class E5 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E5 a = #C15;
+  static const field core::List<self::E5> values = #C16;
+  const synthetic constructor •(core::int #index, core::String #name) → self::E5
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E5.${this.{core::_Enum::_name}{core::String}}";
+  get E5() → dynamic
+    return null;
+}
+class E6 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E6 a = #C17;
+  static const field core::List<self::E6> values = #C18;
+  const synthetic constructor •(core::int #index, core::String #name) → self::E6
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E6.${this.{core::_Enum::_name}{core::String}}";
+  set E6(wildcard dynamic _#wc0#formal) → void {}
+}
+class E7 extends core::_Enum /*isEnum*/  {
+  enum-element static const field invalid-type a = invalid-expression "pkg/front_end/testcases/enhanced_enums/missed_checks.dart:55:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+Try using a constructor or factory that is 'const'.
+  a;
+  ^";
+  static const field core::List<self::E7> values = invalid-expression "pkg/front_end/testcases/enhanced_enums/missed_checks.dart:55:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+Try using a constructor or factory that is 'const'.
+  a;
+  ^";
+  constructor •(core::int #index, core::String #name) → self::E7
+    : super core::_Enum::•(#index, #name) {}
+  method core::_enumToString() → core::String
+    return "E7.${this.{core::_Enum::_name}{core::String}}";
+}
+class E8 extends core::_Enum /*isEnum*/  {
+  enum-element static const field self::E8 a = #C19;
+  static const field core::List<self::E8> values = #C20;
+  const synthetic constructor •(core::int #index, core::String #name) → self::E8
+    : super core::_Enum::•(#index, #name)
+    ;
+  method core::_enumToString() → core::String
+    return "E8.${this.{core::_Enum::_name}{core::String}}";
+  static factory values() → self::E8
+    return #C19;
+}
 static method main() → dynamic {}
 
 constants  {
@@ -124,6 +215,16 @@ constants  {
   #C8 = <self::E3<dynamic>>[#C7]
   #C9 = self::values {index:#C1, _name:#C2}
   #C10 = <self::values>[#C9]
+  #C11 = "E4"
+  #C12 = self::E4 {index:#C1, _name:#C11}
+  #C13 = <self::E4>[#C12]
+  #C14 = "a"
+  #C15 = self::E5 {index:#C1, _name:#C14}
+  #C16 = <self::E5>[#C15]
+  #C17 = self::E6 {index:#C1, _name:#C14}
+  #C18 = <self::E6>[#C17]
+  #C19 = self::E8 {index:#C1, _name:#C14}
+  #C20 = <self::E8>[#C19]
 }
 
 
@@ -135,3 +236,7 @@ org-dartlang-testcase:///missed_checks.dart:
 - E2. (from org-dartlang-testcase:///missed_checks.dart:10:6)
 - E3. (from org-dartlang-testcase:///missed_checks.dart:14:6)
 - values. (from org-dartlang-testcase:///missed_checks.dart:18:6)
+- E4. (from org-dartlang-testcase:///missed_checks.dart:40:6)
+- E5. (from org-dartlang-testcase:///missed_checks.dart:44:6)
+- E6. (from org-dartlang-testcase:///missed_checks.dart:49:6)
+- E8. (from org-dartlang-testcase:///missed_checks.dart:59:6)

pkg/front_end/testcases/enhanced_enums/missed_checks.dart.textual_outline.expect

@@ -1,18 +1,10 @@
-enum E1 {
-  element.new();
-}
+enum E1 { element.new(); }
 
-enum E2<values> {
-  element;
-}
+enum E2<values> { element; }
 
-enum E3<element> {
-  element;
-}
+enum E3<element> { element; }
 
-enum values {
-  element;
-}
+enum values { element; }
 
 abstract class SuperclassWithEquals {
   bool operator ==(Object other) => true;
@@ -32,4 +24,14 @@ abstract class A2 extends SuperclassWithHashCode implements Enum {}
 
 abstract class A3 extends SuperclassWithValues implements Enum {}
 
+enum E4 { E4 }
+
+enum E5 { a; get E5 => null; }
+
+enum E6 { a; set E6(_) {} }
+
+enum E7 { a; E7() {} }
+
+enum E8 { a; factory E8.values() => a; }
+
 main() {}

pkg/front_end/testcases/enhanced_enums/missed_checks.dart.textual_outline_modelled.expect

@@ -16,20 +16,22 @@ abstract class SuperclassWithValues {
   Never get values => throw 0;
 }
 
-enum E1 {
-  element.new();
-}
+enum E1 { element.new(); }
 
-enum E2<values> {
-  element;
-}
+enum E2<values> { element; }
 
-enum E3<element> {
-  element;
-}
+enum E3<element> { element; }
 
-enum values {
-  element;
-}
+enum E4 { E4 }
+
+enum E5 { a; get E5 => null; }
+
+enum E6 { a; set E6(_) {} }
+
+enum E7 { a; E7() {} }
+
+enum E8 { a; factory E8.values() => a; }
+
+enum values { element; }
 
 main() {}

pkg/front_end/testcases/general/static_vs_instance.dart.strong.expect

@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/static_vs_instance.dart:7:14: Error: Conflicts with setter 's5'.
+// pkg/front_end/testcases/general/static_vs_instance.dart:7:14: Error: The declaration conflicts with setter 's5'.
 //   static int s5 = 1;
 //              ^^
 // pkg/front_end/testcases/general/static_vs_instance.dart:6:7: Context: Conflicting setter 's5'.

pkg/front_end/testcases/general/static_vs_instance.dart.strong.modular.expect

@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/static_vs_instance.dart:7:14: Error: Conflicts with setter 's5'.
+// pkg/front_end/testcases/general/static_vs_instance.dart:7:14: Error: The declaration conflicts with setter 's5'.
 //   static int s5 = 1;
 //              ^^
 // pkg/front_end/testcases/general/static_vs_instance.dart:6:7: Context: Conflicting setter 's5'.

pkg/front_end/testcases/general/static_vs_instance.dart.strong.outline.expect

@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/static_vs_instance.dart:7:14: Error: Conflicts with setter 's5'.
+// pkg/front_end/testcases/general/static_vs_instance.dart:7:14: Error: The declaration conflicts with setter 's5'.
 //   static int s5 = 1;
 //              ^^
 // pkg/front_end/testcases/general/static_vs_instance.dart:6:7: Context: Conflicting setter 's5'.

pkg/front_end/testcases/general/static_vs_instance.dart.strong.transformed.expect

@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/static_vs_instance.dart:7:14: Error: Conflicts with setter 's5'.
+// pkg/front_end/testcases/general/static_vs_instance.dart:7:14: Error: The declaration conflicts with setter 's5'.
 //   static int s5 = 1;
 //              ^^
 // pkg/front_end/testcases/general/static_vs_instance.dart:6:7: Context: Conflicting setter 's5'.

pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.expect

@@ -37,7 +37,7 @@ library;
 //   int instanceFieldAndSetter1 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:24:7: Error: Conflicts with setter 'instanceFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:24:7: Error: The declaration conflicts with setter 'instanceFieldAndSetter2'.
 //   int instanceFieldAndSetter2 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance.dart:22:12: Context: Conflicting setter 'instanceFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 //   late final int instanceLateFinalFieldAndSetter1;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:31:18: Error: Conflicts with setter 'instanceLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:31:18: Error: The declaration conflicts with setter 'instanceLateFinalFieldAndSetter2'.
 //   late final int instanceLateFinalFieldAndSetter2;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance.dart:29:12: Context: Conflicting setter 'instanceLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.modular.expect

@@ -37,7 +37,7 @@ library;
 //   int instanceFieldAndSetter1 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:24:7: Error: Conflicts with setter 'instanceFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:24:7: Error: The declaration conflicts with setter 'instanceFieldAndSetter2'.
 //   int instanceFieldAndSetter2 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance.dart:22:12: Context: Conflicting setter 'instanceFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 //   late final int instanceLateFinalFieldAndSetter1;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:31:18: Error: Conflicts with setter 'instanceLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:31:18: Error: The declaration conflicts with setter 'instanceLateFinalFieldAndSetter2'.
 //   late final int instanceLateFinalFieldAndSetter2;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance.dart:29:12: Context: Conflicting setter 'instanceLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.outline.expect

@@ -37,7 +37,7 @@ library;
 //   int instanceFieldAndSetter1 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:24:7: Error: Conflicts with setter 'instanceFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:24:7: Error: The declaration conflicts with setter 'instanceFieldAndSetter2'.
 //   int instanceFieldAndSetter2 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance.dart:22:12: Context: Conflicting setter 'instanceFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 //   late final int instanceLateFinalFieldAndSetter1;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:31:18: Error: Conflicts with setter 'instanceLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:31:18: Error: The declaration conflicts with setter 'instanceLateFinalFieldAndSetter2'.
 //   late final int instanceLateFinalFieldAndSetter2;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance.dart:29:12: Context: Conflicting setter 'instanceLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.transformed.expect

@@ -37,7 +37,7 @@ library;
 //   int instanceFieldAndSetter1 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:24:7: Error: Conflicts with setter 'instanceFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:24:7: Error: The declaration conflicts with setter 'instanceFieldAndSetter2'.
 //   int instanceFieldAndSetter2 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance.dart:22:12: Context: Conflicting setter 'instanceFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 //   late final int instanceLateFinalFieldAndSetter1;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance.dart:31:18: Error: Conflicts with setter 'instanceLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance.dart:31:18: Error: The declaration conflicts with setter 'instanceLateFinalFieldAndSetter2'.
 //   late final int instanceLateFinalFieldAndSetter2;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance.dart:29:12: Context: Conflicting setter 'instanceLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.expect

@@ -92,7 +92,7 @@ library;
 //   int instanceFieldAndSetter1 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:23:7: Error: Conflicts with setter 'instanceFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:23:7: Error: The declaration conflicts with setter 'instanceFieldAndSetter2'.
 //   int instanceFieldAndSetter2 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:22:12: Context: Conflicting setter 'instanceFieldAndSetter2'.
@@ -106,7 +106,7 @@ library;
 //   late final int instanceLateFinalFieldAndSetter1;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:29:18: Error: Conflicts with setter 'instanceLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:29:18: Error: The declaration conflicts with setter 'instanceLateFinalFieldAndSetter2'.
 //   late final int instanceLateFinalFieldAndSetter2;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:28:12: Context: Conflicting setter 'instanceLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.modular.expect

@@ -92,7 +92,7 @@ library;
 //   int instanceFieldAndSetter1 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:23:7: Error: Conflicts with setter 'instanceFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:23:7: Error: The declaration conflicts with setter 'instanceFieldAndSetter2'.
 //   int instanceFieldAndSetter2 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:22:12: Context: Conflicting setter 'instanceFieldAndSetter2'.
@@ -106,7 +106,7 @@ library;
 //   late final int instanceLateFinalFieldAndSetter1;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:29:18: Error: Conflicts with setter 'instanceLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:29:18: Error: The declaration conflicts with setter 'instanceLateFinalFieldAndSetter2'.
 //   late final int instanceLateFinalFieldAndSetter2;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:28:12: Context: Conflicting setter 'instanceLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.outline.expect

@@ -92,7 +92,7 @@ library;
 //   int instanceFieldAndSetter1 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:23:7: Error: Conflicts with setter 'instanceFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:23:7: Error: The declaration conflicts with setter 'instanceFieldAndSetter2'.
 //   int instanceFieldAndSetter2 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:22:12: Context: Conflicting setter 'instanceFieldAndSetter2'.
@@ -106,7 +106,7 @@ library;
 //   late final int instanceLateFinalFieldAndSetter1;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:29:18: Error: Conflicts with setter 'instanceLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:29:18: Error: The declaration conflicts with setter 'instanceLateFinalFieldAndSetter2'.
 //   late final int instanceLateFinalFieldAndSetter2;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:28:12: Context: Conflicting setter 'instanceLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.transformed.expect

@@ -92,7 +92,7 @@ library;
 //   int instanceFieldAndSetter1 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:23:7: Error: Conflicts with setter 'instanceFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:23:7: Error: The declaration conflicts with setter 'instanceFieldAndSetter2'.
 //   int instanceFieldAndSetter2 = 1;
 //       ^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:22:12: Context: Conflicting setter 'instanceFieldAndSetter2'.
@@ -106,7 +106,7 @@ library;
 //   late final int instanceLateFinalFieldAndSetter1;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:29:18: Error: Conflicts with setter 'instanceLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:29:18: Error: The declaration conflicts with setter 'instanceLateFinalFieldAndSetter2'.
 //   late final int instanceLateFinalFieldAndSetter2;
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart:28:12: Context: Conflicting setter 'instanceLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.expect

@@ -37,7 +37,7 @@ library;
 //   static int staticFieldAndSetter1 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static.dart:24:14: Error: Conflicts with setter 'staticFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static.dart:24:14: Error: The declaration conflicts with setter 'staticFieldAndSetter2'.
 //   static int staticFieldAndSetter2 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static.dart:22:19: Context: Conflicting setter 'staticFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 //   static late final int staticLateFinalFieldAndSetter1;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static.dart:31:25: Error: Conflicts with setter 'staticLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static.dart:31:25: Error: The declaration conflicts with setter 'staticLateFinalFieldAndSetter2'.
 //   static late final int staticLateFinalFieldAndSetter2;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static.dart:29:19: Context: Conflicting setter 'staticLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.modular.expect

@@ -37,7 +37,7 @@ library;
 //   static int staticFieldAndSetter1 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static.dart:24:14: Error: Conflicts with setter 'staticFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static.dart:24:14: Error: The declaration conflicts with setter 'staticFieldAndSetter2'.
 //   static int staticFieldAndSetter2 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static.dart:22:19: Context: Conflicting setter 'staticFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 //   static late final int staticLateFinalFieldAndSetter1;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static.dart:31:25: Error: Conflicts with setter 'staticLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static.dart:31:25: Error: The declaration conflicts with setter 'staticLateFinalFieldAndSetter2'.
 //   static late final int staticLateFinalFieldAndSetter2;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static.dart:29:19: Context: Conflicting setter 'staticLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.outline.expect

@@ -37,7 +37,7 @@ library;
 //   static int staticFieldAndSetter1 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static.dart:24:14: Error: Conflicts with setter 'staticFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static.dart:24:14: Error: The declaration conflicts with setter 'staticFieldAndSetter2'.
 //   static int staticFieldAndSetter2 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static.dart:22:19: Context: Conflicting setter 'staticFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 //   static late final int staticLateFinalFieldAndSetter1;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static.dart:31:25: Error: Conflicts with setter 'staticLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static.dart:31:25: Error: The declaration conflicts with setter 'staticLateFinalFieldAndSetter2'.
 //   static late final int staticLateFinalFieldAndSetter2;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static.dart:29:19: Context: Conflicting setter 'staticLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.transformed.expect

@@ -37,7 +37,7 @@ library;
 //   static int staticFieldAndSetter1 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static.dart:24:14: Error: Conflicts with setter 'staticFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static.dart:24:14: Error: The declaration conflicts with setter 'staticFieldAndSetter2'.
 //   static int staticFieldAndSetter2 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static.dart:22:19: Context: Conflicting setter 'staticFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 //   static late final int staticLateFinalFieldAndSetter1;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static.dart:31:25: Error: Conflicts with setter 'staticLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static.dart:31:25: Error: The declaration conflicts with setter 'staticLateFinalFieldAndSetter2'.
 //   static late final int staticLateFinalFieldAndSetter2;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static.dart:29:19: Context: Conflicting setter 'staticLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.expect

@@ -37,7 +37,7 @@ library;
 //   static int staticFieldAndSetter1 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:24:14: Error: Conflicts with setter 'staticFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:24:14: Error: The declaration conflicts with setter 'staticFieldAndSetter2'.
 //   static int staticFieldAndSetter2 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:22:19: Context: Conflicting setter 'staticFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 //   static late final int staticLateFinalFieldAndSetter1;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:31:25: Error: Conflicts with setter 'staticLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:31:25: Error: The declaration conflicts with setter 'staticLateFinalFieldAndSetter2'.
 //   static late final int staticLateFinalFieldAndSetter2;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:29:19: Context: Conflicting setter 'staticLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.modular.expect

@@ -37,7 +37,7 @@ library;
 //   static int staticFieldAndSetter1 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:24:14: Error: Conflicts with setter 'staticFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:24:14: Error: The declaration conflicts with setter 'staticFieldAndSetter2'.
 //   static int staticFieldAndSetter2 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:22:19: Context: Conflicting setter 'staticFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 //   static late final int staticLateFinalFieldAndSetter1;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:31:25: Error: Conflicts with setter 'staticLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:31:25: Error: The declaration conflicts with setter 'staticLateFinalFieldAndSetter2'.
 //   static late final int staticLateFinalFieldAndSetter2;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:29:19: Context: Conflicting setter 'staticLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.outline.expect

@@ -37,7 +37,7 @@ library;
 //   static int staticFieldAndSetter1 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:24:14: Error: Conflicts with setter 'staticFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:24:14: Error: The declaration conflicts with setter 'staticFieldAndSetter2'.
 //   static int staticFieldAndSetter2 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:22:19: Context: Conflicting setter 'staticFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 //   static late final int staticLateFinalFieldAndSetter1;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:31:25: Error: Conflicts with setter 'staticLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:31:25: Error: The declaration conflicts with setter 'staticLateFinalFieldAndSetter2'.
 //   static late final int staticLateFinalFieldAndSetter2;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:29:19: Context: Conflicting setter 'staticLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.transformed.expect

@@ -37,7 +37,7 @@ library;
 //   static int staticFieldAndSetter1 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:24:14: Error: Conflicts with setter 'staticFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:24:14: Error: The declaration conflicts with setter 'staticFieldAndSetter2'.
 //   static int staticFieldAndSetter2 = 1;
 //              ^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:22:19: Context: Conflicting setter 'staticFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 //   static late final int staticLateFinalFieldAndSetter1;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:31:25: Error: Conflicts with setter 'staticLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:31:25: Error: The declaration conflicts with setter 'staticLateFinalFieldAndSetter2'.
 //   static late final int staticLateFinalFieldAndSetter2;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_static_extension.dart:29:19: Context: Conflicting setter 'staticLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.expect

@@ -37,7 +37,7 @@ library;
 // int topLevelFieldAndSetter1 = 1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:25:5: Error: Conflicts with setter 'topLevelFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:25:5: Error: The declaration conflicts with setter 'topLevelFieldAndSetter2'.
 // int topLevelFieldAndSetter2 = 1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:23:10: Context: Conflicting setter 'topLevelFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 // late final int topLevelLateFinalFieldAndSetter1;
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:32:16: Error: Conflicts with setter 'topLevelLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:32:16: Error: The declaration conflicts with setter 'topLevelLateFinalFieldAndSetter2'.
 // late final int topLevelLateFinalFieldAndSetter2;
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:30:10: Context: Conflicting setter 'topLevelLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.modular.expect

@@ -37,7 +37,7 @@ library;
 // int topLevelFieldAndSetter1 = 1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:25:5: Error: Conflicts with setter 'topLevelFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:25:5: Error: The declaration conflicts with setter 'topLevelFieldAndSetter2'.
 // int topLevelFieldAndSetter2 = 1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:23:10: Context: Conflicting setter 'topLevelFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 // late final int topLevelLateFinalFieldAndSetter1;
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:32:16: Error: Conflicts with setter 'topLevelLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:32:16: Error: The declaration conflicts with setter 'topLevelLateFinalFieldAndSetter2'.
 // late final int topLevelLateFinalFieldAndSetter2;
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:30:10: Context: Conflicting setter 'topLevelLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.outline.expect

@@ -37,7 +37,7 @@ library;
 // int topLevelFieldAndSetter1 = 1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:25:5: Error: Conflicts with setter 'topLevelFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:25:5: Error: The declaration conflicts with setter 'topLevelFieldAndSetter2'.
 // int topLevelFieldAndSetter2 = 1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:23:10: Context: Conflicting setter 'topLevelFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 // late final int topLevelLateFinalFieldAndSetter1;
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:32:16: Error: Conflicts with setter 'topLevelLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:32:16: Error: The declaration conflicts with setter 'topLevelLateFinalFieldAndSetter2'.
 // late final int topLevelLateFinalFieldAndSetter2;
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:30:10: Context: Conflicting setter 'topLevelLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.transformed.expect

@@ -37,7 +37,7 @@ library;
 // int topLevelFieldAndSetter1 = 1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:25:5: Error: Conflicts with setter 'topLevelFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:25:5: Error: The declaration conflicts with setter 'topLevelFieldAndSetter2'.
 // int topLevelFieldAndSetter2 = 1;
 //     ^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:23:10: Context: Conflicting setter 'topLevelFieldAndSetter2'.
@@ -51,7 +51,7 @@ library;
 // late final int topLevelLateFinalFieldAndSetter1;
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:32:16: Error: Conflicts with setter 'topLevelLateFinalFieldAndSetter2'.
+// pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:32:16: Error: The declaration conflicts with setter 'topLevelLateFinalFieldAndSetter2'.
 // late final int topLevelLateFinalFieldAndSetter2;
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/duplicates_toplevel.dart:30:10: Context: Conflicting setter 'topLevelLateFinalFieldAndSetter2'.

pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.expect

@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/field_setter_conflict_part.dart:39:6: Error: Conflicts with setter 'topLevelFieldInPartSetterInMain'.
+// pkg/front_end/testcases/nnbd/field_setter_conflict_part.dart:39:6: Error: The declaration conflicts with setter 'topLevelFieldInPartSetterInMain'.
 // int? topLevelFieldInPartSetterInMain;
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/field_setter_conflict.dart:7:10: Context: Conflicting setter 'topLevelFieldInPartSetterInMain'.

pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.modular.expect

@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/field_setter_conflict_part.dart:39:6: Error: Conflicts with setter 'topLevelFieldInPartSetterInMain'.
+// pkg/front_end/testcases/nnbd/field_setter_conflict_part.dart:39:6: Error: The declaration conflicts with setter 'topLevelFieldInPartSetterInMain'.
 // int? topLevelFieldInPartSetterInMain;
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/field_setter_conflict.dart:7:10: Context: Conflicting setter 'topLevelFieldInPartSetterInMain'.

pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.outline.expect

@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/field_setter_conflict_part.dart:39:6: Error: Conflicts with setter 'topLevelFieldInPartSetterInMain'.
+// pkg/front_end/testcases/nnbd/field_setter_conflict_part.dart:39:6: Error: The declaration conflicts with setter 'topLevelFieldInPartSetterInMain'.
 // int? topLevelFieldInPartSetterInMain;
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/field_setter_conflict.dart:7:10: Context: Conflicting setter 'topLevelFieldInPartSetterInMain'.

pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.transformed.expect

@@ -2,7 +2,7 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/field_setter_conflict_part.dart:39:6: Error: Conflicts with setter 'topLevelFieldInPartSetterInMain'.
+// pkg/front_end/testcases/nnbd/field_setter_conflict_part.dart:39:6: Error: The declaration conflicts with setter 'topLevelFieldInPartSetterInMain'.
 // int? topLevelFieldInPartSetterInMain;
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/field_setter_conflict.dart:7:10: Context: Conflicting setter 'topLevelFieldInPartSetterInMain'.

pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.expect

@@ -84,7 +84,7 @@ library;
 //   void set methodAndFieldAndSetter3(int? value) {}
 //            ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:28:8: Error: Conflicts with setter 'methodAndFieldAndSetter3'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:28:8: Error: The declaration conflicts with setter 'methodAndFieldAndSetter3'.
 //   int? methodAndFieldAndSetter3;
 //        ^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/instance_duplicates.dart:26:12: Context: Conflicting setter 'methodAndFieldAndSetter3'.
@@ -98,7 +98,7 @@ library;
 //   int? methodAndFieldAndSetter3() {}
 //        ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:31:8: Error: Conflicts with setter 'methodAndFieldAndSetter4'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:31:8: Error: The declaration conflicts with setter 'methodAndFieldAndSetter4'.
 //   int? methodAndFieldAndSetter4;
 //        ^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/instance_duplicates.dart:30:12: Context: Conflicting setter 'methodAndFieldAndSetter4'.
@@ -203,7 +203,7 @@ library;
 //   final int? fieldAndFinalFieldAndSetter2 = 0;
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:71:8: Error: Conflicts with setter 'fieldAndFinalFieldAndSetter3'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:71:8: Error: The declaration conflicts with setter 'fieldAndFinalFieldAndSetter3'.
 //   int? fieldAndFinalFieldAndSetter3;
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/instance_duplicates.dart:70:12: Context: Conflicting setter 'fieldAndFinalFieldAndSetter3'.

pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.modular.expect

@@ -84,7 +84,7 @@ library;
 //   void set methodAndFieldAndSetter3(int? value) {}
 //            ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:28:8: Error: Conflicts with setter 'methodAndFieldAndSetter3'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:28:8: Error: The declaration conflicts with setter 'methodAndFieldAndSetter3'.
 //   int? methodAndFieldAndSetter3;
 //        ^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/instance_duplicates.dart:26:12: Context: Conflicting setter 'methodAndFieldAndSetter3'.
@@ -98,7 +98,7 @@ library;
 //   int? methodAndFieldAndSetter3() {}
 //        ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:31:8: Error: Conflicts with setter 'methodAndFieldAndSetter4'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:31:8: Error: The declaration conflicts with setter 'methodAndFieldAndSetter4'.
 //   int? methodAndFieldAndSetter4;
 //        ^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/instance_duplicates.dart:30:12: Context: Conflicting setter 'methodAndFieldAndSetter4'.
@@ -203,7 +203,7 @@ library;
 //   final int? fieldAndFinalFieldAndSetter2 = 0;
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:71:8: Error: Conflicts with setter 'fieldAndFinalFieldAndSetter3'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:71:8: Error: The declaration conflicts with setter 'fieldAndFinalFieldAndSetter3'.
 //   int? fieldAndFinalFieldAndSetter3;
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/instance_duplicates.dart:70:12: Context: Conflicting setter 'fieldAndFinalFieldAndSetter3'.

pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.outline.expect

@@ -84,7 +84,7 @@ library;
 //   void set methodAndFieldAndSetter3(int? value) {}
 //            ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:28:8: Error: Conflicts with setter 'methodAndFieldAndSetter3'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:28:8: Error: The declaration conflicts with setter 'methodAndFieldAndSetter3'.
 //   int? methodAndFieldAndSetter3;
 //        ^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/instance_duplicates.dart:26:12: Context: Conflicting setter 'methodAndFieldAndSetter3'.
@@ -98,7 +98,7 @@ library;
 //   int? methodAndFieldAndSetter3() {}
 //        ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:31:8: Error: Conflicts with setter 'methodAndFieldAndSetter4'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:31:8: Error: The declaration conflicts with setter 'methodAndFieldAndSetter4'.
 //   int? methodAndFieldAndSetter4;
 //        ^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/instance_duplicates.dart:30:12: Context: Conflicting setter 'methodAndFieldAndSetter4'.
@@ -203,7 +203,7 @@ library;
 //   final int? fieldAndFinalFieldAndSetter2 = 0;
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:71:8: Error: Conflicts with setter 'fieldAndFinalFieldAndSetter3'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:71:8: Error: The declaration conflicts with setter 'fieldAndFinalFieldAndSetter3'.
 //   int? fieldAndFinalFieldAndSetter3;
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/instance_duplicates.dart:70:12: Context: Conflicting setter 'fieldAndFinalFieldAndSetter3'.

pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.transformed.expect

@@ -84,7 +84,7 @@ library;
 //   void set methodAndFieldAndSetter3(int? value) {}
 //            ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:28:8: Error: Conflicts with setter 'methodAndFieldAndSetter3'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:28:8: Error: The declaration conflicts with setter 'methodAndFieldAndSetter3'.
 //   int? methodAndFieldAndSetter3;
 //        ^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/instance_duplicates.dart:26:12: Context: Conflicting setter 'methodAndFieldAndSetter3'.
@@ -98,7 +98,7 @@ library;
 //   int? methodAndFieldAndSetter3() {}
 //        ^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:31:8: Error: Conflicts with setter 'methodAndFieldAndSetter4'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:31:8: Error: The declaration conflicts with setter 'methodAndFieldAndSetter4'.
 //   int? methodAndFieldAndSetter4;
 //        ^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/instance_duplicates.dart:30:12: Context: Conflicting setter 'methodAndFieldAndSetter4'.
@@ -203,7 +203,7 @@ library;
 //   final int? fieldAndFinalFieldAndSetter2 = 0;
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/instance_duplicates.dart:71:8: Error: Conflicts with setter 'fieldAndFinalFieldAndSetter3'.
+// pkg/front_end/testcases/nnbd/instance_duplicates.dart:71:8: Error: The declaration conflicts with setter 'fieldAndFinalFieldAndSetter3'.
 //   int? fieldAndFinalFieldAndSetter3;
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 // pkg/front_end/testcases/nnbd/instance_duplicates.dart:70:12: Context: Conflicting setter 'fieldAndFinalFieldAndSetter3'.