next step toward completion plugin API

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

Index: pkg/analysis_server/lib/src/services/completion/dart_completion_manager.dart
diff --git a/pkg/analysis_server/lib/src/services/completion/dart_completion_manager.dart b/pkg/analysis_server/lib/src/services/completion/dart_completion_manager.dart
index 161197d513a05e5008bb9277578b370f14357f4f..2063ee2eb7cea0d557f79cb966f3433e6e050f25 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart_completion_manager.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart_completion_manager.dart
@@ -31,6 +31,7 @@ import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/scanner.dart';
 import 'package:analyzer/src/generated/source.dart';
+import 'package:analyzer/task/model.dart';
 
 const int DART_RELEVANCE_COMMON_USAGE = 1200;
 const int DART_RELEVANCE_DEFAULT = 1000;
@@ -420,51 +421,6 @@ class DartCompletionRequest extends CompletionRequestImpl {
 }
 
 /**
- * A wrapper around a new dart completion contributor that makes it usable where
- * an old dart completion contributor is expected.
- */
-class NewCompletionWrapper implements DartCompletionContributor {
-  /**
-   * The new-style contributor that is being wrapped.
-   */
-  final newApi.DartCompletionContributor contributor;
-
-  /**
-   * Initialize a newly created wrapper for the given [contributor].
-   */
-  NewCompletionWrapper(this.contributor);
-
-  @override
-  bool computeFast(DartCompletionRequest request) {
-    List<CompletionSuggestion> suggestions =
-        contributor.computeSuggestions(new OldRequestWrapper(request));
-    if (suggestions == null) {
-      return false;
-    }
-    for (CompletionSuggestion suggestion in suggestions) {
-      request.addSuggestion(suggestion);
-    }
-    return true;
-  }
-
-  @override
-  Future<bool> computeFull(DartCompletionRequest request) async {
-    List<CompletionSuggestion> suggestions =
-        contributor.computeSuggestions(new OldRequestWrapper(request));
-    if (suggestions != null) {
-      for (CompletionSuggestion suggestion in suggestions) {
-        request.addSuggestion(suggestion);
-      }
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  String toString() => 'wrapped $contributor';
-}
-
-/**
  * A wrapper around an old dart completion request that makes it usable where a
  * new dart completion request is expected.
  */
@@ -477,10 +433,10 @@ class OldRequestWrapper implements newApi.DartCompletionRequest {
   AnalysisContext get context => request.context;
 
   @override
-  bool get isResolved => request.unit.element != null;
+  int get offset => request.offset;
 
   @override
-  int get offset => request.offset;
+  CompilationUnit get unit => request.unit;
 
   @override
   ResourceProvider get resourceProvider => request.resourceProvider;
@@ -492,8 +448,13 @@ class OldRequestWrapper implements newApi.DartCompletionRequest {
   CompletionTarget get target => request.target;
 
   @override
-  CompilationUnit get unit => request.unit;
+  String toString() => 'wrapped $request';
 
   @override
-  String toString() => 'wrapped $request';
+  CompletionTarget get parsedTarget => request.target;
+
+  @override
+  Future<CompletionTarget> get resolvedDeclarationTarget {
+    throw 'not implemented yet';
+  }
 }