Merge 9c544b2 into 1818a2f

Author: elitree

pkg/README.md

@@ -13,7 +13,7 @@ dart tools/package_deps/bin/package_deps.dart
 There are several packages developed in `pkg/` which are published to pub.
 Validation of these packages is particularly important because the pub tools are
 not used for these packages during development; we get our dependency versions
-from the DEPS file. Its very easy for the dependencies specified in a package's
+from the DEPS file. It's very easy for the dependencies specified in a package's
 pubspec file to get out of date wrt the packages and versions actually used.
 
 In order to better ensure we're publishing correct packages, we validate some
@@ -38,6 +38,7 @@ are more informational as the pubspecs for these packages are not consumed by
 the pub tool or ecosystem.
 
 We validate:
+
 - that the dependencies listed in the pubspec are used in the package
 - that all the packages used by the source are listed in the pubspec
 - that a reference to a pkg/ package is done via a relative path dependency

pkg/_fe_analyzer_shared/lib/src/exhaustiveness/exhaustive.dart

@@ -294,7 +294,7 @@ class _Checker {
   }
 }
 
-/// Recursively expands [type] with its subtypes if its sealed.
+/// Recursively expands [type] with its subtypes if it's sealed.
 ///
 /// Otherwise, just returns [type].
 List<StaticType> expandSealedSubtypes(

pkg/_fe_analyzer_shared/lib/src/macros/executor/remote_instance.dart

@@ -51,7 +51,7 @@ abstract class RemoteInstance implements Serializable {
   @nonVirtual
   void serialize(Serializer serializer) {
     serializer.addInt(id);
-    // We only send the ID if it's in the cache, its only in our cache if it is
+    // We only send the ID if it's in the cache, it's only in our cache if it is
     // also in the remote cache.
     if (_remoteInstanceCache.containsKey(id)) return;
 

pkg/_fe_analyzer_shared/lib/src/macros/executor/serialization.dart

@@ -240,7 +240,7 @@ class JsonDeserializer implements Deserializer {
       _initialized = true;
     }
 
-    // Move the current iterable, if its at the end of its items remove it from
+    // Move the current iterable, if it's at the end of its items remove it from
     // the current path and return false.
     if (!_path.last.moveNext()) {
       _path.removeLast();

pkg/analyzer/lib/src/workspace/pub.dart

@@ -206,7 +206,7 @@ class PackageConfigWorkspace extends SimpleWorkspace {
 
   /// For some package file, which may or may not be a package source (it could
   /// be in `bin/`, `web/`, etc), find where its built counterpart will exist if
-  /// its a generated source.
+  /// it's a generated source.
   ///
   /// To get a [builtPath] for a package source file to use in this method,
   /// use [_builtPackageSourcePath]. For `bin/`, `web/`, etc, it must be relative

pkg/linter/doc/use_build_context_synchronously.md

@@ -81,7 +81,7 @@ This calculation is based on a few simple properties:
 * We implement this calculation with a standard SimpleVisitor from the analyzer.
   We create the visitor with **child** as the reference node to consider. Each
   visit method descends down various child nodes, receiving their returned
-  "async state" in order to calculate the state of it's own visited node,
+  "async state" in order to calculate the state of its own visited node,
   relative to **child**.
 * At the entrypoint of the visitation, **child**'s parent is **parent**. Then we
   descend into **parent**'s various descendents, and so for every other visit
@@ -116,4 +116,4 @@ This calculation is based on a few simple properties:
   then-statement, but not the else-statement, and no statements that follow the
   IfStatement. An IfStatement with a condition like `!context.mounted` and a
   then-statement that definitely exits (e.g. with a return or a throw),
-  definitely guards the statements that follow it.
+  definitely guards the statements that follow it.

pkg/linter/lib/src/rules/dangling_library_doc_comments.dart

@@ -154,7 +154,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
     var commentEndLine = lineInfo.getLocation(commentToken.end).lineNumber;
     // The syntactic entity to which a comment is "attached" is the
-    // [Comment]'s `parent`, not it's `endToken`'s `next` [Token].
+    // [Comment]'s `parent`, not its `endToken`'s `next` [Token].
     var tokenAfterDocComment =
         (docComment.endToken as DocumentationCommentToken).parent;
     if (tokenAfterDocComment == null) {

pkg/linter/lib/src/rules/prefer_const_constructors_in_immutables.dart

@@ -129,7 +129,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     return unnamedSuperConstructor != null && unnamedSuperConstructor.isConst;
   }
 
-  /// Whether [clazz] or any of it's super-types are annotated with
+  /// Whether [clazz] or any of its super-types are annotated with
   /// `@immutable`.
   bool _hasImmutableAnnotation(InterfaceElement clazz) {
     var selfAndInheritedClasses = _getSelfAndSuperClasses(clazz);

pkg/linter/lib/src/rules/prefer_double_quotes.dart

@@ -16,7 +16,7 @@ quote isn't escaped (note: we don't lint the other way around, ie, a double
 quoted string with an escaped double quote is not flagged).
 
 It's also rare, but possible, to have strings within string interpolations.  In
-this case, its much more readable to use a single quote somewhere.  So single
+this case, it's much more readable to use a single quote somewhere.  So single
 quotes are allowed either within, or containing, an interpolated string literal.
 Arguably strings within string interpolations should be its own type of lint.
 

pkg/linter/lib/src/rules/prefer_single_quotes.dart

@@ -17,7 +17,7 @@ apostrophe isn't escaped (note: we don't lint the other way around, ie, a single
 quoted string with an escaped apostrophe is not flagged).
 
 It's also rare, but possible, to have strings within string interpolations.  In
-this case, its much more readable to use a double quote somewhere.  So double
+this case, it's much more readable to use a double quote somewhere.  So double
 quotes are allowed either within, or containing, an interpolated string literal.
 Arguably strings within string interpolations should be its own type of lint.
 

pkg/linter/tool/machine/rules.json

@@ -1796,7 +1796,7 @@
     ],
     "sets": [],
     "fixStatus": "hasFix",
-    "details": "**DO** use double quotes where they wouldn't require additional escapes.\n\nThat means strings with a double quote may use apostrophes so that the double\nquote isn't escaped (note: we don't lint the other way around, ie, a double\nquoted string with an escaped double quote is not flagged).\n\nIt's also rare, but possible, to have strings within string interpolations.  In\nthis case, its much more readable to use a single quote somewhere.  So single\nquotes are allowed either within, or containing, an interpolated string literal.\nArguably strings within string interpolations should be its own type of lint.\n\n**BAD:**\n```dart\nuseStrings(\n    'should be double quote',\n    r'should be double quote',\n    r'''should be double quotes''')\n```\n\n**GOOD:**\n```dart\nuseStrings(\n    \"should be double quote\",\n    r\"should be double quote\",\n    r\"\"\"should be double quotes\"\"\",\n    'ok with \" inside',\n    'nested ${a ? \"strings\" : \"can\"} be wrapped by a double quote',\n    \"and nested ${a ? 'strings' : 'can be double quoted themselves'}\");\n```\n\n",
+    "details": "**DO** use double quotes where they wouldn't require additional escapes.\n\nThat means strings with a double quote may use apostrophes so that the double\nquote isn't escaped (note: we don't lint the other way around, ie, a double\nquoted string with an escaped double quote is not flagged).\n\nIt's also rare, but possible, to have strings within string interpolations.  In\nthis case, it's much more readable to use a single quote somewhere.  So single\nquotes are allowed either within, or containing, an interpolated string literal.\nArguably strings within string interpolations should be its own type of lint.\n\n**BAD:**\n```dart\nuseStrings(\n    'should be double quote',\n    r'should be double quote',\n    r'''should be double quotes''')\n```\n\n**GOOD:**\n```dart\nuseStrings(\n    \"should be double quote\",\n    r\"should be double quote\",\n    r\"\"\"should be double quotes\"\"\",\n    'ok with \" inside',\n    'nested ${a ? \"strings\" : \"can\"} be wrapped by a double quote',\n    \"and nested ${a ? 'strings' : 'can be double quoted themselves'}\");\n```\n\n",
     "sinceDartSdk": "2.4.0"
   },
   {
@@ -2110,7 +2110,7 @@
     ],
     "sets": [],
     "fixStatus": "hasFix",
-    "details": "**DO** use single quotes where they wouldn't require additional escapes.\n\nThat means strings with an apostrophe may use double quotes so that the\napostrophe isn't escaped (note: we don't lint the other way around, ie, a single\nquoted string with an escaped apostrophe is not flagged).\n\nIt's also rare, but possible, to have strings within string interpolations.  In\nthis case, its much more readable to use a double quote somewhere.  So double\nquotes are allowed either within, or containing, an interpolated string literal.\nArguably strings within string interpolations should be its own type of lint.\n\n**BAD:**\n```dart\nuseStrings(\n    \"should be single quote\",\n    r\"should be single quote\",\n    r\"\"\"should be single quotes\"\"\")\n```\n\n**GOOD:**\n```dart\nuseStrings(\n    'should be single quote',\n    r'should be single quote',\n    r'''should be single quotes''',\n    \"here's ok\",\n    \"nested ${a ? 'strings' : 'can'} be wrapped by a double quote\",\n    'and nested ${a ? \"strings\" : \"can be double quoted themselves\"}');\n```\n\n",
+    "details": "**DO** use single quotes where they wouldn't require additional escapes.\n\nThat means strings with an apostrophe may use double quotes so that the\napostrophe isn't escaped (note: we don't lint the other way around, ie, a single\nquoted string with an escaped apostrophe is not flagged).\n\nIt's also rare, but possible, to have strings within string interpolations.  In\nthis case, it's much more readable to use a double quote somewhere.  So double\nquotes are allowed either within, or containing, an interpolated string literal.\nArguably strings within string interpolations should be its own type of lint.\n\n**BAD:**\n```dart\nuseStrings(\n    \"should be single quote\",\n    r\"should be single quote\",\n    r\"\"\"should be single quotes\"\"\")\n```\n\n**GOOD:**\n```dart\nuseStrings(\n    'should be single quote',\n    r'should be single quote',\n    r'''should be single quotes''',\n    \"here's ok\",\n    \"nested ${a ? 'strings' : 'can'} be wrapped by a double quote\",\n    'and nested ${a ? \"strings\" : \"can be double quoted themselves\"}');\n```\n\n",
     "sinceDartSdk": "2.0.0"
   },
   {