Fix flutter bot problems and a macro issue (#1811)

* Rebuild test package docs and update grind script

* Add accessors to allModelElements and verify macros work for enum accessors

* Stable docs rebuild

Author: jcollins-g

lib/src/model.dart

@@ -127,7 +127,7 @@ abstract class Inheritable implements ModelElement {
   @override
   ModelElement _buildCanonicalModelElement() {
     return canonicalEnclosingElement?.allCanonicalModelElements
-        ?.firstWhere((m) => m.name == name, orElse: () => null);
+        ?.firstWhere((m) => m.name == name && m.isPropertyAccessor == isPropertyAccessor, orElse: () => null);
   }
 
   Class get canonicalEnclosingElement {
@@ -621,12 +621,14 @@ class Class extends ModelElement
   }
 
   Iterable<Accessor> get allAccessors {
-    return allInstanceProperties.expand((f) {
-      List<Accessor> getterSetters = [];
-      if (f.hasGetter) getterSetters.add(f.getter);
-      if (f.hasSetter) getterSetters.add(f.setter);
-      return getterSetters;
-    });
+    return []
+      ..addAll(allInstanceProperties.expand((f) {
+        List<Accessor> getterSetters = [];
+        if (f.hasGetter) getterSetters.add(f.getter);
+        if (f.hasSetter) getterSetters.add(f.setter);
+        return getterSetters;
+      }))
+      ..addAll(constants.map<Accessor>((c) => c.getter));
   }
 
   Iterable<Field> get allPublicInstanceProperties =>
@@ -2542,6 +2544,11 @@ class Library extends ModelElement with Categorization, TopLevelContainer {
         results.add(c);
       });
 
+      library.enums.forEach((e) {
+        results.addAll(e.allModelElements);
+        results.add(e);
+      });
+
       _modelElementsMap = new Map<Element, Set<ModelElement>>();
       results.forEach((modelElement) {
         _modelElementsMap.putIfAbsent(modelElement.element, () => new Set());
@@ -4652,7 +4659,7 @@ class PackageGraph {
   final PackageWarningOptions _packageWarningOptions;
   PackageWarningCounter _packageWarningCounter;
 
-  /// All ModelElements constructed for this package; a superset of allModelElements.
+  /// All ModelElements constructed for this package; a superset of [allModelElements].
   final Map<Tuple3<Element, Library, Class>, ModelElement>
       _allConstructedModelElements = new Map();
 

test/compare_output_test.dart

@@ -85,6 +85,7 @@ void main() {
       }
       // This must be synced with ../tool/grind.dart's updateTestPackageDocs().
       var args = <String>[
+        '--enable-asserts',
         dartdocBin,
         '--auto-include-dependencies',
         '--example-path-prefix',

test/model_test.dart

@@ -695,7 +695,9 @@ void main() {
 
   group('Macros', () {
     Class dog;
+    Enum MacrosFromAccessors;
     Method withMacro, withMacro2, withPrivateMacro, withUndefinedMacro;
+    EnumField macroReferencedHere;
 
     setUp(() {
       dog = exLibrary.classes.firstWhere((c) => c.name == 'Dog');
@@ -707,7 +709,12 @@ void main() {
           .firstWhere((m) => m.name == 'withPrivateMacro');
       withUndefinedMacro = dog.allInstanceMethods
           .firstWhere((m) => m.name == 'withUndefinedMacro');
-      packageGraph.allLocalModelElements.forEach((m) => m.documentation);
+      MacrosFromAccessors = fakeLibrary.enums.firstWhere((e) => e.name == 'MacrosFromAccessors');
+      macroReferencedHere = MacrosFromAccessors.publicConstants.firstWhere((e) => e.name == 'macroReferencedHere');
+    });
+
+    test("renders a macro defined within a enum", () {
+      expect(macroReferencedHere.documentationAsHtml, contains('This is a macro defined in an Enum accessor.'));
     });
 
     test("renders a macro within the same comment where it's defined", () {
@@ -725,6 +732,8 @@ void main() {
     });
 
     test("a warning is generated for unknown macros", () {
+      // Retrieve documentation first to generate the warning.
+      withUndefinedMacro.documentation;
       expect(
           packageGraph.packageWarningCounter.hasWarning(withUndefinedMacro,
               PackageWarning.unknownMacro, 'ThatDoesNotExist'),

testing/test_package/lib/fake.dart

@@ -852,6 +852,19 @@ class BaseForDocComments {
   String operator [](String key) => "${key}'s value";
 }
 
+/// Verify that we can define and use macros inside accessors.
+enum MacrosFromAccessors {
+  /// Define a macro.
+  /// {@template test_package_docs:accessorMacro}
+  /// This is a macro defined in an Enum accessor.
+  /// {@endtemplate}
+  macroDefinedHere,
+
+  /// Reference a macro.
+  /// {@macro test_package_docs:accessorMacro}
+  macroReferencedHere,
+}
+
 /// Testing if docs for inherited method are correct.
 /// {@category NotSoExcellent}
 class SubForDocComments extends BaseForDocComments {