refactor and cleanup code completion

pkg/analysis_services/lib/completion/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.computer;
 
 import 'dart:async';
 
 import 'package:analysis_services/completion/completion_suggestion.dart';
 import 'package:analysis_services/search/search_engine.dart';
 import 'package:analysis_services/src/completion/dart_completion_manager.dart';
-import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 /**
- * The base class for computing code completion suggestions.
- */
-abstract class CompletionComputer {
-  AnalysisContext context;
-  Source source;
-  int offset;
-  SearchEngine searchEngine;
-
-  /**
-   * Computes the initial set of [CompletionSuggestion]s based on
-   * the compilation [unit], the AST [node] in which the completion occurred,
-   * and information already cached in the analysis context.
-   * The supplied [unit] and [node] may not be resolved.
-   * This method should execute quickly and not block waiting for any analysis.
-   * Returns `true` if the computer's work is complete
-   * or `false` if [computeFull] should be called to complete the work.
-   */
-  bool computeFast(CompilationUnit unit, AstNode node,
-      List<CompletionSuggestion> suggestions);
-
-  /**
-   * Computes the complete set of [CompletionSuggestion]s based on
-   * the resolved compilation [unit] and the resolved AST [node] in which the
-   * completion occurred.
-   * Returns `true` if the receiver modified the list of suggestions.
-   */
-  Future<bool> computeFull(CompilationUnit unit, AstNode node,
-      List<CompletionSuggestion> suggestions);
-}
-
-/**
  * Manages `CompletionComputer`s for a given completion request.
  */
 abstract class CompletionManager {
 
   StreamController<CompletionResult> controller;
 
   /**
    * Compute completion results and append them to the stream.
    * Subclasses should override this method, append at least one result
    * to the [controller], and close the controller stream once complete.
@@ skipping 12 matching lines @@
     return controller.stream;
   }
 
   /**
    * Create a manager for the given request.
    */
   static CompletionManager create(AnalysisContext context, Source source,
       int offset, SearchEngine searchEngine) {
     if (context != null) {
       if (AnalysisEngine.isDartFileName(source.shortName)) {
-        return new DartCompletionManager(context, source, offset, searchEngine);
+        return new DartCompletionManager(context, searchEngine, source, offset);
+      }
+      if (AnalysisEngine.isHtmlFileName(source.shortName)) {
+        //TODO (danrubel) implement
+//        return new HtmlCompletionManager(context, searchEngine, source, offset);
       }
     }
     return new NoOpCompletionManager(source, offset);
   }
 }
 
 /**
  * Code completion result generated by an [CompletionManager].
  */
 class CompletionResult {
@@ skipping 21 matching lines @@
   /**
    * `true` if this is that last set of results that will be returned
    * for the indicated completion.
    */
   final bool last;
 
   CompletionResult(this.replacementOffset, this.replacementLength,
       this.suggestions, this.last);
 }
 
-
 class NoOpCompletionManager extends CompletionManager {
   final Source source;
   final int offset;
 
   NoOpCompletionManager(this.source, this.offset);
 
   @override
   void compute() {
     controller.add(new CompletionResult(offset, 0, [], true));
   }
 }