Refactor Container class and children (#2206)

* intermediate

* tests pass, ship it

* Fix a missing variable static fields change in mixin template

* Fix some remaining templating bugs

* Review comments

Author: jcollins-g

lib/src/generator/generator_frontend.dart

@@ -68,39 +68,40 @@ class GeneratorFrontEnd implements Generator {
                 writer, packageGraph, lib, clazz, constructor);
           }
 
-          for (var constant in filterNonDocumented(clazz.constants)) {
+          for (var constant in filterNonDocumented(clazz.constantFields)) {
             if (!constant.isCanonical) continue;
 
             indexAccumulator.add(constant);
             _generatorBackend.generateConstant(
                 writer, packageGraph, lib, clazz, constant);
           }
 
-          for (var property in filterNonDocumented(clazz.staticProperties)) {
+          for (var property
+              in filterNonDocumented(clazz.variableStaticFields)) {
             if (!property.isCanonical) continue;
 
             indexAccumulator.add(property);
             _generatorBackend.generateProperty(
                 writer, packageGraph, lib, clazz, property);
           }
 
-          for (var property in filterNonDocumented(clazz.allInstanceFields)) {
+          for (var property in filterNonDocumented(clazz.instanceFields)) {
             if (!property.isCanonical) continue;
 
             indexAccumulator.add(property);
             _generatorBackend.generateProperty(
                 writer, packageGraph, lib, clazz, property);
           }
 
-          for (var method in filterNonDocumented(clazz.allInstanceMethods)) {
+          for (var method in filterNonDocumented(clazz.instanceMethods)) {
             if (!method.isCanonical) continue;
 
             indexAccumulator.add(method);
             _generatorBackend.generateMethod(
                 writer, packageGraph, lib, clazz, method);
           }
 
-          for (var operator in filterNonDocumented(clazz.allOperators)) {
+          for (var operator in filterNonDocumented(clazz.instanceOperators)) {
             if (!operator.isCanonical) continue;
 
             indexAccumulator.add(operator);
@@ -122,40 +123,27 @@ class GeneratorFrontEnd implements Generator {
           _generatorBackend.generateExtension(
               writer, packageGraph, lib, extension);
 
-          for (var constant in filterNonDocumented(extension.constants)) {
+          for (var constant in filterNonDocumented(extension.constantFields)) {
             indexAccumulator.add(constant);
             _generatorBackend.generateConstant(
                 writer, packageGraph, lib, extension, constant);
           }
 
-          for (var property
-              in filterNonDocumented(extension.staticProperties)) {
-            indexAccumulator.add(property);
-            _generatorBackend.generateProperty(
-                writer, packageGraph, lib, extension, property);
-          }
-
           for (var method
-              in filterNonDocumented(extension.allPublicInstanceMethods)) {
+              in filterNonDocumented(extension.publicInstanceMethods)) {
             indexAccumulator.add(method);
             _generatorBackend.generateMethod(
                 writer, packageGraph, lib, extension, method);
           }
 
-          for (var method in filterNonDocumented(extension.staticMethods)) {
-            indexAccumulator.add(method);
-            _generatorBackend.generateMethod(
-                writer, packageGraph, lib, extension, method);
-          }
-
-          for (var operator in filterNonDocumented(extension.allOperators)) {
+          for (var operator
+              in filterNonDocumented(extension.instanceOperators)) {
             indexAccumulator.add(operator);
             _generatorBackend.generateMethod(
                 writer, packageGraph, lib, extension, operator);
           }
 
-          for (var property
-              in filterNonDocumented(extension.allInstanceFields)) {
+          for (var property in filterNonDocumented(extension.instanceFields)) {
             indexAccumulator.add(property);
             _generatorBackend.generateProperty(
                 writer, packageGraph, lib, extension, property);
@@ -174,38 +162,39 @@ class GeneratorFrontEnd implements Generator {
                 writer, packageGraph, lib, mixin, constructor);
           }
 
-          for (var constant in filterNonDocumented(mixin.constants)) {
+          for (var constant in filterNonDocumented(mixin.constantFields)) {
             if (!constant.isCanonical) continue;
             indexAccumulator.add(constant);
             _generatorBackend.generateConstant(
                 writer, packageGraph, lib, mixin, constant);
           }
 
-          for (var property in filterNonDocumented(mixin.staticProperties)) {
+          for (var property
+              in filterNonDocumented(mixin.variableStaticFields)) {
             if (!property.isCanonical) continue;
 
             indexAccumulator.add(property);
             _generatorBackend.generateConstant(
                 writer, packageGraph, lib, mixin, property);
           }
 
-          for (var property in filterNonDocumented(mixin.allInstanceFields)) {
+          for (var property in filterNonDocumented(mixin.instanceFields)) {
             if (!property.isCanonical) continue;
 
             indexAccumulator.add(property);
             _generatorBackend.generateConstant(
                 writer, packageGraph, lib, mixin, property);
           }
 
-          for (var method in filterNonDocumented(mixin.allInstanceMethods)) {
+          for (var method in filterNonDocumented(mixin.instanceMethods)) {
             if (!method.isCanonical) continue;
 
             indexAccumulator.add(method);
             _generatorBackend.generateMethod(
                 writer, packageGraph, lib, mixin, method);
           }
 
-          for (var operator in filterNonDocumented(mixin.allOperators)) {
+          for (var operator in filterNonDocumented(mixin.instanceOperators)) {
             if (!operator.isCanonical) continue;
 
             indexAccumulator.add(operator);
@@ -226,17 +215,17 @@ class GeneratorFrontEnd implements Generator {
           indexAccumulator.add(eNum);
           _generatorBackend.generateEnum(writer, packageGraph, lib, eNum);
 
-          for (var property in filterNonDocumented(eNum.allInstanceFields)) {
+          for (var property in filterNonDocumented(eNum.instanceFields)) {
             indexAccumulator.add(property);
             _generatorBackend.generateConstant(
                 writer, packageGraph, lib, eNum, property);
           }
-          for (var operator in filterNonDocumented(eNum.allOperators)) {
+          for (var operator in filterNonDocumented(eNum.instanceOperators)) {
             indexAccumulator.add(operator);
             _generatorBackend.generateMethod(
                 writer, packageGraph, lib, eNum, operator);
           }
-          for (var method in filterNonDocumented(eNum.allInstanceMethods)) {
+          for (var method in filterNonDocumented(eNum.instanceMethods)) {
             indexAccumulator.add(method);
             _generatorBackend.generateMethod(
                 writer, packageGraph, lib, eNum, method);

lib/src/markdown_processor.dart

@@ -551,7 +551,8 @@ class _MarkdownCommentReference {
         for (final modelElement
             in packageGraph.findRefElementCache[maybeEnumName]) {
           if (modelElement is Enum) {
-            if (modelElement.constants.any((e) => e.name == maybeEnumMember)) {
+            if (modelElement.constantFields
+                .any((e) => e.name == maybeEnumMember)) {
               results.add(modelElement);
               break;
             }

lib/src/model/accessor.dart

@@ -180,8 +180,8 @@ class ContainerAccessor extends Accessor with ContainerMember, Inheritable {
             Class parentClass =
                 ModelElement.fromElement(t.element, packageGraph);
             var possibleFields = <Field>[];
-            possibleFields.addAll(parentClass.allInstanceFields);
-            possibleFields.addAll(parentClass.staticProperties);
+            possibleFields.addAll(parentClass.instanceFields);
+            possibleFields.addAll(parentClass.staticFields);
             var fieldName = accessor.name.replaceFirst('=', '');
             var foundField = possibleFields.firstWhere(
                 (f) => f.element.name == fieldName,