remove CompletionCache and obsolete tests, and cleanup imports

pkg/analysis_server/lib/src/services/completion/dart_completion_manager.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.completion.dart;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/src/provisional/completion/completion_core.dart'
     show AnalysisRequest, CompletionContributor, CompletionRequest;
 import 'package:analysis_server/src/provisional/completion/dart/completion_target.dart';
 import 'package:analysis_server/src/services/completion/completion_core.dart';
 import 'package:analysis_server/src/services/completion/completion_manager.dart';
 import 'package:analysis_server/src/services/completion/dart/common_usage_sorter.dart';
 import 'package:analysis_server/src/services/completion/dart/contribution_sorter.dart';
 import 'package:analysis_server/src/services/completion/optype.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/file_system/file_system.dart';
 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';
 
-export 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart'
-    show
-        DART_RELEVANCE_COMMON_USAGE,
-        DART_RELEVANCE_DEFAULT,
-        DART_RELEVANCE_HIGH,
-        DART_RELEVANCE_INHERITED_ACCESSOR,
-        DART_RELEVANCE_INHERITED_FIELD,
-        DART_RELEVANCE_INHERITED_METHOD,
-        DART_RELEVANCE_KEYWORD,
-        DART_RELEVANCE_LOCAL_ACCESSOR,
-        DART_RELEVANCE_LOCAL_FIELD,
-        DART_RELEVANCE_LOCAL_FUNCTION,
-        DART_RELEVANCE_LOCAL_METHOD,
-        DART_RELEVANCE_LOCAL_TOP_LEVEL_VARIABLE,
-        DART_RELEVANCE_LOCAL_VARIABLE,
-        DART_RELEVANCE_LOW,
-        DART_RELEVANCE_NAMED_PARAMETER,
-        DART_RELEVANCE_PARAMETER;
-
 /**
  * The base class for contributing code completion suggestions.
  */
 abstract class DartCompletionContributor {
   /**
    * Computes the initial set of [CompletionSuggestion]s based on
    * the given completion context. The compilation unit and completion node
    * in the given completion context may not be resolved.
    * This method should execute quickly and not block waiting for any analysis.
    * Returns `true` if the contributor's work is complete
@@ skipping 15 matching lines @@
  */
 class DartCompletionManager extends CompletionManager {
   /**
    * The [defaultContributionSorter] is a long-lived object that isn't allowed
    * to maintain state between calls to [ContributionSorter#sort(...)].
    */
   static DartContributionSorter defaultContributionSorter =
       new CommonUsageSorter();
 
   final SearchEngine searchEngine;
-  List<DartCompletionContributor> contributors;
   Iterable<CompletionContributor> newContributors;
   DartContributionSorter contributionSorter;
 
   DartCompletionManager(
       AnalysisContext context, this.searchEngine, Source source,
-      [this.contributors, this.newContributors, this.contributionSorter])
+      [this.newContributors, this.contributionSorter])
       : super(context, source) {
-    if (contributors == null) {
-      contributors = [
-        // LocalReferenceContributor before ImportedReferenceContributor
-        // because local suggestions take precedence
-        // and can hide other suggestions with the same name
-        //new LocalReferenceContributor(),
-        //new ImportedReferenceContributor(),
-        //new KeywordContributor(),
-        //new ArgListContributor(),
-        // new CombinatorContributor(),
-        // new PrefixedElementContributor(),
-        //new UriContributor(),
-        // TODO(brianwilkerson) Use the completion contributor extension point
-        // to add the contributor below (and eventually, all the contributors).
-//        new NewCompletionWrapper(new InheritedContributor())
-      ];
-    }
     if (newContributors == null) {
       newContributors = <CompletionContributor>[];
     }
     if (contributionSorter == null) {
       contributionSorter = defaultContributionSorter;
     }
   }
 
   /**
    * Create a new initialized Dart source completion manager
    */
   factory DartCompletionManager.create(
       AnalysisContext context,
       SearchEngine searchEngine,
       Source source,
       Iterable<CompletionContributor> newContributors) {
     return new DartCompletionManager(
-        context, searchEngine, source, null, newContributors);
+        context, searchEngine, source, newContributors);
   }
 
   /**
    * Compute suggestions based upon cached information only
    * then send an initial response to the client.
    * Return a list of contributors for which [computeFull] should be called
    */
   List<DartCompletionContributor> computeFast(
       DartCompletionRequest request, CompletionPerformance performance) {
     return performance.logElapseTime('computeFast', () {
       CompilationUnit unit = context.parseCompilationUnit(source);
       request.unit = unit;
       request.target = new CompletionTarget.forOffset(unit, request.offset);
 
       ReplacementRange range =
           new ReplacementRange.compute(request.offset, request.target);
       request.replacementOffset = range.offset;
       request.replacementLength = range.length;
 
-      List<DartCompletionContributor> todo = new List.from(contributors);
+      List<DartCompletionContributor> todo = [];
       todo.removeWhere((DartCompletionContributor c) {
         return performance.logElapseTime('computeFast ${c.runtimeType}', () {
           return c.computeFast(request);
         });
       });
       return todo;
     });
   }
 
   /**
@@ skipping 13 matching lines @@
       List<CompletionSuggestion> newSuggestions =
           await contributor.computeSuggestions(request);
       for (CompletionSuggestion suggestion in newSuggestions) {
         request.addSuggestion(suggestion);
       }
       performance.logElapseTime(contributorTag);
     }
     performance.logElapseTime('computeSuggestions');
     performance.logStartTime('waitForAnalysis');
 
-    if (todo.isEmpty) {
-      // TODO(danrubel) current sorter requires no additional analysis,
-      // but need to handle the returned future the same way that futures
-      // returned from contributors are handled once this method is refactored
-      // to be async.
-      /* await */ contributionSorter.sort(request, request.suggestions);
-      // TODO (danrubel) if request is obsolete
-      // (processAnalysisRequest returns false)
-      // then send empty results
-      sendResults(request, true);
-    }
-
-    // Compute the other suggestions
-    return waitForAnalysis().then((CompilationUnit unit) {
-      if (controller.isClosed) {
-        return;
-      }
-      performance.logElapseTime('waitForAnalysis');
-      if (unit == null) {
-        sendResults(request, true);
-        return;
-      }
-      performance.logElapseTime('computeFull', () {
-        request.unit = unit;
-        // TODO(paulberry): Do we need to invoke _ReplacementOffsetBuilder
-        // again?
-        request.target = new CompletionTarget.forOffset(unit, request.offset);
-        int count = todo.length;
-        todo.forEach((DartCompletionContributor c) {
-          String name = c.runtimeType.toString();
-          String completeTag = 'computeFull $name complete';
-          performance.logStartTime(completeTag);
-          performance.logElapseTime('computeFull $name', () {
-            c.computeFull(request).then((bool changed) {
-              performance.logElapseTime(completeTag);
-              bool last = --count == 0;
-              if (changed || last) {
-                // TODO(danrubel) current sorter requires no additional analysis,
-                // but need to handle the returned future the same way that futures
-                // returned from contributors are handled once this method is refactored
-                // to be async.
-                /* await */ contributionSorter.sort(
-                    request, request.suggestions);
-                // TODO (danrubel) if request is obsolete
-                // (processAnalysisRequest returns false)
-                // then send empty results
-                sendResults(request, last);
-              }
-            });
-          });
-        });
-      });
-    });
+    // TODO(danrubel) current sorter requires no additional analysis,
+    // but need to handle the returned future the same way that futures
+    // returned from contributors are handled once this method is refactored
+    // to be async.
+    /* await */ contributionSorter.sort(request, request.suggestions);
+    // TODO (danrubel) if request is obsolete
+    // (processAnalysisRequest returns false)
+    // then send empty results
+    sendResults(request, true);
+    return new Future.value();
   }
 
   @override
   void computeSuggestions(CompletionRequest completionRequest) {
     DartCompletionRequest request =
         new DartCompletionRequest.from(completionRequest);
     CompletionPerformance performance = new CompletionPerformance();
     performance.logElapseTime('compute', () {
       List<DartCompletionContributor> todo = computeFast(request, performance);
       computeFull(request, performance, todo);
@@ skipping 214 matching lines @@
               // Replacement range for import URI
               return new ReplacementRange(start, end - start);
             }
           }
         }
       }
     }
     return new ReplacementRange(requestOffset, 0);
   }
 }