From ec44aa6795c259ff97220a727433ecd7cb50f69a Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 13 Nov 2019 13:42:32 -0800
Subject: [PATCH 1/6] Quality of life tooling changes for dartdoc

---
 lib/src/dartdoc_options.dart      | 14 ++++--
 lib/src/element_type.dart         |  3 +-
 lib/src/html/html_generator.dart  |  3 +-
 lib/src/html/template_data.dart   |  6 ++-
 lib/src/model/categorization.dart |  3 +-
 lib/src/model/category.dart       |  1 -
 test/model_test.dart              | 29 +++++++-----
 tool/grind.dart                   | 77 ++++++++++++++++++++++++++-----
 tool/travis.sh                    |  8 +---
 9 files changed, 102 insertions(+), 42 deletions(-)

diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart
index 6fd89ed012..223ed301da 100644
--- a/lib/src/dartdoc_options.dart
+++ b/lib/src/dartdoc_options.dart
@@ -1376,7 +1376,8 @@ class DartdocOptionContext extends DartdocOptionContextBase
 
   bool get injectHtml => optionSet['injectHtml'].valueAt(context);
 
-  bool get excludeFooterVersion => optionSet['excludeFooterVersion'].valueAt(context);
+  bool get excludeFooterVersion =>
+      optionSet['excludeFooterVersion'].valueAt(context);
 
   ToolConfiguration get tools => optionSet['tools'].valueAt(context);
 
@@ -1420,8 +1421,7 @@ class DartdocOptionContext extends DartdocOptionContextBase
   bool isPackageExcluded(String name) =>
       excludePackages.any((pattern) => name == pattern);
 
-  String get templatesDir =>
-      optionSet['templatesDir'].valueAt(context);
+  String get templatesDir => optionSet['templatesDir'].valueAt(context);
 }
 
 /// Instantiate dartdoc's configuration file and options parser with the
@@ -1624,8 +1624,12 @@ Future<List<DartdocOption>> createDartdocOptions() async {
             'exist. Executables for different platforms are specified by '
             'giving the platform name as a key, and a list of strings as the '
             'command.'),
-    DartdocOptionArgOnly<String>("templatesDir", null, isDir: true, mustExist: true, hide: true,
-        help: 'Path to a directory containing templates to use instead of the default ones. '
+    DartdocOptionArgOnly<String>("templatesDir", null,
+        isDir: true,
+        mustExist: true,
+        hide: true,
+        help:
+            'Path to a directory containing templates to use instead of the default ones. '
             'Directory must contain an html file for each of the following: 404error, category, '
             'class, constant, constructor, enum, function, index, library, method, mixin, '
             'property, top_level_constant, top_level_property, typedef. Partial templates are '
diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart
index f753c6d65b..5f026fa287 100644
--- a/lib/src/element_type.dart
+++ b/lib/src/element_type.dart
@@ -329,7 +329,8 @@ abstract class DefinedElementType extends ElementType {
   DartType get instantiatedType {
     if (_instantiatedType == null) {
       if (!interfaceType.typeArguments.every((t) => t is InterfaceType)) {
-        _instantiatedType = packageGraph.typeSystem.instantiateToBounds(interfaceType);
+        _instantiatedType =
+            packageGraph.typeSystem.instantiateToBounds(interfaceType);
       } else {
         _instantiatedType = interfaceType;
       }
diff --git a/lib/src/html/html_generator.dart b/lib/src/html/html_generator.dart
index 93fe22151b..f346499cf7 100644
--- a/lib/src/html/html_generator.dart
+++ b/lib/src/html/html_generator.dart
@@ -59,8 +59,7 @@ class HtmlGenerator extends Generator {
     String dirname = options?.templatesDir;
     if (dirname != null) {
       Directory templateDir = Directory(dirname);
-      templates = await Templates.fromDirectory(
-          templateDir,
+      templates = await Templates.fromDirectory(templateDir,
           headerPaths: headers,
           footerPaths: footers,
           footerTextPaths: footerTexts);
diff --git a/lib/src/html/template_data.dart b/lib/src/html/template_data.dart
index 8e1095b3f6..d03974b36f 100644
--- a/lib/src/html/template_data.dart
+++ b/lib/src/html/template_data.dart
@@ -295,7 +295,8 @@ class MethodTemplateData extends TemplateData<Method> {
   @override
   Method get self => method;
   @override
-  String get title => '${method.name} method - ${container.name} ${containerDesc} - '
+  String get title =>
+      '${method.name} method - ${container.name} ${containerDesc} - '
       '${library.name} library - Dart API';
   @override
   String get layoutTitle => _layoutTitle(
@@ -328,7 +329,8 @@ class PropertyTemplateData extends TemplateData<Field> {
   Field get self => property;
 
   @override
-  String get title => '${property.name} $type - ${container.name} ${containerDesc} - '
+  String get title =>
+      '${property.name} $type - ${container.name} ${containerDesc} - '
       '${library.name} library - Dart API';
   @override
   String get layoutTitle =>
diff --git a/lib/src/model/categorization.dart b/lib/src/model/categorization.dart
index 0f8d9d8343..1229ad2eec 100644
--- a/lib/src/model/categorization.dart
+++ b/lib/src/model/categorization.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-
 import 'package:dartdoc/src/model/model.dart';
 
 final categoryRegexp = RegExp(
@@ -115,7 +114,7 @@ abstract class Categorization implements ModelElement {
           .map((n) => package.nameToCategory[n])
           .where((c) => c != null)
           .toList()
-        ..sort();
+            ..sort();
     }
     return _categories;
   }
diff --git a/lib/src/model/category.dart b/lib/src/model/category.dart
index d080ac3fc5..9cd8ec5f17 100644
--- a/lib/src/model/category.dart
+++ b/lib/src/model/category.dart
@@ -10,7 +10,6 @@ import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/package_meta.dart';
 import 'package:dartdoc/src/warnings.dart';
 
-
 /// A category is a subcategory of a package, containing libraries tagged
 /// with a @category identifier.
 class Category extends Nameable
diff --git a/test/model_test.dart b/test/model_test.dart
index a7cbc1ac36..fb39385fdb 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -710,11 +710,12 @@ void main() {
     EnumField enumValue2;
 
     setUpAll(() {
-      enumWithAnimation = exLibrary.enums.firstWhere((c) => c.name == 'EnumWithAnimation');
-      enumValue1 = enumWithAnimation.constants
-          .firstWhere((m) => m.name == 'value1');
-      enumValue2 = enumWithAnimation.constants
-          .firstWhere((m) => m.name == 'value2');
+      enumWithAnimation =
+          exLibrary.enums.firstWhere((c) => c.name == 'EnumWithAnimation');
+      enumValue1 =
+          enumWithAnimation.constants.firstWhere((m) => m.name == 'value1');
+      enumValue2 =
+          enumWithAnimation.constants.firstWhere((m) => m.name == 'value2');
       dog = exLibrary.classes.firstWhere((c) => c.name == 'Dog');
       withAnimation =
           dog.allInstanceMethods.firstWhere((m) => m.name == 'withAnimation');
@@ -775,12 +776,18 @@ void main() {
           contains('<video id="outOfOrder"'));
     });
     test("Enum field animation identifiers are unique.", () {
-      expect(enumValue1.documentationAsHtml, contains('<video id="animation_1"'));
-      expect(enumValue1.documentationAsHtml, contains('<video id="animation_2"'));
-      expect(enumValue2.documentationAsHtml, isNot(contains('<video id="animation_1"')));
-      expect(enumValue2.documentationAsHtml, isNot(contains('<video id="animation_2"')));
-      expect(enumValue2.documentationAsHtml, contains('<video id="animation_3"'));
-      expect(enumValue2.documentationAsHtml, contains('<video id="animation_4"'));
+      expect(
+          enumValue1.documentationAsHtml, contains('<video id="animation_1"'));
+      expect(
+          enumValue1.documentationAsHtml, contains('<video id="animation_2"'));
+      expect(enumValue2.documentationAsHtml,
+          isNot(contains('<video id="animation_1"')));
+      expect(enumValue2.documentationAsHtml,
+          isNot(contains('<video id="animation_2"')));
+      expect(
+          enumValue2.documentationAsHtml, contains('<video id="animation_3"'));
+      expect(
+          enumValue2.documentationAsHtml, contains('<video id="animation_4"'));
     });
   });
 
diff --git a/tool/grind.dart b/tool/grind.dart
index e4e3d756b2..a7399909a1 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -224,12 +224,42 @@ void analyze() async {
   );
 }
 
-@Task('analyze, test, and self-test dartdoc')
-@Depends(analyze, checkBuild, test, testDartdoc)
-void buildbotNoPublish() => null;
+@Task('Check for dartfmt cleanliness')
+void dartfmt() async {
+  if (Platform.version.contains('dev')) {
+    List<String> filesToFix = [];
+    // Filter out test packages as they always have strange formatting.
+    // Passing parameters to dartfmt for directories to search results in
+    // filenames being stripped of the dirname so we have to filter here.
+    void addFileToFix(String fileName) {
+      if (path.split(fileName).first == 'testing') return;
+      filesToFix.add(fileName);
+    }
 
-@Task('analyze, test, and self-test dartdoc')
-@Depends(analyze, checkBuild, test, testDartdoc, tryPublish)
+    log('Validating dartfmt with version ${Platform.version}');
+    await SubprocessLauncher('dartfmt').runStreamed(
+        sdkBin('dartfmt'),
+        [
+          '-n',
+          '.',
+        ],
+        perLine: addFileToFix);
+    if (filesToFix.isNotEmpty) {
+      fail(
+          'dartfmt found files needing reformatting. Use this command to reformat:\n'
+          'dartfmt -w ${filesToFix.map((f) => "\'$f\'").join(' ')}');
+    }
+  } else {
+    log('Skipping dartfmt check, requires latest dev version of SDK');
+  }
+}
+
+@Task('Run quick presubmit checks.')
+@Depends(analyze, checkBuild, smokeTest, dartfmt, tryPublish)
+void presubmit() => null;
+
+@Task('Run long tests, self-test dartdoc, and run the publish test')
+@Depends(presubmit, test, testDartdoc)
 void buildbot() => null;
 
 @Task('Generate docs for the Dart SDK')
@@ -846,26 +876,49 @@ Future<void> checkBuild() async {
 @Task('Dry run of publish to pub.dartlang')
 @Depends(checkChangelogHasVersion)
 Future<void> tryPublish() async {
-  var launcher = SubprocessLauncher('try-publish');
-  await launcher.runStreamed(sdkBin('pub'), ['publish', '-n']);
+  if (Platform.version.contains('dev')) {
+    log('Skipping publish check -- requires a stable version of the SDK');
+  } else {
+    var launcher = SubprocessLauncher('try-publish');
+    await launcher.runStreamed(sdkBin('pub'), ['publish', '-n']);
+  }
+}
+
+@Task('Run a smoke test, only')
+Future<void> smokeTest() async {
+  await testDart2(smokeTestFiles);
+  await testFutures.wait();
+}
+
+@Task('Run non-smoke tests, only')
+Future<void> longTest() async {
+  await testDart2(testFiles);
+  await testFutures.wait();
 }
 
 @Task('Run all the tests.')
 Future<void> test() async {
-  await testDart2();
+  await testDart2(smokeTestFiles.followedBy(testFiles));
   await testFutures.wait();
 }
 
+List<File> get smokeTestFiles => Directory('test')
+    .listSync(recursive: true)
+    .whereType<File>()
+    .where((e) => path.basename(e.path) == 'model_test.dart')
+    .toList();
+
 List<File> get testFiles => Directory('test')
     .listSync(recursive: true)
-    .where((e) => e is File && e.path.endsWith('test.dart'))
-    .cast<File>()
+    .whereType<File>()
+    .where((e) => e.path.endsWith('test.dart'))
+    .where((e) => path.basename(e.path) != 'model_test.dart')
     .toList();
 
-Future<void> testDart2() async {
+Future<void> testDart2(Iterable<File> tests) async {
   List<String> parameters = ['--enable-asserts'];
 
-  for (File dartFile in testFiles) {
+  for (File dartFile in tests) {
     await testFutures.addFutureFromClosure(() =>
         CoverageSubprocessLauncher('dart2-${path.basename(dartFile.path)}')
             .runStreamed(
diff --git a/tool/travis.sh b/tool/travis.sh
index ee67b9ebd4..289a1f3034 100755
--- a/tool/travis.sh
+++ b/tool/travis.sh
@@ -39,14 +39,10 @@ elif [ "$DARTDOC_BOT" = "packages" ]; then
 elif [ "$DARTDOC_BOT" = "sdk-analyzer" ]; then
   echo "Running main dartdoc bot against the SDK analyzer"
   unset COVERAGE_TOKEN
-  DARTDOC_GRIND_STEP=buildbot-no-publish pub run grinder test-with-analyzer-sdk
+  DARTDOC_GRIND_STEP=buildbot pub run grinder test-with-analyzer-sdk
 else
   echo "Running main dartdoc bot"
-  if echo "${DART_VERSION}" | grep -q dev ; then
-    pub run grinder buildbot-no-publish
-  else
-    pub run grinder buildbot
-  fi
+  pub run grinder buildbot
   if [ -n "$COVERAGE_TOKEN" ] ; then
     coveralls-lcov --repo-token="${COVERAGE_TOKEN}" lcov.info
   fi

From 9ee11bd4c23cfd0dc06d3545f32c8501e15372a8 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 13 Nov 2019 13:45:16 -0800
Subject: [PATCH 2/6] Add a CONTRIBUTING comment

---
 CONTRIBUTING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 48b42bdd53..91bc4b4209 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,7 +26,8 @@ yet in the issue tracker, start by opening an issue. Thanks!
 3. Please include a test for your change.  `dartdoc` has both `package:test`-style unittests as well as integration tests.  To run the unittests, use `grind test`.
 4. For major changes, run `grind compare-sdk-warnings` and `grind compare-flutter-warnings`, and include the summary results in your pull request.
 5. Be sure to format your Dart code using `dartfmt -w`, otherwise travis will complain.
-6. Post your change via a pull request for review and integration!
+6. Use `grind presubmit` before creating a pull request to quickly check for common problems.
+7. Post your change via a pull request for review and integration!
 
 ## Testing
 

From b91705d81e15564b0b8ac2abaa078423d18ab9dd Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 13 Nov 2019 13:49:48 -0800
Subject: [PATCH 3/6] Update appveyor call to grinder

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 1b49bf5e55..ef3b20394f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,4 +23,4 @@ install:
 build: off
 
 test_script:
-  - pub run grinder buildbot-no-publish
+  - pub run grinder buildbot

From 84301f9dc22e15d65785ed933e1f385e1faf76ef Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 13 Nov 2019 14:08:34 -0800
Subject: [PATCH 4/6] Strip fragile checks from the sdk-analyzer test hack

---
 tool/travis.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tool/travis.sh b/tool/travis.sh
index 289a1f3034..a35697e282 100755
--- a/tool/travis.sh
+++ b/tool/travis.sh
@@ -37,9 +37,9 @@ elif [ "$DARTDOC_BOT" = "packages" ]; then
   PACKAGE_NAME=flutter_plugin_tools PACKAGE_VERSION=">=0.0.14+1" pub run grinder build-pub-package 2>&1 | grep "dartdoc failed: dartdoc could not find any libraries to document.$"
   PACKAGE_NAME=shelf_exception_handler PACKAGE_VERSION=">=0.2.0" pub run grinder build-pub-package
 elif [ "$DARTDOC_BOT" = "sdk-analyzer" ]; then
-  echo "Running main dartdoc bot against the SDK analyzer"
+  echo "Running all tests against the SDK analyzer"
   unset COVERAGE_TOKEN
-  DARTDOC_GRIND_STEP=buildbot pub run grinder test-with-analyzer-sdk
+  pub run grinder test-with-analyzer-sdk
 else
   echo "Running main dartdoc bot"
   pub run grinder buildbot

From 1064e32319c8fdfa75600380959b5439d72d8e8b Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 13 Nov 2019 16:02:15 -0800
Subject: [PATCH 5/6] Add 'late' as a feature for final variables

---
 lib/src/model/field.dart                      |  6 ++++
 lib/src/model/model_element.dart              |  4 +++
 lib/src/model/top_level_variable.dart         |  6 ++++
 test/model_special_cases_test.dart            | 27 ++++++++++++++--
 test/model_test.dart                          | 32 +++++++++++++++++--
 .../lib/late_final_without_initializer.dart   |  2 ++
 6 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/lib/src/model/field.dart b/lib/src/model/field.dart
index 0232a2d577..e9f6606ffb 100644
--- a/lib/src/model/field.dart
+++ b/lib/src/model/field.dart
@@ -92,6 +92,12 @@ class Field extends ModelElement
     return field.isFinal;
   }
 
+  @override
+  bool get isLate {
+    if (isFinal) return field.isLate;
+    return false;
+  }
+
   @override
   bool get isInherited => _isInherited;
 
diff --git a/lib/src/model/model_element.dart b/lib/src/model/model_element.dart
index 3ef9b30a6b..671a1bd816 100644
--- a/lib/src/model/model_element.dart
+++ b/lib/src/model/model_element.dart
@@ -43,6 +43,7 @@ const Map<String, int> featureOrder = {
   'read / write': 1,
   'covariant': 2,
   'final': 2,
+  'late': 2,
   'inherited': 3,
   'inherited-getter': 3,
   'inherited-setter': 3,
@@ -499,6 +500,7 @@ abstract class ModelElement extends Canonicalization
     // const and static are not needed here because const/static elements get
     // their own sections in the doc.
     if (isFinal) allFeatures.add('final');
+    if (isLate) allFeatures.add('late');
     return allFeatures;
   }
 
@@ -897,6 +899,8 @@ abstract class ModelElement extends Canonicalization
 
   bool get isFinal => false;
 
+  bool get isLate => false;
+
   bool get isLocalElement => element is LocalElement;
 
   bool get isPropertyAccessor => element is PropertyAccessorElement;
diff --git a/lib/src/model/top_level_variable.dart b/lib/src/model/top_level_variable.dart
index 2d93a8c174..f731fa2eed 100644
--- a/lib/src/model/top_level_variable.dart
+++ b/lib/src/model/top_level_variable.dart
@@ -65,6 +65,12 @@ class TopLevelVariable extends ModelElement
     return _variable.isFinal;
   }
 
+  @override
+  bool get isLate {
+    if (isFinal) return _variable.isLate;
+    return false;
+  }
+
   @override
   String get kind => isConst ? 'top-level constant' : 'top-level property';
 
diff --git a/test/model_special_cases_test.dart b/test/model_special_cases_test.dart
index c8575a70db..fdcd82792b 100644
--- a/test/model_special_cases_test.dart
+++ b/test/model_special_cases_test.dart
@@ -36,19 +36,42 @@ void main() {
           .firstWhere((lib) => lib.name == 'late_final_without_initializer');
     });
 
-    test('Late finals test', () {
+    test('Late final class member test', () {
       Class c = lateFinalWithoutInitializer.allClasses
           .firstWhere((c) => c.name == 'C');
       Field a = c.allFields.firstWhere((f) => f.name == 'a');
       Field b = c.allFields.firstWhere((f) => f.name == 'b');
       Field cField = c.allFields.firstWhere((f) => f.name == 'cField');
       Field dField = c.allFields.firstWhere((f) => f.name == 'dField');
-      // If nnbd isn't enabled, fields named 'late' come back from the analyzer.
+
+      // If nnbd isn't enabled, fields named 'late' come back from the analyzer
+      // instead of setting up 'isLate'.
       expect(c.allFields.any((f) => f.name == 'late'), isFalse);
+
       expect(a.modelType.returnType.name, equals('dynamic'));
+      expect(a.isLate, isTrue);
+      expect(a.features, contains('late'));
+
       expect(b.modelType.returnType.name, equals('int'));
+      expect(b.isLate, isTrue);
+      expect(b.features, contains('late'));
+
       expect(cField.modelType.returnType.name, equals('dynamic'));
+      expect(cField.isLate, isTrue);
+      expect(cField.features, contains('late'));
+
       expect(dField.modelType.returnType.name, equals('double'));
+      expect(dField.isLate, isTrue);
+      expect(dField.features, contains('late'));
+    });
+
+    test('Late final top level variables', () {
+      TopLevelVariable initializeMe = lateFinalWithoutInitializer
+          .publicProperties
+          .firstWhere((v) => v.name == 'initializeMe');
+      expect(initializeMe.modelType.returnType.name, equals('String'));
+      expect(initializeMe.isLate, isTrue);
+      expect(initializeMe.features, contains('late'));
     });
   });
 
diff --git a/test/model_test.dart b/test/model_test.dart
index 1d74f7e909..c67bf45fff 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -2513,6 +2513,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     Field explicitGetterSetter;
     Field explicitNonDocumentedInBaseClassGetter;
     Field documentedPartialFieldInSubclassOnly;
+    Field finalProperty;
     Field ExtraSpecialListLength;
     Field aProperty;
     Field covariantField, covariantSetter;
@@ -2539,6 +2540,8 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
               (e) => e.name == 'explicitNonDocumentedInBaseClassGetter');
       documentedPartialFieldInSubclassOnly = UnusualProperties.allModelElements
           .firstWhere((e) => e.name == 'documentedPartialFieldInSubclassOnly');
+      finalProperty = UnusualProperties.allModelElements
+          .firstWhere((e) => e.name == 'finalProperty');
 
       isEmpty =
           CatString.allInstanceFields.firstWhere((p) => p.name == 'isEmpty');
@@ -2774,8 +2777,18 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(constField.isConst, isTrue);
     });
 
-    test('is not final', () {
+    test('is final only when appropriate', () {
       expect(f1.isFinal, isFalse);
+      expect(finalProperty.isFinal, isTrue);
+      expect(finalProperty.isLate, isFalse);
+      expect(finalProperty.features, contains('final'));
+      expect(finalProperty.features, isNot(contains('late')));
+      expect(onlySetter.isFinal, isFalse);
+      expect(onlySetter.features, isNot(contains('final')));
+      expect(onlySetter.features, isNot(contains('late')));
+      expect(dynamicGetter.isFinal, isFalse);
+      expect(dynamicGetter.features, isNot(contains('final')));
+      expect(dynamicGetter.features, isNot(contains('late')));
     });
 
     test('is not static', () {
@@ -2885,11 +2898,13 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     TopLevelVariable setAndGet, mapWithDynamicKeys;
     TopLevelVariable nodocGetter, nodocSetter;
     TopLevelVariable complicatedReturn;
-    TopLevelVariable importantComputations;
+    TopLevelVariable meaningOfLife, importantComputations;
 
     setUpAll(() {
       v = exLibrary.properties.firstWhere((p) => p.name == 'number');
       v3 = exLibrary.properties.firstWhere((p) => p.name == 'y');
+      meaningOfLife =
+          fakeLibrary.properties.firstWhere((v) => v.name == 'meaningOfLife');
       importantComputations = fakeLibrary.properties
           .firstWhere((v) => v.name == 'importantComputations');
       complicatedReturn = fakeLibrary.properties
@@ -2908,6 +2923,19 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .firstWhere((p) => p.name == 'mapWithDynamicKeys');
     });
 
+    test('Verify that final and late show up (or not) appropriately', () {
+      expect(meaningOfLife.isFinal, isTrue);
+      expect(meaningOfLife.isLate, isFalse);
+      expect(meaningOfLife.features, contains('final'));
+      expect(meaningOfLife.features, isNot(contains('late')));
+      expect(justGetter.isFinal, isFalse);
+      expect(justGetter.features, isNot(contains('final')));
+      expect(justGetter.features, isNot(contains('late')));
+      expect(justSetter.isFinal, isFalse);
+      expect(justSetter.features, isNot(contains('final')));
+      expect(justSetter.features, isNot(contains('late')));
+    });
+
     test(
         'Verify that a map containing anonymous functions as values works correctly',
         () {
diff --git a/testing/test_package_experiments/lib/late_final_without_initializer.dart b/testing/test_package_experiments/lib/late_final_without_initializer.dart
index 3cf903ccad..27765b26a2 100644
--- a/testing/test_package_experiments/lib/late_final_without_initializer.dart
+++ b/testing/test_package_experiments/lib/late_final_without_initializer.dart
@@ -4,6 +4,8 @@
 
 import 'dart:math';
 
+late final String initializeMe;
+
 class C {
   late final a;
   late final b = 0;

From 3306b7bf3278ed5c1fc5456c98716b507ba123bc Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 13 Nov 2019 16:24:58 -0800
Subject: [PATCH 6/6] Review comments

---
 lib/src/model/field.dart              | 5 +----
 lib/src/model/top_level_variable.dart | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/src/model/field.dart b/lib/src/model/field.dart
index e9f6606ffb..a1b74409ff 100644
--- a/lib/src/model/field.dart
+++ b/lib/src/model/field.dart
@@ -93,10 +93,7 @@ class Field extends ModelElement
   }
 
   @override
-  bool get isLate {
-    if (isFinal) return field.isLate;
-    return false;
-  }
+  bool get isLate => isFinal && field.isLate;
 
   @override
   bool get isInherited => _isInherited;
diff --git a/lib/src/model/top_level_variable.dart b/lib/src/model/top_level_variable.dart
index f731fa2eed..3b53961799 100644
--- a/lib/src/model/top_level_variable.dart
+++ b/lib/src/model/top_level_variable.dart
@@ -66,10 +66,7 @@ class TopLevelVariable extends ModelElement
   }
 
   @override
-  bool get isLate {
-    if (isFinal) return _variable.isLate;
-    return false;
-  }
+  bool get isLate => isFinal && _variable.isLate;
 
   @override
   String get kind => isConst ? 'top-level constant' : 'top-level property';