CombinatorContributor and LibraryMemberContributor - consolidate common behavior

pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart

 // Copyright (c) 2015, 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.completion.dart.suggestion.builder;
 
 import 'package:analysis_server/src/protocol_server.dart' as protocol;
 import 'package:analysis_server/src/protocol_server.dart'
     hide Element, ElementKind;
 import 'package:analyzer/src/generated/element.dart';
@@ skipping 94 matching lines @@
    * A collection of completion suggestions.
    */
   final List<CompletionSuggestion> suggestions = <CompletionSuggestion>[];
 
   /**
    * Return the kind of suggestions that should be built.
    */
   CompletionSuggestionKind get kind;
 
   /**
-   * Return the request on which the builder is operating.
+   * Return the library in which the completion is requested.
    */
-  DartCompletionRequest get request;
+  LibraryElement get containingLibrary;
 
   /**
    * Add a suggestion based upon the given element.
    */
   void addSuggestion(Element element,
       {String prefix, int relevance: DART_RELEVANCE_DEFAULT}) {
     if (element.isPrivate) {
-      LibraryElement elementLibrary = element.library;
-      CompilationUnitElement unitElem = request.target.unit.element;
-      if (unitElem == null) {
-        return;
-      }
-      LibraryElement unitLibrary = unitElem.library;
-      if (elementLibrary != unitLibrary) {
+      if (element.library != containingLibrary) {
         return;
       }
     }
     if (prefix == null && element.isSynthetic) {
       if ((element is PropertyAccessorElement) ||
           element is FieldElement && !_isSpecialEnumField(element)) {
         return;
       }
     }
     String completion = element.displayName;
@@ skipping 24 matching lines @@
       if (element.name == 'values') {
         return true;
       }
     }
     return false;
   }
 }
 
 /**
  * This class visits elements in a library and provides suggestions based upon
- * the visible members in that library. Clients should call
- * [LibraryElementSuggestionBuilder.suggestionsFor].
+ * the visible members in that library.
  */
 class LibraryElementSuggestionBuilder extends GeneralizingElementVisitor
     with ElementSuggestionBuilder {
-  final DartCompletionRequest request;
+  final LibraryElement containingLibrary;
   final CompletionSuggestionKind kind;
   final bool typesOnly;
   final bool instCreation;
 
   LibraryElementSuggestionBuilder(
-      this.request, this.kind, this.typesOnly, this.instCreation);
+      this.containingLibrary, this.kind, this.typesOnly, this.instCreation);
 
   @override
   visitClassElement(ClassElement element) {
     if (instCreation) {
       element.visitChildren(this);
     } else {
       addSuggestion(element);
     }
   }
 
@@ skipping 39 matching lines @@
       addSuggestion(element);
     }
   }
 
   @override
   visitTopLevelVariableElement(TopLevelVariableElement element) {
     if (!typesOnly) {
       addSuggestion(element);
     }
   }
-
-  /**
-   * Add suggestions for the visible members in the given library
-   */
-  static void suggestionsFor(
-      DartCompletionRequest request,
-      CompletionSuggestionKind kind,
-      LibraryElement library,
-      bool typesOnly,
-      bool instCreation) {
-    if (library != null) {
-      library.visitChildren(new LibraryElementSuggestionBuilder(
-          request, kind, typesOnly, instCreation));
-    }
-  }
 }