diff --git a/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart b/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart index ab7b6ba51b4..8efb7d1ba1d 100644 --- a/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart +++ b/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 templateConflictsWithSetter = - const Template( - "ConflictsWithSetter", - problemMessageTemplate: r"""Conflicts with setter '#name'.""", - withArguments: _withArgumentsConflictsWithSetter, -); - -// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE. -const Code codeConflictsWithSetter = - const Code( - "ConflictsWithSetter", - analyzerCodes: ["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 templateConflictsWithSetterCause = - const Template( - "ConflictsWithSetterCause", - problemMessageTemplate: r"""Conflicting setter '#name'.""", - withArguments: _withArgumentsConflictsWithSetterCause, -); - -// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE. -const Code codeConflictsWithSetterCause = - const Code( - "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 templateConflictsWithTypeParameter = diff --git a/pkg/front_end/lib/src/fragment/enum_element.dart b/pkg/front_end/lib/src/fragment/enum_element.dart index f20411b55e8..3a6a1dccd3a 100644 --- a/pkg/front_end/lib/src/fragment/enum_element.dart +++ b/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 diff --git a/pkg/front_end/lib/src/fragment/primary_constructor_field.dart b/pkg/front_end/lib/src/fragment/primary_constructor_field.dart index 115a1700fc6..c17c10075c0 100644 --- a/pkg/front_end/lib/src/fragment/primary_constructor_field.dart +++ b/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. diff --git a/pkg/front_end/lib/src/source/source_class_builder.dart b/pkg/front_end/lib/src/source/source_class_builder.dart index afb56ecf64b..d5aab0b8eb9 100644 --- a/pkg/front_end/lib/src/source/source_class_builder.dart +++ b/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, diff --git a/pkg/front_end/lib/src/source/type_parameter_scope_builder.dart b/pkg/front_end/lib/src/source/type_parameter_scope_builder.dart index 0ed022a5bf0..41ea3edf345 100644 --- a/pkg/front_end/lib/src/source/type_parameter_scope_builder.dart +++ b/pkg/front_end/lib/src/source/type_parameter_scope_builder.dart @@ -114,6 +114,88 @@ abstract class _Declaration { ProblemReporting problemReporting, List<_PreBuilder> nonConstructorPreBuilders, List<_PreBuilder> constructorPreBuilders); + + /// Reports that [declaration] conflicts with this declaration. + void reportDuplicateDeclaration( + ProblemReporting problemReporting, _Declaration declaration); + + void reportConstructorConflict( + ProblemReporting problemReporting, _Declaration declaration); +} + +mixin _DeclarationReportingMixin implements _Declaration { + @override + void reportDuplicateDeclaration( + ProblemReporting problemReporting, _Declaration declaration) { + // TODO(johnniwinther): Mark [declaration] as a duplicate so we don't + // report duplicates on duplicates. + _reportDuplicateDeclaration(problemReporting, + name: displayName, + existingUriOffset: uriOffset, + newUriOffset: declaration.uriOffset, + existingKind: _getExistingKindForDuplicate(declaration), + newIsSetter: declaration is _PropertyDeclaration && + declaration.propertyKind == _PropertyKind.Setter); + } + + _ExistingKind _getExistingKindForDuplicate(_Declaration declaration) => + _ExistingKind.Getable; + + void _reportDuplicateDeclaration( + ProblemReporting problemReporting, { + required String name, + required UriOffsetLength existingUriOffset, + required UriOffsetLength newUriOffset, + required _ExistingKind existingKind, + required bool newIsSetter, + }) { + switch (existingKind) { + case _ExistingKind.Getable: + if (newIsSetter) { + problemReporting.addProblem2( + templateSetterConflictsWithDeclaration.withArguments(name), + newUriOffset, + context: [ + templateSetterConflictsWithDeclarationCause + .withArguments(name) + .withLocation2(existingUriOffset) + ]); + return; + } + break; + case _ExistingKind.ExplicitSetter: + if (!newIsSetter) { + problemReporting.addProblem2( + templateDeclarationConflictsWithSetter.withArguments(name), + newUriOffset, + context: [ + templateDeclarationConflictsWithSetterCause + .withArguments(name) + .withLocation2(existingUriOffset) + ]); + return; + } + break; + case _ExistingKind.ImplicitSetter: + problemReporting.addProblem2( + templateConflictsWithImplicitSetter.withArguments(name), + newUriOffset, + context: [ + templateConflictsWithImplicitSetterCause + .withArguments(name) + .withLocation2(existingUriOffset) + ]); + return; + } + + problemReporting.addProblem2( + templateDuplicatedDeclaration.withArguments(name), newUriOffset, + context: [ + templateDuplicatedDeclarationCause + .withArguments(name) + .withLocation2(existingUriOffset) + ]); + } } mixin _FragmentDeclarationMixin implements _Declaration { @@ -142,6 +224,46 @@ abstract class _NonConstructorDeclaration extends _Declaration { _addPreBuilder( problemReporting, nonConstructorPreBuilders, constructorPreBuilders); } + + @override + void reportConstructorConflict( + ProblemReporting problemReporting, _Declaration constructorDeclaration) { + if (constructorDeclaration.kind == _DeclarationKind.Constructor) { + // Example: + // + // class A { + // static int get foo => 42; + // A.foo(); + // } + // + problemReporting.addProblem2( + templateConstructorConflictsWithMember.withArguments(displayName), + constructorDeclaration.uriOffset, + context: [ + templateConstructorConflictsWithMemberCause + .withArguments(displayName) + .withLocation2(uriOffset) + ]); + } else { + assert(constructorDeclaration.kind == _DeclarationKind.Factory, + "Unexpected constructor kind $constructorDeclaration"); + // Example: + // + // class A { + // static int get foo => 42; + // factory A.foo() => throw ''; + // } + // + problemReporting.addProblem2( + templateFactoryConflictsWithMember.withArguments(displayName), + constructorDeclaration.uriOffset, + context: [ + templateFactoryConflictsWithMemberCause + .withArguments(displayName) + .withLocation2(uriOffset) + ]); + } + } } abstract class _PropertyDeclaration extends _NonConstructorDeclaration { @@ -161,9 +283,33 @@ abstract class _PropertyDeclaration extends _NonConstructorDeclaration { required this.uriOffset, super.isStatic}) : super(_DeclarationKind.Property); + + void reportStaticInstanceConflict( + ProblemReporting problemReporting, _PropertyDeclaration declaration) { + if (isStatic) { + problemReporting.addProblem2( + templateInstanceConflictsWithStatic.withArguments(displayName), + declaration.uriOffset, + context: [ + templateInstanceConflictsWithStaticCause + .withArguments(displayName) + .withLocation2(uriOffset) + ]); + } else { + problemReporting.addProblem2( + templateStaticConflictsWithInstance.withArguments(displayName), + declaration.uriOffset, + context: [ + templateStaticConflictsWithInstanceCause + .withArguments(displayName) + .withLocation2(uriOffset) + ]); + } + } } -class _FieldDeclaration extends _PropertyDeclaration { +class _FieldDeclaration extends _PropertyDeclaration + with _DeclarationReportingMixin { _FieldDeclaration( {required super.displayName, required super.isAugment, @@ -176,9 +322,17 @@ class _FieldDeclaration extends _PropertyDeclaration { @override _PreBuilder _createPreBuilder() => new _PropertyPreBuilder.forField(this); + + @override + _ExistingKind _getExistingKindForDuplicate(_Declaration declaration) { + bool newIsSetter = declaration is _PropertyDeclaration && + declaration.propertyKind == _PropertyKind.Setter; + return newIsSetter ? _ExistingKind.ImplicitSetter : _ExistingKind.Getable; + } } -class _GetterDeclaration extends _PropertyDeclaration { +class _GetterDeclaration extends _PropertyDeclaration + with _DeclarationReportingMixin { _GetterDeclaration( {required super.displayName, required super.isAugment, @@ -193,7 +347,8 @@ class _GetterDeclaration extends _PropertyDeclaration { _PreBuilder _createPreBuilder() => new _PropertyPreBuilder.forGetter(this); } -class _SetterDeclaration extends _PropertyDeclaration { +class _SetterDeclaration extends _PropertyDeclaration + with _DeclarationReportingMixin { _SetterDeclaration( {required super.displayName, required super.isAugment, @@ -206,6 +361,11 @@ class _SetterDeclaration extends _PropertyDeclaration { @override _PreBuilder _createPreBuilder() => new _PropertyPreBuilder.forSetter(this); + + @override + _ExistingKind _getExistingKindForDuplicate(_Declaration declaration) { + return _ExistingKind.ExplicitSetter; + } } mixin _StandardFragmentDeclarationMixin implements _StandardDeclaration { @@ -226,7 +386,10 @@ abstract class _StandardDeclaration extends _NonConstructorDeclaration { } class _StandardFragmentDeclaration extends _StandardDeclaration - with _FragmentDeclarationMixin, _StandardFragmentDeclarationMixin { + with + _DeclarationReportingMixin, + _FragmentDeclarationMixin, + _StandardFragmentDeclarationMixin { @override final Fragment _fragment; @@ -265,7 +428,8 @@ sealed class _ConstructorDeclaration extends _Declaration { } } -class _GenerativeConstructorDeclaration extends _ConstructorDeclaration { +class _GenerativeConstructorDeclaration extends _ConstructorDeclaration + with _DeclarationReportingMixin { final String _name; final ConstructorDeclaration _declaration; @@ -283,9 +447,31 @@ class _GenerativeConstructorDeclaration extends _ConstructorDeclaration { @override _PreBuilder _createPreBuilder() => new _GenerativeConstructorPreBuilder(_name, this); + + @override + // Coverage-ignore(suite): Not run. + void reportConstructorConflict(ProblemReporting problemReporting, + _Declaration nonConstructorDeclaration) { + // Example: + // + // class A { + // A.foo(); + // static void foo() {} + // } + // + problemReporting.addProblem2( + templateMemberConflictsWithConstructor.withArguments(displayName), + nonConstructorDeclaration.uriOffset, + context: [ + templateMemberConflictsWithConstructorCause + .withArguments(displayName) + .withLocation2(uriOffset) + ]); + } } -class _FactoryConstructorDeclaration extends _ConstructorDeclaration { +class _FactoryConstructorDeclaration extends _ConstructorDeclaration + with _DeclarationReportingMixin { final String _name; final FactoryDeclaration _declaration; @@ -303,6 +489,27 @@ class _FactoryConstructorDeclaration extends _ConstructorDeclaration { @override _PreBuilder _createPreBuilder() => new _FactoryConstructorPreBuilder(_name, this); + + @override + // Coverage-ignore(suite): Not run. + void reportConstructorConflict(ProblemReporting problemReporting, + _Declaration nonConstructorDeclaration) { + // Example: + // + // class A { + // factory A.foo() => throw ''; + // static void foo() {} + // } + // + problemReporting.addProblem2( + templateMemberConflictsWithFactory.withArguments(displayName), + nonConstructorDeclaration.uriOffset, + context: [ + templateMemberConflictsWithFactoryCause + .withArguments(displayName) + .withLocation2(uriOffset) + ]); + } } class _BuilderFactory { @@ -1330,11 +1537,8 @@ class _PropertyPreBuilder extends _PreBuilder { final String name; final UriOffsetLength uriOffset; final bool isStatic; - FieldDeclaration? _field; - GetterDeclaration? _getter; - _PropertyKind? _getterPropertyKind; - SetterDeclaration? _setter; - _PropertyKind? _setterPropertyKind; + _PropertyDeclaration? _getterDeclaration; + _PropertyDeclaration? _setterDeclaration; List _getterAugmentations = []; List _setterAugmentations = []; @@ -1344,7 +1548,7 @@ class _PropertyPreBuilder extends _PreBuilder { inPatch = getter.inPatch, name = getter.displayName, uriOffset = getter.uriOffset, - _getterPropertyKind = getter.propertyKind { + _getterDeclaration = getter { _PropertyDeclarations declarations = getter.declarations; assert(declarations.field == null, "Unexpected field declaration from getter ${getter}."); @@ -1352,7 +1556,6 @@ class _PropertyPreBuilder extends _PreBuilder { "Unexpected getter declaration from getter ${getter}."); assert(declarations.setter == null, "Unexpected setter declaration from getter ${getter}."); - _getter = declarations.getter; } // TODO(johnniwinther): Report error if [setter] is augmenting. @@ -1361,7 +1564,7 @@ class _PropertyPreBuilder extends _PreBuilder { inPatch = setter.inPatch, name = setter.displayName, uriOffset = setter.uriOffset, - _setterPropertyKind = setter.propertyKind { + _setterDeclaration = setter { _PropertyDeclarations declarations = setter.declarations; assert(declarations.field == null, "Unexpected field declaration from setter ${setter}."); @@ -1369,7 +1572,6 @@ class _PropertyPreBuilder extends _PreBuilder { "Unexpected getter declaration from setter ${setter}."); assert(declarations.setter != null, "Unexpected setter declaration from setter ${setter}."); - _setter = declarations.setter; } // TODO(johnniwinther): Report error if [field] is augmenting. @@ -1378,7 +1580,9 @@ class _PropertyPreBuilder extends _PreBuilder { inPatch = field.inPatch, name = field.displayName, uriOffset = field.uriOffset, - _getterPropertyKind = field.propertyKind { + _getterDeclaration = field, + _setterDeclaration = + field.propertyKind == _PropertyKind.Field ? field : null { _PropertyDeclarations declarations = field.declarations; assert(declarations.field != null, "Unexpected field declaration from field ${field}."); @@ -1386,58 +1590,39 @@ class _PropertyPreBuilder extends _PreBuilder { "Unexpected getter declaration from field ${field}."); assert( (declarations.setter != null) == - (_getterPropertyKind == _PropertyKind.Field), + (_getterDeclaration!.propertyKind == _PropertyKind.Field), "Unexpected setter declaration from field ${field}."); - _field = declarations.field; - _getter = declarations.getter; - _setter = declarations.setter; - - if (_getterPropertyKind == _PropertyKind.Field) { - _setterPropertyKind = field.propertyKind; - } } @override bool absorbFragment( ProblemReporting problemReporting, _Declaration declaration) { if (declaration is! _PropertyDeclaration) { - if (_getter != null) { + if (_getterDeclaration != null) { // Example: // // int get foo => 42; // void foo() {} // - problemReporting.addProblem2( - templateDuplicatedDeclaration.withArguments(name), - declaration.uriOffset, - context: [ - templateDuplicatedDeclarationCause - .withArguments(name) - .withLocation2(_getter!.uriOffset) - ]); + _getterDeclaration! + .reportDuplicateDeclaration(problemReporting, declaration); } else { - assert(_setter != null); + assert(_setterDeclaration != null); // Example: // // void set foo(_) {} // void foo() {} // - problemReporting.addProblem2( - templateDeclarationConflictsWithSetter.withArguments(name), - declaration.uriOffset, - context: [ - templateDeclarationConflictsWithSetterCause - .withArguments(name) - .withLocation2(_setter!.uriOffset) - ]); + _setterDeclaration! + .reportDuplicateDeclaration(problemReporting, declaration); } return false; } - _PropertyKind? propertyKind = declaration.propertyKind; + _PropertyKind? propertyKind = declaration.propertyKind; switch (propertyKind) { case _PropertyKind.Getter: - if (_getter == null) { + if (_getterDeclaration == null) { // Example: // // void set foo(_) {} @@ -1452,40 +1637,22 @@ class _PropertyPreBuilder extends _PreBuilder { // TODO(johnniwinther): Report error. } if (declaration.isStatic != isStatic) { - if (declaration.isStatic) { - // Coverage-ignore-block(suite): Not run. - // Example: - // - // class A { - // void set foo(_) {} - // static int get foo => 42; - // } - // - problemReporting.addProblem2( - templateStaticConflictsWithInstance.withArguments(name), - declaration.uriOffset, - context: [ - templateStaticConflictsWithInstanceCause - .withArguments(name) - .withLocation2(_setter!.uriOffset) - ]); - } else { - // Example: - // - // class A { - // static void set foo(_) {} - // int get foo => 42; - // } - // - problemReporting.addProblem2( - templateInstanceConflictsWithStatic.withArguments(name), - declaration.uriOffset, - context: [ - templateInstanceConflictsWithStaticCause - .withArguments(name) - .withLocation2(_setter!.uriOffset) - ]); - } + // Examples: + // + // class A { + // void set foo(_) {} + // static int get foo => 42; + // } + // + // and + // + // class A { + // static void set foo(_) {} + // int get foo => 42; + // } + // + _setterDeclaration! + .reportStaticInstanceConflict(problemReporting, declaration); return false; } else { _PropertyDeclarations declarations = declaration.declarations; @@ -1497,10 +1664,7 @@ class _PropertyPreBuilder extends _PreBuilder { declarations.setter == null, "Unexpected setter declaration from getter " "${declaration}."); - _getter = declarations.getter; - assert(_getterPropertyKind == null, - "Unexpected setter property kind for $_setter"); - _getterPropertyKind == propertyKind; + _getterDeclaration = declaration; return true; } } else { @@ -1527,19 +1691,13 @@ class _PropertyPreBuilder extends _PreBuilder { // int get foo => 42; // int get foo => 87; // - problemReporting.addProblem2( - templateDuplicatedDeclaration.withArguments(name), - declaration.uriOffset, - context: [ - templateDuplicatedDeclarationCause - .withArguments(name) - .withLocation2(_getter!.uriOffset) - ]); + _getterDeclaration! + .reportDuplicateDeclaration(problemReporting, declaration); return false; } } case _PropertyKind.Setter: - if (_setter == null) { + if (_setterDeclaration == null) { // Examples: // // int get foo => 42; @@ -1557,41 +1715,23 @@ class _PropertyPreBuilder extends _PreBuilder { // TODO(johnniwinther): Report error. } if (declaration.isStatic != isStatic) { - if (declaration.isStatic) { - // Example: - // - // class A { - // int get foo => 42; - // static void set foo(_) {} - // } - // - problemReporting.addProblem2( - templateStaticConflictsWithInstance.withArguments(name), - declaration.uriOffset, - context: [ - templateStaticConflictsWithInstanceCause - .withArguments(name) - .withLocation2(_getter!.uriOffset) - ]); - return false; - } else { - // Example: - // - // class A { - // static int get foo => 42; - // void set foo(_) {} - // } - // - problemReporting.addProblem2( - templateInstanceConflictsWithStatic.withArguments(name), - declaration.uriOffset, - context: [ - templateInstanceConflictsWithStaticCause - .withArguments(name) - .withLocation2(_getter!.uriOffset) - ]); - return false; - } + // Examples: + // + // class A { + // int get foo => 42; + // static void set foo(_) {} + // } + // + // and + // + // class A { + // static int get foo => 42; + // void set foo(_) {} + // } + // + _getterDeclaration! + .reportStaticInstanceConflict(problemReporting, declaration); + return false; } else { _PropertyDeclarations declarations = declaration.declarations; assert( @@ -1602,10 +1742,7 @@ class _PropertyPreBuilder extends _PreBuilder { declarations.getter == null, "Unexpected getter declaration from setter " "${declaration}."); - _setter = declarations.setter; - assert(_setterPropertyKind == null, - "Unexpected setter property kind for $_getter"); - _setterPropertyKind == propertyKind; + _setterDeclaration = declaration; return true; } } else { @@ -1627,58 +1764,34 @@ class _PropertyPreBuilder extends _PreBuilder { _setterAugmentations.add(declarations.setter!); return true; } else { - if (_setterPropertyKind == _PropertyKind.Field) { - // Example: - // - // int? foo; - // void set foo(_) {} - // - problemReporting.addProblem2( - templateConflictsWithImplicitSetter.withArguments(name), - declaration.uriOffset, - context: [ - templateConflictsWithImplicitSetterCause - .withArguments(name) - .withLocation2(_setter!.uriOffset) - ]); - return false; - } else { - // Example: - // - // void set foo(_) {} - // void set foo(_) {} - // - problemReporting.addProblem2( - templateDuplicatedDeclaration.withArguments(name), - declaration.uriOffset, - context: [ - templateDuplicatedDeclarationCause - .withArguments(name) - .withLocation2(_setter!.uriOffset) - ]); - return false; - } + // Examples: + // + // int? foo; + // void set foo(_) {} + // + // and + // + // void set foo(_) {} + // void set foo(_) {} + // + _setterDeclaration! + .reportDuplicateDeclaration(problemReporting, declaration); + return false; } } case _PropertyKind.Field: - if (_getter == null) { + if (_getterDeclaration == null) { // Example: // // void set foo(_) {} // int? foo; // - assert(_getter == null && _setter != null); + assert(_getterDeclaration == null && _setterDeclaration != null); // We have an explicit setter. - problemReporting.addProblem2( - templateConflictsWithSetter.withArguments(name), - declaration.uriOffset, - context: [ - templateConflictsWithSetterCause - .withArguments(name) - .withLocation2(_setter!.uriOffset) - ]); + _setterDeclaration! + .reportDuplicateDeclaration(problemReporting, declaration); return false; - } else if (_setter != null) { + } else if (_setterDeclaration != null) { // Examples: // // int? foo; @@ -1692,11 +1805,11 @@ class _PropertyPreBuilder extends _PreBuilder { // void set baz(_) {} // int baz = 87; // - assert(_getter != null && _setter != null); + assert(_getterDeclaration != null && _setterDeclaration != null); // We have both getter and setter if (declaration.isAugment) { // Coverage-ignore-block(suite): Not run. - if (_getterPropertyKind == declaration.propertyKind) { + if (_getterDeclaration!.propertyKind == declaration.propertyKind) { // Example: // // int foo = 42; @@ -1729,15 +1842,8 @@ class _PropertyPreBuilder extends _PreBuilder { // void set bar(_) {} // int? bar; // - problemReporting.addProblem2( - templateDuplicatedDeclaration.withArguments(name), - declaration.uriOffset, - context: [ - templateDuplicatedDeclarationCause - .withArguments(name) - .withLocation2(_getter!.uriOffset) - ]); - + _getterDeclaration! + .reportDuplicateDeclaration(problemReporting, declaration); return false; } } else { @@ -1749,25 +1855,19 @@ class _PropertyPreBuilder extends _PreBuilder { // final int bar = 42; // int? bar; // - assert(_getter != null && _setter == null); - problemReporting.addProblem2( - templateDuplicatedDeclaration.withArguments(name), - declaration.uriOffset, - context: [ - templateDuplicatedDeclarationCause - .withArguments(name) - .withLocation2(_getter!.uriOffset) - ]); + assert(_getterDeclaration != null && _setterDeclaration == null); + _getterDeclaration! + .reportDuplicateDeclaration(problemReporting, declaration); return false; } case _PropertyKind.FinalField: - if (_getter == null) { + if (_getterDeclaration == null) { // Example: // // void set foo(_) {} // final int foo = 42; // - assert(_getter == null && _setter != null); + assert(_getterDeclaration == null && _setterDeclaration != null); // We have an explicit setter. if (declaration.isAugment) { // Example: @@ -1779,54 +1879,30 @@ class _PropertyPreBuilder extends _PreBuilder { } if (declaration.isStatic != isStatic) { // Coverage-ignore-block(suite): Not run. - if (declaration.isStatic) { - // Example: - // - // class A { - // void set foo(_) {} - // static final int foo = 42; - // } - // - problemReporting.addProblem2( - templateStaticConflictsWithInstance.withArguments(name), - declaration.uriOffset, - context: [ - templateStaticConflictsWithInstanceCause - .withArguments(name) - .withLocation2(_setter!.uriOffset) - ]); - return false; - } else { - // Example: - // - // class A { - // static void set foo(_) {} - // final int foo = 42; - // } - // - problemReporting.addProblem2( - templateInstanceConflictsWithStatic.withArguments(name), - declaration.uriOffset, - context: [ - templateInstanceConflictsWithStaticCause - .withArguments(name) - .withLocation2(_setter!.uriOffset) - ]); - return false; - } + // Examples: + // + // class A { + // void set foo(_) {} + // static final int foo = 42; + // } + // + // and + // + // class A { + // static void set foo(_) {} + // final int foo = 42; + // } + // + _setterDeclaration! + .reportStaticInstanceConflict(problemReporting, declaration); + return false; } else { _PropertyDeclarations declarations = declaration.declarations; assert( declarations.setter == null, "Unexpected setter declaration from field " "${declaration}."); - _field = declarations.field; - _getter = declarations.getter; - assert( - _getterPropertyKind == null, - "Unexpected getter property kind $_getterPropertyKind for " - "$_setter."); - _getterPropertyKind = propertyKind; + _getterDeclaration = declaration; return true; } } else { @@ -1840,7 +1916,7 @@ class _PropertyPreBuilder extends _PreBuilder { // if (declaration.isAugment) { // Coverage-ignore-block(suite): Not run. - if (_getterPropertyKind == declaration.propertyKind) { + if (_getterDeclaration!.propertyKind == declaration.propertyKind) { // Example: // // final int foo = 42; @@ -1874,14 +1950,8 @@ class _PropertyPreBuilder extends _PreBuilder { // int get bar => 42; // final int bar = 87; // - problemReporting.addProblem2( - templateDuplicatedDeclaration.withArguments(name), - declaration.uriOffset, - context: [ - templateDuplicatedDeclarationCause - .withArguments(name) - .withLocation2(_getter!.uriOffset) - ]); + _getterDeclaration! + .reportDuplicateDeclaration(problemReporting, declaration); return false; } } @@ -1893,80 +1963,41 @@ class _PropertyPreBuilder extends _PreBuilder { ProblemReporting problemReporting, _Declaration constructorDeclaration) { // Check conflict with constructor. if (isStatic) { - if (_getter != null) { - if (constructorDeclaration.kind == _DeclarationKind.Constructor) { - // Example: - // - // class A { - // static int get foo => 42; - // A.foo(); - // } - // - problemReporting.addProblem2( - templateConstructorConflictsWithMember.withArguments(name), - constructorDeclaration.uriOffset, - context: [ - templateConstructorConflictsWithMemberCause - .withArguments(name) - .withLocation2(_getter!.uriOffset) - ]); - } else { - // Coverage-ignore-block(suite): Not run. - assert(constructorDeclaration.kind == _DeclarationKind.Factory, - "Unexpected constructor kind $constructorDeclaration"); - // Example: - // - // class A { - // static int get foo => 42; - // factory A.foo() => throw ''; - // } - // - problemReporting.addProblem2( - templateFactoryConflictsWithMember.withArguments(name), - constructorDeclaration.uriOffset, - context: [ - templateFactoryConflictsWithMemberCause - .withArguments(name) - .withLocation2(_getter!.uriOffset) - ]); - } + if (_getterDeclaration != null) { + // Examples: + // + // class A { + // static int get foo => 42; + // A.foo(); + // } + // + // and + // + // class A { + // static int get foo => 42; + // factory A.foo() => throw ''; + // } + // + _getterDeclaration!.reportConstructorConflict( + problemReporting, constructorDeclaration); } else { // Coverage-ignore-block(suite): Not run. - if (constructorDeclaration.kind == _DeclarationKind.Constructor) { - // Example: - // - // class A { - // static void set foo(_) {} - // A.foo(); - // } - // - problemReporting.addProblem2( - templateConstructorConflictsWithMember.withArguments(name), - constructorDeclaration.uriOffset, - context: [ - templateConstructorConflictsWithMemberCause - .withArguments(name) - .withLocation2(_setter!.uriOffset) - ]); - } else { - assert(constructorDeclaration.kind == _DeclarationKind.Factory, - "Unexpected constructor kind $constructorDeclaration"); - // Example: - // - // class A { - // static void set foo(_) {} - // factory A.foo() => throw ''; - // } - // - problemReporting.addProblem2( - templateFactoryConflictsWithMember.withArguments(name), - constructorDeclaration.uriOffset, - context: [ - templateFactoryConflictsWithMemberCause - .withArguments(name) - .withLocation2(_setter!.uriOffset) - ]); - } + // Examples: + // + // class A { + // static void set foo(_) {} + // A.foo(); + // } + // + // and + // + // class A { + // static void set foo(_) {} + // factory A.foo() => throw ''; + // } + // + _setterDeclaration!.reportConstructorConflict( + problemReporting, constructorDeclaration); } } } @@ -1978,10 +2009,10 @@ class _PropertyPreBuilder extends _PreBuilder { inPatch: inPatch, isStatic: isStatic, uriOffset: uriOffset, - fieldDeclaration: _field, - getterDeclaration: _getter, + fieldDeclaration: _getterDeclaration?.declarations.field, + getterDeclaration: _getterDeclaration?.declarations.getter, getterAugmentationDeclarations: _getterAugmentations, - setterDeclaration: _setter, + setterDeclaration: _setterDeclaration?.declarations.setter, setterAugmentationDeclarations: _setterAugmentations); } } @@ -2028,14 +2059,7 @@ sealed class _ConstructorPreBuilder // A(); // } // - problemReporting.addProblem2( - templateDuplicatedDeclaration.withArguments(declaration.displayName), - declaration.uriOffset, - context: [ - templateDuplicatedDeclarationCause - .withArguments(_declaration.displayName) - .withLocation2(_declaration.uriOffset) - ]); + _declaration.reportDuplicateDeclaration(problemReporting, declaration); return false; } } @@ -2046,43 +2070,22 @@ sealed class _ConstructorPreBuilder // Check conflict with non-constructor. if (nonConstructorDeclaration.isStatic) { // Coverage-ignore-block(suite): Not run. - if (_declaration.kind == _DeclarationKind.Constructor) { - // Example: - // - // class A { - // A.foo(); - // static void foo() {} - // } - // - problemReporting.addProblem2( - templateMemberConflictsWithConstructor - .withArguments(_declaration.displayName), - nonConstructorDeclaration.uriOffset, - context: [ - templateMemberConflictsWithConstructorCause - .withArguments(_declaration.displayName) - .withLocation2(_declaration.uriOffset) - ]); - } else { - assert(_declaration.kind == _DeclarationKind.Factory, - "Unexpected constructor kind $_declaration"); - // Example: - // - // class A { - // factory A.foo() => throw ''; - // static void foo() {} - // } - // - problemReporting.addProblem2( - templateMemberConflictsWithFactory - .withArguments(_declaration.displayName), - nonConstructorDeclaration.uriOffset, - context: [ - templateMemberConflictsWithFactoryCause - .withArguments(_declaration.displayName) - .withLocation2(_declaration.uriOffset) - ]); - } + // Examples: + // + // class A { + // A.foo(); + // static void foo() {} + // } + // + // and + // + // class A { + // factory A.foo() => throw ''; + // static void foo() {} + // } + // + _declaration.reportConstructorConflict( + problemReporting, nonConstructorDeclaration); } } } @@ -2153,38 +2156,17 @@ class _DeclarationPreBuilder extends _PreBuilder { return false; } } else { - if (declaration is _PropertyDeclaration && - declaration.propertyKind == _PropertyKind.Setter) { - // Example: - // - // class Foo {} - // set Foo(_) {} - // - problemReporting.addProblem2( - templateSetterConflictsWithDeclaration - .withArguments(_declaration.displayName), - declaration.uriOffset, - context: [ - templateSetterConflictsWithDeclarationCause - .withArguments(_declaration.displayName) - .withLocation2(_declaration.uriOffset) - ]); - } else { - // Example: - // - // class Foo {} - // class Foo {} - // - problemReporting.addProblem2( - templateDuplicatedDeclaration - .withArguments(declaration.displayName), - declaration.uriOffset, - context: [ - templateDuplicatedDeclarationCause - .withArguments(_declaration.displayName) - .withLocation2(_declaration.uriOffset) - ]); - } + // Examples: + // + // class Foo {} + // set Foo(_) {} + // + // and + // + // class Foo {} + // class Foo {} + // + _declaration.reportDuplicateDeclaration(problemReporting, declaration); return false; } } @@ -2194,43 +2176,22 @@ class _DeclarationPreBuilder extends _PreBuilder { ProblemReporting problemReporting, _Declaration constructorDeclaration) { // Check conflict with constructor. if (_declaration.isStatic) { - if (constructorDeclaration.kind == _DeclarationKind.Constructor) { - // Example: - // - // class A { - // static void foo() {} - // A.foo(); - // } - // - problemReporting.addProblem2( - templateConstructorConflictsWithMember - .withArguments(_declaration.displayName), - constructorDeclaration.uriOffset, - context: [ - templateConstructorConflictsWithMemberCause - .withArguments(_declaration.displayName) - .withLocation2(_declaration.uriOffset) - ]); - } else { - assert(constructorDeclaration.kind == _DeclarationKind.Factory, - "Unexpected constructor kind $constructorDeclaration"); - // Example: - // - // class A { - // static void foo() {} - // factory A.foo() => throw ''; - // } - // - problemReporting.addProblem2( - templateFactoryConflictsWithMember - .withArguments(_declaration.displayName), - constructorDeclaration.uriOffset, - context: [ - templateFactoryConflictsWithMemberCause - .withArguments(_declaration.displayName) - .withLocation2(_declaration.uriOffset) - ]); - } + // Examples: + // + // class A { + // static void foo() {} + // A.foo(); + // } + // + // and + // + // class A { + // static void foo() {} + // factory A.foo() => throw ''; + // } + // + _declaration.reportConstructorConflict( + problemReporting, constructorDeclaration); } } @@ -2850,3 +2811,9 @@ class _PropertyDeclarations { _PropertyDeclarations({this.field, this.getter, this.setter}); } + +enum _ExistingKind { + Getable, + ExplicitSetter, + ImplicitSetter, +} diff --git a/pkg/front_end/lib/src/type_inference/closure_context.dart b/pkg/front_end/lib/src/type_inference/closure_context.dart index d7a5ffd8270..a635a493188 100644 --- a/pkg/front_end/lib/src/type_inference/closure_context.dart +++ b/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 diff --git a/pkg/front_end/lib/src/type_inference/standard_bounds.dart b/pkg/front_end/lib/src/type_inference/standard_bounds.dart index ea3c9c268e1..e1e35746275 100644 --- a/pkg/front_end/lib/src/type_inference/standard_bounds.dart +++ b/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; diff --git a/pkg/front_end/lib/src/type_inference/type_inference_engine.dart b/pkg/front_end/lib/src/type_inference/type_inference_engine.dart index 51d4e3ee0fb..2e18086594d 100644 --- a/pkg/front_end/lib/src/type_inference/type_inference_engine.dart +++ b/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 typeParametersToEliminate) { - return new FreeTypeParameterEliminator( - coreTypes: typeEnvironment.coreTypes) + return new FreeTypeParameterEliminator(coreTypes: typeEnvironment.coreTypes) .eliminateToGreatest(type); } @override DartType leastClosureOfTypeInternal( DartType type, List typeParametersToEliminate) { - return new FreeTypeParameterEliminator( - coreTypes: typeEnvironment.coreTypes) + return new FreeTypeParameterEliminator(coreTypes: typeEnvironment.coreTypes) .eliminateToLeast(type); } diff --git a/pkg/front_end/messages.yaml b/pkg/front_end/messages.yaml index 848ef09560c..67578522715 100644 --- a/pkg/front_end/messages.yaml +++ b/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 diff --git a/pkg/front_end/test/coverage_suite_expected.dart b/pkg/front_end/test/coverage_suite_expected.dart index 85247b20f1e..aa1f73317bb 100644 --- a/pkg/front_end/test/coverage_suite_expected.dart +++ b/pkg/front_end/test/coverage_suite_expected.dart @@ -520,7 +520,7 @@ const Map _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 _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 _expect = { ), // 100.0%. "package:front_end/src/source/type_parameter_scope_builder.dart": ( - hitCount: 1553, + hitCount: 1421, missCount: 0, ), // 100.0%. diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart index af2f1dd3550..86715b65912 100644 --- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart +++ b/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() {} diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.expect index 206aaa6e4c3..2214744caef 100644 --- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.expect +++ b/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 { // ^^^^^^ @@ -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 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 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 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 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 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 = >[#C7] #C9 = self::values {index:#C1, _name:#C2} #C10 = [#C9] + #C11 = "E4" + #C12 = self::E4 {index:#C1, _name:#C11} + #C13 = [#C12] + #C14 = "a" + #C15 = self::E5 {index:#C1, _name:#C14} + #C16 = [#C15] + #C17 = self::E6 {index:#C1, _name:#C14} + #C18 = [#C17] + #C19 = self::E8 {index:#C1, _name:#C14} + #C20 = [#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) diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.modular.expect b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.modular.expect index 206aaa6e4c3..2214744caef 100644 --- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.modular.expect +++ b/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 { // ^^^^^^ @@ -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 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 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 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 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 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 = >[#C7] #C9 = self::values {index:#C1, _name:#C2} #C10 = [#C9] + #C11 = "E4" + #C12 = self::E4 {index:#C1, _name:#C11} + #C13 = [#C12] + #C14 = "a" + #C15 = self::E5 {index:#C1, _name:#C14} + #C16 = [#C15] + #C17 = self::E6 {index:#C1, _name:#C14} + #C18 = [#C17] + #C19 = self::E8 {index:#C1, _name:#C14} + #C20 = [#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) diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.outline.expect b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.outline.expect index 0f4086a35dd..9785cdee88d 100644 --- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.outline.expect +++ b/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 { // ^^^^^^ @@ -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 values = const [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 values = const [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 values = const [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 values = const [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 values = const [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 >[const E3{_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 [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 [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 [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 [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 [const E8{_Enum.index: 0, _Enum._name: "a"}]) +Extra constant evaluation: evaluated: 61, effectively constant: 16 diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.transformed.expect index 206aaa6e4c3..2214744caef 100644 --- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.transformed.expect +++ b/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 { // ^^^^^^ @@ -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 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 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 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 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 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 = >[#C7] #C9 = self::values {index:#C1, _name:#C2} #C10 = [#C9] + #C11 = "E4" + #C12 = self::E4 {index:#C1, _name:#C11} + #C13 = [#C12] + #C14 = "a" + #C15 = self::E5 {index:#C1, _name:#C14} + #C16 = [#C15] + #C17 = self::E6 {index:#C1, _name:#C14} + #C18 = [#C17] + #C19 = self::E8 {index:#C1, _name:#C14} + #C20 = [#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) diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.textual_outline.expect b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.textual_outline.expect index 52393ad8849..b16b759794a 100644 --- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.textual_outline.expect +++ b/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 { - element; -} +enum E2 { element; } -enum E3 { - element; -} +enum E3 { 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() {} diff --git a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.textual_outline_modelled.expect index 9b8e184dce8..fbe4c26ce5f 100644 --- a/pkg/front_end/testcases/enhanced_enums/missed_checks.dart.textual_outline_modelled.expect +++ b/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 { - element; -} +enum E2 { element; } -enum E3 { - element; -} +enum E3 { 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() {} diff --git a/pkg/front_end/testcases/general/static_vs_instance.dart.strong.expect b/pkg/front_end/testcases/general/static_vs_instance.dart.strong.expect index d7956418e0a..86a7f196f92 100644 --- a/pkg/front_end/testcases/general/static_vs_instance.dart.strong.expect +++ b/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'. diff --git a/pkg/front_end/testcases/general/static_vs_instance.dart.strong.modular.expect b/pkg/front_end/testcases/general/static_vs_instance.dart.strong.modular.expect index d7956418e0a..86a7f196f92 100644 --- a/pkg/front_end/testcases/general/static_vs_instance.dart.strong.modular.expect +++ b/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'. diff --git a/pkg/front_end/testcases/general/static_vs_instance.dart.strong.outline.expect b/pkg/front_end/testcases/general/static_vs_instance.dart.strong.outline.expect index 21f522eded2..fe2584331a2 100644 --- a/pkg/front_end/testcases/general/static_vs_instance.dart.strong.outline.expect +++ b/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'. diff --git a/pkg/front_end/testcases/general/static_vs_instance.dart.strong.transformed.expect b/pkg/front_end/testcases/general/static_vs_instance.dart.strong.transformed.expect index d7956418e0a..86a7f196f92 100644 --- a/pkg/front_end/testcases/general/static_vs_instance.dart.strong.transformed.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.expect b/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.expect index 1adc921838c..40c7a6c0390 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.modular.expect index 1adc921838c..40c7a6c0390 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.modular.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.outline.expect b/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.outline.expect index 41a92772ee1..b6b240d5c99 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.outline.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.transformed.expect index 1adc921838c..40c7a6c0390 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_instance.dart.strong.transformed.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.expect b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.expect index 4a86ab48b88..f1ce1159d49 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.modular.expect index 4a86ab48b88..f1ce1159d49 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.modular.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.outline.expect b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.outline.expect index 3f3dc439e31..07ade87ac34 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.outline.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.transformed.expect index 4a86ab48b88..f1ce1159d49 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_instance_extension.dart.strong.transformed.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.expect b/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.expect index f1f2b65f502..3752e9ca076 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.modular.expect index f1f2b65f502..3752e9ca076 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.modular.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.outline.expect b/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.outline.expect index 70866307767..5029e3689c6 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.outline.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.transformed.expect index f1f2b65f502..3752e9ca076 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_static.dart.strong.transformed.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.expect b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.expect index 24e6479cf2e..009b5b575a0 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.modular.expect index 24e6479cf2e..009b5b575a0 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.modular.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.outline.expect b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.outline.expect index c5ba590d0e9..24cc1fbfb97 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.outline.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.transformed.expect index 24e6479cf2e..009b5b575a0 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_static_extension.dart.strong.transformed.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.expect b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.expect index 67d102da674..d261e562b8f 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.modular.expect index 67d102da674..d261e562b8f 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.modular.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.outline.expect b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.outline.expect index 6852d1c50c3..2c2a46f5d0c 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.outline.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.transformed.expect index 67d102da674..d261e562b8f 100644 --- a/pkg/front_end/testcases/nnbd/duplicates_toplevel.dart.strong.transformed.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.expect b/pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.expect index 2e9d57b20cd..9ec4bf8260f 100644 --- a/pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.modular.expect index 2e9d57b20cd..9ec4bf8260f 100644 --- a/pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.modular.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.outline.expect b/pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.outline.expect index 875ebc844ec..c9dca1dcae1 100644 --- a/pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.outline.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.transformed.expect index 2e9d57b20cd..9ec4bf8260f 100644 --- a/pkg/front_end/testcases/nnbd/field_setter_conflict.dart.strong.transformed.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.expect b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.expect index 9587238f51c..b3957aa59f4 100644 --- a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.modular.expect index 9587238f51c..b3957aa59f4 100644 --- a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.modular.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.outline.expect b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.outline.expect index 7271ed4cfa6..4b61de2889b 100644 --- a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.outline.expect +++ b/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'. diff --git a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.transformed.expect index c262fb80295..7fc1622335c 100644 --- a/pkg/front_end/testcases/nnbd/instance_duplicates.dart.strong.transformed.expect +++ b/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'.