incremental improvement to top level code completion results

pkg/analysis_services/lib/completion/completion_computer.dart

Index: pkg/analysis_services/lib/completion/completion_computer.dart
diff --git a/pkg/analysis_services/lib/completion/completion_computer.dart b/pkg/analysis_services/lib/completion/completion_computer.dart
index b4517b8f47421862f81869dc4c7a108a0eca2ad7..887faeec79f1b967ba5535bf641046adbb571650 100644
--- a/pkg/analysis_services/lib/completion/completion_computer.dart
+++ b/pkg/analysis_services/lib/completion/completion_computer.dart
@@ -9,6 +9,8 @@ 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/top_level_computer.dart';
+import 'package:analyzer/src/generated/ast.dart';
+import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 
@@ -28,18 +30,14 @@ abstract class CompletionComputer {
  */
 abstract class CompletionManager {
 
+  StreamController<CompletionResult> controller;
+
   /**
-   * Create a manager for the given request.
+   * Compute completion results and append them to the stream.
+   * Clients should not call this method directly as it is automatically called
+   * when a client listens to the stream returned by [results].
    */
-  static CompletionManager create(Source source, int offset,
-      SearchEngine searchEngine) {
-    if (AnalysisEngine.isDartFileName(source.shortName)) {
-      return new DartCompletionManager(source, offset, searchEngine);
-    }
-    return new NoOpCompletionManager(source, offset);
-  }
-
-  StreamController<CompletionResult> controller;
+  void compute();
 
   /**
    * Generate a stream of code completion results.
@@ -52,11 +50,17 @@ abstract class CompletionManager {
   }
 
   /**
-   * Compute completion results and append them to the stream.
-   * Clients should not call this method directly as it is automatically called
-   * when a client listens to the stream returned by [results].
+   * Create a manager for the given request.
    */
-  void compute();
+  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 NoOpCompletionManager(source, offset);
+  }
 }
 
 /**
@@ -98,15 +102,19 @@ class CompletionResult {
  * Manages code completion for a given Dart file completion request.
  */
 class DartCompletionManager extends CompletionManager {
+  final AnalysisContext context;
   final Source source;
   final int offset;
   final SearchEngine searchEngine;
 
-  DartCompletionManager(this.source, this.offset, this.searchEngine);
+  DartCompletionManager(this.context, this.source, this.offset,
+      this.searchEngine);
 
   @override
   void compute() {
-    var computer = new TopLevelComputer(searchEngine);
+    LibraryElement library = context.computeLibraryElement(source);

[scheglov, 2014/08/07 02:42:25]

Do we want to support the case when source is a part?

[danrubel, 2014/08/08 20:28:39]

Definitely part of the plan. I'm incrementally improving the code completion
functionality. I'll add a comment to that effect so that I don't forget.

+    CompilationUnit unit = context.resolveCompilationUnit(source, library);
+    TopLevelComputer computer = new TopLevelComputer(searchEngine, unit);
     computer.compute().then((List<CompletionSuggestion> suggestions) {
       controller.add(new CompletionResult(offset, 0, suggestions, true));
     });