Rollback https://codereview.chromium.org/575613002

pkg/analysis_server/lib/src/services/search/hierarchy.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library services.hierarchy;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analysis_server/src/services/search/element_visitors.dart';
@@ skipping 56 matching lines @@
       if (subClass.context == seed.context) {
         subClasses.add(subClass);
       }
     }
     return subClasses;
   });
 }
 
 
 /**
- * Returns all the declarations of the given [ClassMemberElement] in
- * superclasses of the declaring class, and its subclasses if not [onlySuper].
+ * @return all implementations of the given {@link ClassMemberElement} is its superclasses and
+ *         their subclasses.
  */
 Future<Set<ClassMemberElement>> getHierarchyMembers(SearchEngine searchEngine,
-    ClassMemberElement member, bool onlySuper) {
+    ClassMemberElement member) {
   Set<ClassMemberElement> result = new HashSet<ClassMemberElement>();
   // constructor
   if (member is ConstructorElement) {
     result.add(member);
     return new Future.value(result);
   }
   // method, field, etc
   String name = member.displayName;
   ClassElement memberClass = member.enclosingElement;
   List<Future> futures = <Future>[];
   Set<ClassElement> searchClasses = getSuperClasses(memberClass);
   searchClasses.add(memberClass);
   for (ClassElement superClass in searchClasses) {
-    List<Element> superClassMembers = getChildren(superClass, name);
     // ignore if super- class does not declare member
-    if (superClassMembers.isEmpty) {
-      continue;
-    }
-    // add super- class members
-    _addClassMembers(result, superClassMembers);
-    if (onlySuper) {
+    if (getClassMembers(superClass, name).isEmpty) {
       continue;
     }
     // check all sub- classes
     var subClassFuture = getSubClasses(searchEngine, superClass);
     var membersFuture = subClassFuture.then((Set<ClassElement> subClasses) {
+      subClasses.add(superClass);
       for (ClassElement subClass in subClasses) {
         List<Element> subClassMembers = getChildren(subClass, name);
-        _addClassMembers(result, subClassMembers);
+        for (Element member in subClassMembers) {
+          if (member is ClassMemberElement) {
+            result.add(member);
+          }
+        }
       }
     });
     futures.add(membersFuture);
   }
   return Future.wait(futures).then((_) {
     return result;
   });
 }
 
-/**
- * Adds [ClassMemberElement]s from [elements] to [result].
- */
-void _addClassMembers(Set<ClassMemberElement> result, List<Element> elements) {
-  for (Element member in elements) {
-    if (member is ClassMemberElement) {
-      result.add(member);
-    }
-  }
-}
-
 
 /**
  * Returns non-synthetic members of the given [ClassElement] and its super
  * classes.
  *
  * Includes: fields, accessors and methods.
  * Excludes: constructors and synthetic elements.
  */
 List<Element> getMembers(ClassElement clazz) {
   List<Element> members = <Element>[];
@@ skipping 73 matching lines @@
  * its variable, otherwise returns [element].
  */
 Element getSyntheticAccessorVariable(Element element) {
   if (element is PropertyAccessorElement) {
     if (element.isSynthetic) {
       return element.variable;
     }
   }
   return element;
 }