Fix members not being marked as inherited in sidebars - Fixes #2472 (#2473)

* Fix members not being marked as inherited in sidebars - Fixes #2472

* Fix operator section being reported as inherited always

* Only include pub instance operators

* Remove unnecessary docs specifying methods only for use in mustache templates

* Add test for public inherited instance operators method addition

Author: parlough

lib/src/model/class.dart

@@ -85,6 +85,10 @@ class Class extends Container
   Iterable<Operator> get instanceOperators =>
       quiver.concat([super.instanceOperators, inheritedOperators]);
 
+  @override
+  bool get publicInheritedInstanceOperators =>
+      publicInstanceOperators.every((f) => f.isInherited);
+
   List<ModelElement> _allModelElements;
 
   @override
@@ -249,10 +253,6 @@ class Class extends Container
     return _inheritedOperators;
   }
 
-  @override
-  Iterable<Operator> get publicInheritedInstanceOperators =>
-      model_utils.filterNonPublic(inheritedOperators);
-
   Iterable<Field> get inheritedFields => allFields.where((f) => f.isInherited);
 
   Iterable<Field> get publicInheritedFields =>

lib/src/model/container.dart

@@ -41,6 +41,7 @@ abstract class Container extends ModelElement with TypeParameters {
   bool get isClassOrExtension => isClass || isExtension;
   bool get isEnum =>
       element is ClassElement && (element as ClassElement).isEnum;
+  bool get isClassOrEnum => isClass || isEnum;
   bool get isMixin =>
       element is ClassElement && (element as ClassElement).isMixin;
 
@@ -65,16 +66,13 @@ abstract class Container extends ModelElement with TypeParameters {
       .toList(growable: false);
 
   /// Whether all instance fields are inherited.
-  ///
-  /// This is only used in mustache templates.
   bool get publicInheritedInstanceFields => false;
 
   /// Whether all instance methods are inherited.
-  ///
-  /// This is only used in mustache templates.
   bool get publicInheritedInstanceMethods => false;
 
-  Iterable<Operator> get publicInheritedInstanceOperators => [];
+  /// Whether all instance operators are inherited.
+  bool get publicInheritedInstanceOperators => false;
 
   @nonVirtual
   bool get hasPublicInstanceMethods =>

lib/templates/html/_sidebar_for_container.html

@@ -1,14 +1,25 @@
 <ol>
     {{#container}}
 
+    {{#isClass}}
+    {{#hasPublicConstructors}}
+    <li class="section-title"><a href="{{{href}}}#constructors">Constructors</a></li>
+    {{#publicConstructorsSorted}}
+    <li><a{{#isDeprecated}} class="deprecated"{{/isDeprecated}} href="{{{href}}}">{{shortName}}</a></li>
+    {{/publicConstructorsSorted}}
+    {{/hasPublicConstructors}}
+    {{/isClass}}
+
     {{#isEnum}}
     {{#hasPublicConstantFields}}
     <li class="section-title"><a href="{{{href}}}#constants">Constants</a></li>
     {{#publicConstantFieldsSorted}}
     <li>{{{linkedName}}}</li>
     {{/publicConstantFieldsSorted}}
     {{/hasPublicConstantFields}}
+    {{/isEnum}}
 
+    {{#isClassOrEnum}}
     {{#hasPublicInstanceFields}}
     <li class="section-title{{ #publicInheritedInstanceFields }} inherited{{ /publicInheritedInstanceFields }}">
       <a href="{{{href}}}#instance-properties">Properties</a>
@@ -26,23 +37,14 @@
     {{/hasPublicInstanceMethods}}
 
     {{#hasPublicInstanceOperators}}
-    <li class="section-title{{ #publicInheritedInstanceOperators }} inherited{{ /publicInheritedInstanceOperators}}"><a href="{{{href}}}#operators">Operators</a></li>
+    <li class="section-title{{ #publicInheritedInstanceOperators }} inherited{{ /publicInheritedInstanceOperators }}"><a href="{{{href}}}#operators">Operators</a></li>
     {{#publicInstanceOperatorsSorted}}
     <li{{ #isInherited }} class="inherited"{{ /isInherited}}>{{{ linkedName }}}</li>
     {{/publicInstanceOperatorsSorted}}
     {{/hasPublicInstanceOperators}}
-    {{/isEnum}}
+    {{/isClassOrEnum}}
 
-    {{#isClass}}
-    {{#hasPublicConstructors}}
-    <li class="section-title"><a href="{{{href}}}#constructors">Constructors</a></li>
-    {{#publicConstructorsSorted}}
-    <li><a{{#isDeprecated}} class="deprecated"{{/isDeprecated}} href="{{{href}}}">{{shortName}}</a></li>
-    {{/publicConstructorsSorted}}
-    {{/hasPublicConstructors}}
-    {{/isClass}}
-
-    {{#isClassOrExtension}}
+    {{#isExtension}}
     {{#hasPublicInstanceFields}}
     <li class="section-title"> <a href="{{{href}}}#instance-properties">Properties</a>
     </li>
@@ -64,7 +66,9 @@
     <li>{{{ linkedName }}}</li>
     {{/publicInstanceOperatorsSorted}}
     {{/hasPublicInstanceOperators}}
+    {{/isExtension}}
 
+    {{#isClassOrExtension}}
     {{#hasPublicVariableStaticFields}}
     <li class="section-title"><a href="{{{href}}}#static-properties">Static properties</a></li>
     {{#publicVariableStaticFieldsSorted}}

test/end2end/model_test.dart

@@ -1632,8 +1632,17 @@ void main() {
     });
 
     test('get operators', () {
-      expect(Dog.publicInstanceOperators, hasLength(1));
+      expect(Dog.publicInstanceOperators, hasLength(2));
       expect(Dog.publicInstanceOperators.first.name, 'operator ==');
+      expect(Dog.publicInstanceOperators.last.name, 'operator +');
+    });
+
+    test('has non-inherited instance operators', () {
+      expect(Dog.publicInheritedInstanceOperators, isFalse);
+    });
+
+    test('has only inherited instance operators', () {
+      expect(Cat.publicInheritedInstanceOperators, isTrue);
     });
 
     test('inherited methods, including from Object ', () {

testing/test_package/lib/example.dart

@@ -332,6 +332,8 @@ class Dog implements Cat, E {
   @override
   operator ==(other) => other is Dog && name == other.name;
 
+  Dog operator +(Dog other) => Dog()..name = name + other.name;
+
   foo() async => 42;
 
   @deprecated