Version 2.17.0-131.0.dev
Merge commit '992b9c36b810e6b6fde5d23b467d030a169faba2' into 'dev'
diff --git a/pkg/analyzer/lib/src/error/codes.g.dart b/pkg/analyzer/lib/src/error/codes.g.dart
index 2683b24..44012e2 100644
--- a/pkg/analyzer/lib/src/error/codes.g.dart
+++ b/pkg/analyzer/lib/src/error/codes.g.dart
@@ -5753,10 +5753,11 @@
static const CompileTimeErrorCode ILLEGAL_ENUM_VALUES_DECLARATION =
CompileTimeErrorCode(
- 'ILLEGAL_ENUM_VALUES_DECLARATION',
+ 'ILLEGAL_ENUM_VALUES',
"An instance member named 'values' can't be declared in a class that "
"implements 'Enum'.",
correctionMessage: "Try using a different name.",
+ uniqueName: 'ILLEGAL_ENUM_VALUES_DECLARATION',
);
/**
@@ -5765,10 +5766,11 @@
*/
static const CompileTimeErrorCode ILLEGAL_ENUM_VALUES_INHERITANCE =
CompileTimeErrorCode(
- 'ILLEGAL_ENUM_VALUES_INHERITANCE',
+ 'ILLEGAL_ENUM_VALUES',
"An instance member named 'values' can't be inherited from '{0}' in a "
"class that implements 'Enum'.",
correctionMessage: "Try using a different name.",
+ uniqueName: 'ILLEGAL_ENUM_VALUES_INHERITANCE',
);
static const CompileTimeErrorCode ILLEGAL_LANGUAGE_VERSION_OVERRIDE =
diff --git a/pkg/analyzer/messages.yaml b/pkg/analyzer/messages.yaml
index a06b9d4..deb3caf 100644
--- a/pkg/analyzer/messages.yaml
+++ b/pkg/analyzer/messages.yaml
@@ -5025,9 +5025,11 @@
int f() => 0;
```
ILLEGAL_ENUM_VALUES_DECLARATION:
+ sharedName: ILLEGAL_ENUM_VALUES
problemMessage: An instance member named 'values' can't be declared in a class that implements 'Enum'.
correctionMessage: Try using a different name.
ILLEGAL_ENUM_VALUES_INHERITANCE:
+ sharedName: ILLEGAL_ENUM_VALUES
problemMessage: An instance member named 'values' can't be inherited from '{0}' in a class that implements 'Enum'.
correctionMessage: Try using a different name.
comment: |-
diff --git a/tools/VERSION b/tools/VERSION
index 7ade5ef..f115330 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 17
PATCH 0
-PRERELEASE 130
+PRERELEASE 131
PRERELEASE_PATCH 0
\ No newline at end of file
