Fix flutter

Author: jcollins-g

lib/src/model.dart

@@ -269,20 +269,29 @@ class Accessor extends ModelElement
   }
 
   GetterSetterCombo get enclosingCombo {
-    if (_enclosingCombo == null) if (enclosingElement is Class) {
-      // TODO(jcollins-g): this side effect is rather hacky.  Make sure
-      // enclosingCombo always gets set at accessor creation time, somehow, to
-      // avoid this.
-      // TODO(jcollins-g): This also doesn't work for private accessors sometimes.
-      (enclosingElement as Class).allInstanceProperties;
-    }
-    assert(_enclosingCombo != null);
+    if (_enclosingCombo == null) {
+      if (enclosingElement is Class) {
+        // TODO(jcollins-g): this side effect is rather hacky.  Make sure
+        // enclosingCombo always gets set at accessor creation time, somehow, to
+        // avoid this.
+        // TODO(jcollins-g): This also doesn't work for private accessors sometimes.
+        (enclosingElement as Class).allFields;
+      }
+      /*
+      if (_enclosingCombo == null && isSynthetic) {
+        // Synthetic accessors sometimes don't have enclosing combos.  Pretend
+        // for hyperlinks.
+        1+1;
+      }*/
+      assert(_enclosingCombo != null);
+    }
     return _enclosingCombo;
   }
 
   /// Call exactly once to set the enclosing combo for this Accessor.
-  void set enclosingCombo(GetterSetterCombo combo) {
+  set enclosingCombo(GetterSetterCombo combo) {
     assert(_enclosingCombo == null || combo == _enclosingCombo);
+    assert(combo != null);
     _enclosingCombo = combo;
   }
 
@@ -310,10 +319,7 @@ class Accessor extends ModelElement
   @override
   String get computeDocumentationComment {
     if (isSynthetic) {
-      String docComment = new ModelElement.fromElement(
-              (element as PropertyAccessorElement).variable, package)
-          .element
-          .documentationComment;
+      String docComment = (element as PropertyAccessorElement).variable.documentationComment;
       // If we're a setter, only display something if we have something different than the getter.
       // TODO(jcollins-g): modify analyzer to do this itself?
       if (isGetter ||
@@ -534,7 +540,7 @@ class Class extends ModelElement
 
   List<Field> get constants {
     if (_constants != null) return _constants;
-    _constants = _allFields.where((f) => f.isConst).toList(growable: false)
+    _constants = allFields.where((f) => f.isConst).toList(growable: false)
       ..sort(byName);
 
     return _constants;
@@ -802,7 +808,7 @@ class Class extends ModelElement
 
   List<Field> get inheritedProperties {
     if (_inheritedProperties == null) {
-      _inheritedProperties = _allFields.where((f) => f.isInherited).toList()
+      _inheritedProperties = allFields.where((f) => f.isInherited).toList()
         ..sort(byName);
     }
     return _inheritedProperties;
@@ -827,7 +833,7 @@ class Class extends ModelElement
 
   List<Field> get instanceProperties {
     if (_instanceFields != null) return _instanceFields;
-    _instanceFields = _allFields
+    _instanceFields = allFields
         .where((f) => !f.isStatic && !f.isInherited && !f.isConst)
         .toList(growable: false)
           ..sort(byName);
@@ -924,7 +930,7 @@ class Class extends ModelElement
 
   List<Field> get staticProperties {
     if (_staticFields != null) return _staticFields;
-    _staticFields = _allFields
+    _staticFields = allFields
         .where((f) => f.isStatic)
         .where((f) => !f.isConst)
         .toList(growable: false)
@@ -981,7 +987,7 @@ class Class extends ModelElement
 
   ElementType get supertype => _supertype;
 
-  List<Field> get _allFields {
+  List<Field> get allFields {
     if (_fields != null) return _fields;
     _fields = [];
     Map<String, ExecutableElement> cmap =
@@ -1090,6 +1096,8 @@ class Class extends ModelElement
       // TODO(jcollins-g): Navigation is probably still confusing for
       // half-inherited fields when traversing the inheritance tree.  Make
       // this better, somehow.
+      if (f.name == 'target' && name == 'HitTestEntry')
+        1+1;
       field = new ModelElement.from(f, library, getter: getter, setter: setter);
     }
     _fields.add(field);
@@ -2610,6 +2618,8 @@ abstract class ModelElement extends Canonicalization
             } else if (e.enclosingElement.isEnum) {
               newModelElement = new EnumField(e, library, getter, setter);
             } else {
+              if (e.name == 'target' && e.enclosingElement.name == 'HitTestEntry' && library.name == 'hit_test')
+                1+1;
               newModelElement = new Field(e, library, getter, setter);
             }
           } else {
@@ -2642,6 +2652,8 @@ abstract class ModelElement extends Canonicalization
               ..addAll(library.constants);
             newModelElement = allVariables.firstWhere((v) => v.element == e);
           } else {
+            if (e.name == 'kAlwaysDismissedAnimation')
+              1+1;
             newModelElement = new TopLevelVariable(e, library, getter, setter);
           }
         }
@@ -2683,10 +2695,7 @@ abstract class ModelElement extends Canonicalization
       }
     }
     if (newModelElement is GetterSetterCombo) {
-      if (getter != null) {
-        assert(
-            getter == null || newModelElement?.getter?.enclosingCombo != null);
-      }
+      assert(getter == null || newModelElement?.getter?.enclosingCombo != null);
       assert(setter == null || newModelElement?.setter?.enclosingCombo != null);
     }
 
@@ -4726,8 +4735,14 @@ class TopLevelVariable extends ModelElement
   TopLevelVariable(TopLevelVariableElement element, Library library,
       this.getter, this.setter)
       : super(element, library, null) {
-    if (getter != null) getter.enclosingCombo = this;
-    if (setter != null) setter.enclosingCombo = this;
+    if (getter != null) {
+      getter.enclosingCombo = this;
+      assert(getter.enclosingCombo != null);
+    }
+    if (setter != null) {
+      setter.enclosingCombo = this;
+      assert(setter.enclosingCombo != null);
+    }
   }
 
   @override

lib/src/warnings.dart

@@ -99,8 +99,7 @@ abstract class Locatable {
   Tuple2<int, int> get lineAndColumn;
 
   Set<String> get locationPieces {
-    return new Set()
-      ..addAll(element.location
+    return new Set.from(element.location
           .toString()
           .split(locationSplitter)
           .where((s) => s.isNotEmpty));