Version 2.12.0-188.0.dev
Merge commit '6143fb5668e6af6cea68ae48aa5e7402cb2d03c9' into 'dev'
diff --git a/pkg/analyzer/lib/src/error/codes.dart b/pkg/analyzer/lib/src/error/codes.dart
index 2acc9c4..320b554 100644
--- a/pkg/analyzer/lib/src/error/codes.dart
+++ b/pkg/analyzer/lib/src/error/codes.dart
@@ -9204,7 +9204,7 @@
static const CompileTimeErrorCode RETURN_OF_INVALID_TYPE_FROM_CONSTRUCTOR =
CompileTimeErrorCode(
'RETURN_OF_INVALID_TYPE',
- "A value of type '{0}' can't be returned from constructor '{2}' "
+ "A value of type '{0}' can't be returned from the constructor '{2}' "
"because it has a return type of '{1}'.",
hasPublishedDocs: true,
uniqueName: 'RETURN_OF_INVALID_TYPE_FROM_CONSTRUCTOR',
@@ -9247,7 +9247,7 @@
static const CompileTimeErrorCode RETURN_OF_INVALID_TYPE_FROM_FUNCTION =
CompileTimeErrorCode(
'RETURN_OF_INVALID_TYPE',
- "A value of type '{0}' can't be returned from function '{2}' because "
+ "A value of type '{0}' can't be returned from the function '{2}' because "
"it has a return type of '{1}'.",
hasPublishedDocs: true,
uniqueName: 'RETURN_OF_INVALID_TYPE_FROM_FUNCTION',
@@ -9262,7 +9262,7 @@
static const CompileTimeErrorCode RETURN_OF_INVALID_TYPE_FROM_METHOD =
CompileTimeErrorCode(
'RETURN_OF_INVALID_TYPE',
- "A value of type '{0}' can't be returned from method '{2}' because "
+ "A value of type '{0}' can't be returned from the method '{2}' because "
"it has a return type of '{1}'.",
hasPublishedDocs: true,
uniqueName: 'RETURN_OF_INVALID_TYPE_FROM_METHOD',
diff --git a/pkg/analyzer/tool/diagnostics/diagnostics.md b/pkg/analyzer/tool/diagnostics/diagnostics.md
index eb96917..3dd7497 100644
--- a/pkg/analyzer/tool/diagnostics/diagnostics.md
+++ b/pkg/analyzer/tool/diagnostics/diagnostics.md
@@ -7475,13 +7475,13 @@
### return_of_invalid_type
-_A value of type '{0}' can't be returned from constructor '{2}' because it has a
-return type of '{1}'._
+_A value of type '{0}' can't be returned from the constructor '{2}' because it
+has a return type of '{1}'._
-_A value of type '{0}' can't be returned from function '{2}' because it has a
-return type of '{1}'._
+_A value of type '{0}' can't be returned from the function '{2}' because it has
+a return type of '{1}'._
-_A value of type '{0}' can't be returned from method '{2}' because it has a
+_A value of type '{0}' can't be returned from the method '{2}' because it has a
return type of '{1}'._
#### Description
diff --git a/pkg/nnbd_migration/test/migration_cli_test.dart b/pkg/nnbd_migration/test/migration_cli_test.dart
index 31ac07a..3561408 100644
--- a/pkg/nnbd_migration/test/migration_cli_test.dart
+++ b/pkg/nnbd_migration/test/migration_cli_test.dart
@@ -2078,8 +2078,8 @@
expect(errorOutput, contains('1 analysis issue found:'));
expect(
errorOutput,
- contains("A value of type 'Null' can't be returned from function 'f' "
- "because it has a return type of 'int'"));
+ contains("A value of type 'Null' can't be returned from the function "
+ "'f' because it has a return type of 'int'"));
expect(errorOutput, contains('Set the lower SDK constraint'));
}
diff --git a/tools/VERSION b/tools/VERSION
index 10a1937..6245043 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 12
PATCH 0
-PRERELEASE 187
+PRERELEASE 188
PRERELEASE_PATCH 0
\ No newline at end of file
