Map the error code for InheritedMembersConflict
Change-Id: I89394fcf6fe47261f196a4c7c265a172f4302060
Reviewed-on: https://dart-review.googlesource.com/64940
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>
diff --git a/pkg/analyzer/lib/error/error.dart b/pkg/analyzer/lib/error/error.dart
index df61140..c93b47de 100644
--- a/pkg/analyzer/lib/error/error.dart
+++ b/pkg/analyzer/lib/error/error.dart
@@ -83,6 +83,7 @@
CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_CLASS,
CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_MEMBER,
CompileTimeErrorCode.CONFLICTS_WITH_CONSTRUCTOR,
+ CompileTimeErrorCode.CONFLICTS_WITH_INHERITED_MEMBER,
CompileTimeErrorCode.CONFLICTS_WITH_MEMBER,
CompileTimeErrorCode.CONST_CONSTRUCTOR_THROWS_EXCEPTION,
CompileTimeErrorCode.CONST_CONSTRUCTOR_WITH_FIELD_INITIALIZED_BY_NON_CONST,
diff --git a/pkg/analyzer/lib/src/error/codes.dart b/pkg/analyzer/lib/src/error/codes.dart
index 47051d9..8f9692a 100644
--- a/pkg/analyzer/lib/src/error/codes.dart
+++ b/pkg/analyzer/lib/src/error/codes.dart
@@ -452,6 +452,9 @@
static const CompileTimeErrorCode CONFLICTS_WITH_CONSTRUCTOR =
const CompileTimeErrorCode.fromFasta('CONFLICTS_WITH_CONSTRUCTOR');
+ static const CompileTimeErrorCode CONFLICTS_WITH_INHERITED_MEMBER =
+ const CompileTimeErrorCode.fromFasta('CONFLICTS_WITH_INHERITED_MEMBER');
+
static const CompileTimeErrorCode CONFLICTS_WITH_MEMBER =
const CompileTimeErrorCode.fromFasta('CONFLICTS_WITH_MEMBER');
diff --git a/pkg/front_end/lib/src/fasta/fasta_codes_generated.dart b/pkg/front_end/lib/src/fasta/fasta_codes_generated.dart
index 20b498a..83b676e 100644
--- a/pkg/front_end/lib/src/fasta/fasta_codes_generated.dart
+++ b/pkg/front_end/lib/src/fasta/fasta_codes_generated.dart
@@ -3243,6 +3243,8 @@
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
const MessageCode messageInheritedMembersConflict = const MessageCode(
"InheritedMembersConflict",
+ analyzerCode: "CONFLICTS_WITH_INHERITED_MEMBER",
+ dart2jsCode: "*fatal*",
severity: Severity.errorLegacyWarning,
message: r"""Can't inherit members that conflict with each other.""");
diff --git a/pkg/front_end/messages.status b/pkg/front_end/messages.status
index 8c8273c..77ca5a3 100644
--- a/pkg/front_end/messages.status
+++ b/pkg/front_end/messages.status
@@ -193,7 +193,6 @@
ImplementsBeforeWith/script: Fail
ImplicitCallOfNonMethod/example: Fail
ImportAfterPart/script1: Fail
-InheritedMembersConflict/analyzerCode: Fail
InputFileNotFound/analyzerCode: Fail
InputFileNotFound/example: Fail
IntegerLiteralIsOutOfRange/example: Fail
diff --git a/pkg/front_end/messages.yaml b/pkg/front_end/messages.yaml
index 99b369c..d35824b 100644
--- a/pkg/front_end/messages.yaml
+++ b/pkg/front_end/messages.yaml
@@ -1636,6 +1636,8 @@
InheritedMembersConflict:
template: "Can't inherit members that conflict with each other."
severity: ERROR_LEGACY_WARNING
+ analyzerCode: CONFLICTS_WITH_INHERITED_MEMBER
+ dart2jsCode: "*fatal*"
script:
- >-
class A {
