Port a missed piece to remove invalid reference to analysis_server

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

Index: pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart
diff --git a/pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart b/pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart
index 3d415b51985ad2a4d02a971d75218b252a617cf4..0df654a945e6ccac5f597fb70825e7e37eccc716 100644
--- a/pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart
+++ b/pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart
@@ -4,13 +4,14 @@
 
 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';
 
@@ -27,6 +28,9 @@ class InheritedReferenceContributor extends Object
   CompletionSuggestionKind kind;
 
   @override
+  ResourceProvider resourceProvider;
+
+  @override
   Future<Null> computeSuggestions(
       CompletionRequest request, CompletionCollector collector) async {
     CompletionTarget target =
@@ -48,21 +52,6 @@ class InheritedReferenceContributor extends Object
         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) {