Merge branch 'master' into fix-line-number-cache

Author: jcollins-g

pubspec.yaml

@@ -8,7 +8,7 @@ environment:
   sdk: '>=2.1.0-dev.9.4 <3.0.0'
 
 dependencies:
-  analyzer: ^0.35.0
+  analyzer: ^0.35.1
   args: '>=1.4.1 <2.0.0'
   collection: ^1.2.0
   crypto: ^2.0.6

test/model_test.dart

@@ -127,7 +127,8 @@ void main() {
       expect(typedSet.modelType.name, equals('Set'));
       expect(typedSet.modelType.typeArguments.map((a) => a.name).toList(),
           equals(['String']));
-      expect(typedSet.constantValue, equals('const <String> {}'));
+      expect(typedSet.constantValue,
+          matches(new RegExp(r'const <String>\s?{}')));
     });
   });
 
@@ -3061,8 +3062,10 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     });
 
     test('PRETTY_COLORS', () {
-      expect(prettyColorsConstant.constantValue,
-          "const <String> [COLOR_GREEN, COLOR_ORANGE, 'blue']");
+      expect(
+          prettyColorsConstant.constantValue,
+          matches(new RegExp(
+              r"const <String>\s?\[COLOR_GREEN, COLOR_ORANGE, 'blue'\]")));
     });
 
     test('MY_CAT is linked', () {

tool/grind.dart

@@ -959,24 +959,27 @@ Future<void> testDartdocFlutterPlugin() async {
 @Task('Validate the SDK doc build.')
 @Depends(buildSdkDocs)
 void validateSdkDocs() {
-  const expectedLibCount = 0;
-  const expectedSubLibCount = 19;
+  // TODO(jcollins-g): Remove flexibility in library counts once dev build
+  // includes https://dart-review.googlesource.com/c/sdk/+/93160
+  const expectedLibCounts = [0, 1];
+  const expectedSubLibCount = [19, 20];
+  const expectedTotalCount = [19, 20];
   File indexHtml = joinFile(sdkDocsDir, ['index.html']);
   if (!indexHtml.existsSync()) {
     fail('no index.html found for SDK docs');
   }
   log('found index.html');
   String indexContents = indexHtml.readAsStringSync();
   int foundLibs = _findCount(indexContents, '  <li><a href="dart-');
-  if (foundLibs != expectedLibCount) {
+  if (!expectedLibCounts.contains(foundLibs)) {
     fail(
-        'expected $expectedLibCount dart: index.html entries, found $foundLibs');
+        'expected $expectedTotalCount dart: index.html entries, found $foundLibs');
   }
   log('$foundLibs index.html dart: entries found');
 
   int foundSubLibs =
       _findCount(indexContents, '<li class="section-subitem"><a href="dart-');
-  if (foundSubLibs != expectedSubLibCount) {
+  if (!expectedSubLibCount.contains(foundSubLibs)) {
     fail(
         'expected $expectedSubLibCount dart: index.html entries in categories, found $foundSubLibs');
   }
@@ -985,9 +988,9 @@ void validateSdkDocs() {
   // check for the existence of certain files/dirs
   var libsLength =
       sdkDocsDir.listSync().where((fs) => fs.path.contains('dart-')).length;
-  if (libsLength != expectedLibCount + expectedSubLibCount) {
+  if (!expectedTotalCount.contains(libsLength)) {
     fail('docs not generated for all the SDK libraries, '
-        'expected ${expectedLibCount + expectedSubLibCount} directories, generated $libsLength directories');
+        'expected ${expectedTotalCount + expectedTotalCount} directories, generated $libsLength directories');
   }
   log('$libsLength dart: libraries found');