Tests work, even if flutter doesn't

Author: jcollins-g

lib/src/html/templates.dart

@@ -28,6 +28,8 @@ const _partials = const <String>[
   'sidebar_for_enum',
   'source_code',
   'sidebar_for_library',
+  'accessor_getter',
+  'accessor_setter',
 ];
 
 Future<Map<String, String>> _loadPartials(List<String> headerPaths,

lib/src/model.dart

@@ -244,6 +244,13 @@ class InheritableAccessor extends Accessor with Inheritable {
     }
     return _enclosingElement;
   }
+
+  @override
+  Set<String> get features {
+    Set<String> all_features = super.features;
+    if (isInherited) all_features.add('inherited');
+    return all_features;
+  }
 }
 
 /// Getters and setters.
@@ -279,10 +286,49 @@ class Accessor extends ModelElement
     _enclosingCombo = combo;
   }
 
+  bool get isSynthetic => element.isSynthetic;
+
+  @override
+  String get sourceCode {
+    if (_sourceCodeCache == null) {
+      if (isSynthetic) {
+        _sourceCodeCache =
+            sourceCodeFor((element as PropertyAccessorElement).variable);
+      } else {
+        _sourceCodeCache = super.sourceCode;
+      }
+    }
+    return _sourceCodeCache;
+  }
+
+  @override
+  List<ModelElement> get computeDocumentationFrom {
+    if (isSynthetic) return [this];
+    return super.computeDocumentationFrom;
+  }
+
   @override
   String get computeDocumentationComment {
-    if (element.isSynthetic) {
-      return (element as PropertyAccessorElement).variable.documentationComment;
+    if (isSynthetic) {
+      String docComment = new ModelElement.fromElement(
+              (element as PropertyAccessorElement).variable, package)
+          .element
+          .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 ||
+          // TODO(jcollins-g): @nodoc reading from comments is at the wrong abstraction level here.
+          (docComment != null &&
+              (docComment.contains('<nodoc>') ||
+                  docComment.contains('@nodoc'))) ||
+          (isSetter &&
+              enclosingCombo.hasGetter &&
+              enclosingCombo.getter.computeDocumentationComment !=
+                  docComment)) {
+        return stripComments(docComment);
+      } else {
+        return '';
+      }
     }
     return stripComments(super.computeDocumentationComment);
   }
@@ -326,6 +372,7 @@ class Accessor extends ModelElement
   }
 
   bool get isGetter => _accessor.isGetter;
+  bool get isSetter => _accessor.isSetter;
 
   bool _overriddenElementIsSet = false;
   ModelElement _overriddenElement;
@@ -1359,6 +1406,8 @@ class Field extends ModelElement
         ..addAll([hasPublicSetter, hasPublicGetterNoSetter]);
       assert(assertCheck.containsAll([true, false]));
     }
+    documentationFrom;
+    if (name == 'implicitGetterExplicitSetter') 1 + 1;
     return super.documentation;
   }
 
@@ -1421,13 +1470,11 @@ class Field extends ModelElement
 
   @override
   Set<String> get features {
-    Set<String> all_features = super.features;
-    all_features.addAll(annotations);
-
-    /// final/const implies read-only, so don't display both strings.
-    if (readOnly && !isFinal && !isConst) all_features.add('read-only');
-    if (writeOnly) all_features.add('write-only');
-    if (readWrite) all_features.add('read / write');
+    if (name == 'implicitGetterExplicitSetter' &&
+        enclosingElement.name == 'ClassWithUnusualProperties') {
+      1 + 1;
+    }
+    Set<String> all_features = super.features..addAll(comboFeatures);
     if (hasPublicGetter && hasPublicSetter) {
       if (getter.isInherited && setter.isInherited) {
         all_features.add('inherited');
@@ -1489,6 +1536,16 @@ class Field extends ModelElement
 abstract class GetterSetterCombo implements ModelElement {
   Accessor get getter;
 
+  Set<String> get comboFeatures {
+    Set<String> all_features = new Set();
+    if (hasExplicitGetter) all_features.addAll(getter.features);
+    if (hasExplicitSetter) all_features.addAll(setter.features);
+    if (readOnly && !isFinal && !isConst) all_features.add('read-only');
+    if (writeOnly) all_features.add('write-only');
+    if (readWrite) all_features.add('read / write');
+    return all_features;
+  }
+
   @override
   ModelElement enclosingElement;
   bool get isInherited;
@@ -1519,8 +1576,8 @@ abstract class GetterSetterCombo implements ModelElement {
 
   /// Returns true if both accessors are synthetic.
   bool get hasSyntheticAccessors {
-    if ((hasPublicGetter && getter.element.isSynthetic) ||
-        (hasPublicSetter && setter.element.isSynthetic)) {
+    if ((hasPublicGetter && getter.isSynthetic) ||
+        (hasPublicSetter && setter.isSynthetic)) {
       return true;
     }
     return false;
@@ -1537,36 +1594,32 @@ abstract class GetterSetterCombo implements ModelElement {
     if (_documentationFrom == null) {
       _documentationFrom = [];
       if (hasPublicGetter) {
-        _documentationFrom.addAll(getter.documentationFrom.where((e) =>
-            e.computeDocumentationComment != computeDocumentationComment));
+        _documentationFrom.addAll(getter.documentationFrom);
+      } else if (hasPublicSetter) {
+        _documentationFrom.addAll(setter.documentationFrom);
       }
-      if (hasPublicSetter)
-        _documentationFrom.addAll(setter.documentationFrom.where((e) =>
-            e.computeDocumentationComment != computeDocumentationComment));
       if (_documentationFrom.length == 0 ||
           _documentationFrom.every((e) => e.documentation == ''))
         _documentationFrom = computeDocumentationFrom;
     }
     return _documentationFrom;
   }
 
+  bool get hasAccessorsWithDocs =>
+      (hasPublicGetter && getter.documentation.isNotEmpty ||
+          hasPublicSetter && setter.documentation.isNotEmpty);
+  bool get getterSetterBothAvailable => (hasPublicGetter &&
+      getter.documentation.isNotEmpty &&
+      hasPublicSetter &&
+      setter.documentation.isNotEmpty);
+
   @override
   String get oneLineDoc {
     if (_oneLineDoc == null) {
-      bool hasAccessorsWithDocs =
-          (hasPublicGetter && getter.oneLineDoc.isNotEmpty ||
-              hasPublicSetter && setter.oneLineDoc.isNotEmpty);
       if (!hasAccessorsWithDocs) {
         _oneLineDoc = _documentation.asOneLiner;
       } else {
         StringBuffer buffer = new StringBuffer();
-        bool getterSetterBothAvailable = false;
-        if (hasPublicGetter &&
-            getter.oneLineDoc.isNotEmpty &&
-            hasPublicSetter &&
-            setter.oneLineDoc.isNotEmpty) {
-          getterSetterBothAvailable = true;
-        }
         if (hasPublicGetter && getter.oneLineDoc.isNotEmpty) {
           buffer.write('${getter.oneLineDoc}');
         }
@@ -1582,7 +1635,7 @@ abstract class GetterSetterCombo implements ModelElement {
   String get getterSetterDocumentationComment {
     var buffer = new StringBuffer();
 
-    if (hasPublicGetter && !getter.element.isSynthetic) {
+    if (hasPublicGetter && !getter.isSynthetic) {
       assert(getter.documentationFrom.length == 1);
       // We have to check against dropTextFrom here since documentationFrom
       // doesn't yield the real elements for GetterSetterCombos.
@@ -1594,7 +1647,7 @@ abstract class GetterSetterCombo implements ModelElement {
       }
     }
 
-    if (hasPublicSetter && !setter.element.isSynthetic) {
+    if (hasPublicSetter && !setter.isSynthetic) {
       assert(setter.documentationFrom.length == 1);
       if (!config.dropTextFrom
           .contains(setter.documentationFrom.first.element.library.name)) {
@@ -1629,14 +1682,16 @@ abstract class GetterSetterCombo implements ModelElement {
     return null;
   }
 
-  bool get hasExplicitGetter => hasPublicGetter && !getter.element.isSynthetic;
+  bool get hasExplicitGetter => hasPublicGetter && !getter.isSynthetic;
 
-  bool get hasExplicitSetter => hasPublicSetter && !setter.element.isSynthetic;
-  bool get hasImplicitSetter => hasPublicSetter && setter.element.isSynthetic;
+  bool get hasExplicitSetter => hasPublicSetter && !setter.isSynthetic;
+  bool get hasImplicitSetter => hasPublicSetter && setter.isSynthetic;
+  bool get hasImplicitGetter => hasPublicGetter && getter.isSynthetic;
 
   bool get hasGetter => getter != null;
 
-  bool get hasNoGetterSetter => !hasExplicitGetter && !hasExplicitSetter;
+  bool get hasNoGetterSetter => !hasGetterOrSetter;
+  bool get hasGetterOrSetter => hasExplicitGetter || hasExplicitSetter;
 
   bool get hasSetter => setter != null;
 
@@ -4714,15 +4769,7 @@ class TopLevelVariable extends ModelElement
   String get kind => 'top-level property';
 
   @override
-  Set<String> get features {
-    Set<String> all_features = super.features;
-
-    /// final/const implies read-only, so don't display both strings.
-    if (readOnly && !isFinal && !isConst) all_features.add('read-only');
-    if (writeOnly) all_features.add('write-only');
-    if (readWrite) all_features.add('read / write');
-    return all_features;
-  }
+  Set<String> get features => super.features..addAll(comboFeatures);
 
   @override
   String get computeDocumentationComment {

lib/templates/_accessor_getter.html

@@ -0,0 +1,13 @@
+{{#getter}}
+<section id="getter">
+
+<section class="multi-line-signature">
+  <span class="returntype">{{{ linkedReturnType }}}</span>
+  {{>name_summary}}
+  {{>features}}
+</section>
+
+{{>documentation}}
+{{>source_code}}
+</section>
+{{/getter}}

lib/templates/_accessor_setter.html

@@ -0,0 +1,13 @@
+{{#setter}}
+<section id="setter">
+
+<section class="multi-line-signature">
+  <span class="returntype">void</span>
+  {{>name_summary}}<span class="signature">(<wbr>{{{ linkedParamsNoMetadata }}})</span>
+  {{>features}}
+</section>
+
+{{>documentation}}
+{{>source_code}}
+</section>
+{{/setter}}

lib/templates/property.html

@@ -6,16 +6,26 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
     {{#self}}
-    <section class="multi-line-signature">
-      <span class="returntype">{{{ linkedReturnType }}}</span>
-      {{>name_summary}}
-      {{>features}}
-    </section>
+      {{#hasNoGetterSetter}}
+        <section class="multi-line-signature">
+          <span class="returntype">{{{ linkedReturnType }}}</span>
+          {{>name_summary}}
+          {{>features}}
+        </section>
+        {{>documentation}}
+        {{>source_code}}
+      {{/hasNoGetterSetter}}
+
+      {{#hasGetterOrSetter}}
+        {{#hasGetter}}
+        {{>accessor_getter}}
+        {{/hasGetter}}
 
-    {{>documentation}}
-    {{>source_code}}
+        {{#hasSetter}}
+        {{>accessor_setter}}
+        {{/hasSetter}}
+      {{/hasGetterOrSetter}}
     {{/self}}
   </div> <!-- /.main-content -->
 

lib/templates/top_level_property.html

@@ -6,22 +6,29 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
     {{#self}}
+    {{#hasNoGetterSetter}}
     <section class="multi-line-signature">
       <span class="returntype">{{{ linkedReturnType }}}</span>
       {{>name_summary}}
       {{>features}}
     </section>
-
     {{>documentation}}
     {{>source_code}}
-    {{/self}}
+    {{/hasNoGetterSetter}}
 
+    {{#hasExplicitGetter}}
+    {{>accessor_getter}}
+    {{/hasExplicitGetter}}
+
+    {{#hasExplicitSetter}}
+    {{>accessor_setter}}
+    {{/hasExplicitSetter}}
+    {{/self}}
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>{{self.kind}} {{self.name}}</h5>
   </div><!--/.sidebar-offcanvas-->
 
-{{>footer}}
+{{>footer}}

pubspec.lock

@@ -350,4 +350,4 @@ packages:
     source: hosted
     version: "2.1.13"
 sdks:
-  dart: ">=1.23.0 <=2.0.0-dev.6.0"
+  dart: ">=1.23.0 <=2.0.0-dev.7.0"