Port a missed piece to remove invalid reference to analysis_server

pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart

 // Copyright (c) 2017, 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.
 
 import 'dart:async';
 
-import 'package:analysis_server/src/services/completion/dart/suggestion_builder.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element;
 import 'package:analyzer_plugin/src/utilities/completion/completion_target.dart';
+import 'package:analyzer_plugin/src/utilities/completion/element_suggestion_builder.dart';
 import 'package:analyzer_plugin/src/utilities/completion/optype.dart';
 import 'package:analyzer_plugin/utilities/completion/completion_core.dart';
 
 /**
  * A contributor for calculating suggestions for inherited references.
  */
 class InheritedReferenceContributor extends Object
     with ElementSuggestionBuilder
     implements CompletionContributor {
   @override
   LibraryElement containingLibrary;
 
   @override
   CompletionSuggestionKind kind;
 
   @override
+  ResourceProvider resourceProvider;
+
+  @override
   Future<Null> computeSuggestions(
       CompletionRequest request, CompletionCollector collector) async {
     CompletionTarget target =
         new CompletionTarget.forOffset(request.result.unit, request.offset);
     OpType optype = new OpType.forCompletion(target, request.offset);
     if (!optype.includeIdentifiers) {
       return;
     }
     ClassDeclaration classDecl = _enclosingClass(target);
     if (classDecl == null || classDecl.element == null) {
       return;
     }
     containingLibrary = request.result.libraryElement;
     _computeSuggestionsForClass2(
         collector,
         target,
         resolutionMap.elementDeclaredByClassDeclaration(classDecl),
         request,
         optype);
   }
 
-  List<CompletionSuggestion> computeSuggestionsForClass(
-      CompletionCollector collector,
-      ClassElement classElement,
-      CompletionRequest request,
-      {bool skipChildClass: true}) {
-//    if (!request.includeIdentifiers) {
-//      return const <CompletionSuggestion>[];
-//    }
-//    containingLibrary = request.result.libraryElement;
-//
-//    return _computeSuggestionsForClass2(collector, classElement, request,
-//        skipChildClass: skipChildClass);
-    throw new StateError('Unexpected invocation of computeSuggestionsForClass');
-  }
-
   _addSuggestionsForType(InterfaceType type, OpType optype,
       {bool isFunctionalArgument: false}) {
     if (!isFunctionalArgument) {
       for (PropertyAccessorElement elem in type.accessors) {
         if (elem.isGetter) {
           if (optype.includeReturnValueSuggestions) {
             addSuggestion(elem);
           }
         } else {
           if (optype.includeVoidReturnSuggestions) {
@@ skipping 62 matching lines @@
       if (node is FieldDeclaration) {
         if (node.isStatic) {
           return null;
         }
       }
       node = node.parent;
     }
     return null;
   }
 }