Version 2.17.0-152.0.dev
Merge commit 'edc352030c3d5f7ec674475e48fdb35e4d950c62' into 'dev'
diff --git a/pkg/analyzer/lib/src/analysis_options/error/option_codes.g.dart b/pkg/analyzer/lib/src/analysis_options/error/option_codes.g.dart
index 7690c44..cbe95e2 100644
--- a/pkg/analyzer/lib/src/analysis_options/error/option_codes.g.dart
+++ b/pkg/analyzer/lib/src/analysis_options/error/option_codes.g.dart
@@ -5,7 +5,7 @@
// THIS FILE IS GENERATED. DO NOT EDIT.
//
// Instead modify 'pkg/analyzer/messages.yaml' and run
-// 'dart pkg/analyzer/tool/messages/generate.dart' to update.
+// 'dart run pkg/analyzer/tool/messages/generate.dart' to update.
import "package:analyzer/error/error.dart";
diff --git a/pkg/analyzer/lib/src/dart/error/ffi_code.g.dart b/pkg/analyzer/lib/src/dart/error/ffi_code.g.dart
index 873531a..c8ff006 100644
--- a/pkg/analyzer/lib/src/dart/error/ffi_code.g.dart
+++ b/pkg/analyzer/lib/src/dart/error/ffi_code.g.dart
@@ -5,7 +5,7 @@
// THIS FILE IS GENERATED. DO NOT EDIT.
//
// Instead modify 'pkg/analyzer/messages.yaml' and run
-// 'dart pkg/analyzer/tool/messages/generate.dart' to update.
+// 'dart run pkg/analyzer/tool/messages/generate.dart' to update.
import "package:analyzer/error/error.dart";
import "package:analyzer/src/error/analyzer_error_code.dart";
diff --git a/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart b/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart
index 435189c..b4770bd 100644
--- a/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart
+++ b/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart
@@ -5,7 +5,7 @@
// THIS FILE IS GENERATED. DO NOT EDIT.
//
// Instead modify 'pkg/analyzer/messages.yaml' and run
-// 'dart pkg/analyzer/tool/messages/generate.dart' to update.
+// 'dart run pkg/analyzer/tool/messages/generate.dart' to update.
import "package:analyzer/error/error.dart";
import "package:analyzer/src/error/analyzer_error_code.dart";
diff --git a/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart b/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart
index c175e22..93fe973 100644
--- a/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart
+++ b/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart
@@ -5,7 +5,7 @@
// THIS FILE IS GENERATED. DO NOT EDIT.
//
// Instead modify 'pkg/analyzer/messages.yaml' and run
-// 'dart pkg/analyzer/tool/messages/generate.dart' to update.
+// 'dart run pkg/analyzer/tool/messages/generate.dart' to update.
import "package:analyzer/error/error.dart";
diff --git a/pkg/analyzer/lib/src/error/codes.g.dart b/pkg/analyzer/lib/src/error/codes.g.dart
index 589b294..0b8ddc5 100644
--- a/pkg/analyzer/lib/src/error/codes.g.dart
+++ b/pkg/analyzer/lib/src/error/codes.g.dart
@@ -5,7 +5,7 @@
// THIS FILE IS GENERATED. DO NOT EDIT.
//
// Instead modify 'pkg/analyzer/messages.yaml' and run
-// 'dart pkg/analyzer/tool/messages/generate.dart' to update.
+// 'dart run pkg/analyzer/tool/messages/generate.dart' to update.
import "package:analyzer/error/error.dart";
import "package:analyzer/src/error/analyzer_error_code.dart";
@@ -10528,7 +10528,7 @@
//
// #### Example
//
- // The following code produces this diagnostic beause `a` isn't a constant:
+ // The following code produces this diagnostic because `a` isn't a constant:
//
// ```dart
// var a = 'a';
@@ -12030,7 +12030,7 @@
// URI in the part directive to be the URI of the other file.
//
// If the [part file][] should be a part of this library, then update the URI
- // (orlibrary name) in the part-of directive to be the URI (or name) of the
+ // (or library name) in the part-of directive to be the URI (or name) of the
// correct library.
static const CompileTimeErrorCode PART_OF_DIFFERENT_LIBRARY =
CompileTimeErrorCode(
diff --git a/pkg/analyzer/lib/src/manifest/manifest_warning_code.g.dart b/pkg/analyzer/lib/src/manifest/manifest_warning_code.g.dart
index 8ac1bdd..3e8424e 100644
--- a/pkg/analyzer/lib/src/manifest/manifest_warning_code.g.dart
+++ b/pkg/analyzer/lib/src/manifest/manifest_warning_code.g.dart
@@ -5,7 +5,7 @@
// THIS FILE IS GENERATED. DO NOT EDIT.
//
// Instead modify 'pkg/analyzer/messages.yaml' and run
-// 'dart pkg/analyzer/tool/messages/generate.dart' to update.
+// 'dart run pkg/analyzer/tool/messages/generate.dart' to update.
import "package:analyzer/error/error.dart";
diff --git a/pkg/analyzer/lib/src/pubspec/pubspec_warning_code.g.dart b/pkg/analyzer/lib/src/pubspec/pubspec_warning_code.g.dart
index e1565ec..cc54c3a 100644
--- a/pkg/analyzer/lib/src/pubspec/pubspec_warning_code.g.dart
+++ b/pkg/analyzer/lib/src/pubspec/pubspec_warning_code.g.dart
@@ -5,7 +5,7 @@
// THIS FILE IS GENERATED. DO NOT EDIT.
//
// Instead modify 'pkg/analyzer/messages.yaml' and run
-// 'dart pkg/analyzer/tool/messages/generate.dart' to update.
+// 'dart run pkg/analyzer/tool/messages/generate.dart' to update.
import "package:analyzer/error/error.dart";
@@ -514,7 +514,7 @@
// name: local_package
// ```
//
- // If the path is wrong, then replace it with a the correct path.
+ // If the path is wrong, then replace it with the correct path.
static const PubspecWarningCode PATH_PUBSPEC_DOES_NOT_EXIST =
PubspecWarningCode(
'PATH_PUBSPEC_DOES_NOT_EXIST',
diff --git a/pkg/analyzer/messages.yaml b/pkg/analyzer/messages.yaml
index 1919dae..9197dac 100644
--- a/pkg/analyzer/messages.yaml
+++ b/pkg/analyzer/messages.yaml
@@ -8960,7 +8960,7 @@
#### Example
- The following code produces this diagnostic beause `a` isn't a constant:
+ The following code produces this diagnostic because `a` isn't a constant:
```dart
var a = 'a';
@@ -10241,7 +10241,7 @@
URI in the part directive to be the URI of the other file.
If the [part file][] should be a part of this library, then update the URI
- (orlibrary name) in the part-of directive to be the URI (or name) of the
+ (or library name) in the part-of directive to be the URI (or name) of the
correct library.
PART_OF_NON_PART:
problemMessage: "The included part '{0}' must have a part-of directive."
@@ -20742,7 +20742,7 @@
name: local_package
```
- If the path is wrong, then replace it with a the correct path.
+ If the path is wrong, then replace it with the correct path.
UNNECESSARY_DEV_DEPENDENCY:
problemMessage: "The dev dependency on {0} is unnecessary because there is also a normal dependency on that package."
correctionMessage: Try removing the dev dependency.
diff --git a/pkg/analyzer/tool/diagnostics/diagnostics.md b/pkg/analyzer/tool/diagnostics/diagnostics.md
index 3483786..94268b2 100644
--- a/pkg/analyzer/tool/diagnostics/diagnostics.md
+++ b/pkg/analyzer/tool/diagnostics/diagnostics.md
@@ -11346,7 +11346,7 @@
#### Example
-The following code produces this diagnostic beause `a` isn't a constant:
+The following code produces this diagnostic because `a` isn't a constant:
{% prettify dart tag=pre+code %}
var a = 'a';
@@ -13062,7 +13062,7 @@
URI in the part directive to be the URI of the other file.
If the [part file][] should be a part of this library, then update the URI
-(orlibrary name) in the part-of directive to be the URI (or name) of the
+(or library name) in the part-of directive to be the URI (or name) of the
correct library.
### part_of_non_part
@@ -13229,7 +13229,7 @@
name: local_package
```
-If the path is wrong, then replace it with a the correct path.
+If the path is wrong, then replace it with the correct path.
### prefix_collides_with_top_level_member
diff --git a/pkg/analyzer/tool/messages/generate.dart b/pkg/analyzer/tool/messages/generate.dart
index 93b703b..d9cffbc 100644
--- a/pkg/analyzer/tool/messages/generate.dart
+++ b/pkg/analyzer/tool/messages/generate.dart
@@ -63,7 +63,7 @@
// THIS FILE IS GENERATED. DO NOT EDIT.
//
// Instead modify 'pkg/analyzer/messages.yaml' and run
-// 'dart pkg/analyzer/tool/messages/generate.dart' to update.
+// 'dart run pkg/analyzer/tool/messages/generate.dart' to update.
''');
_AnalyzerErrorGenerator(this.errorClasses);
diff --git a/tools/VERSION b/tools/VERSION
index d3ae75a..8a1db93 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 17
PATCH 0
-PRERELEASE 151
+PRERELEASE 152
PRERELEASE_PATCH 0
\ No newline at end of file
