add code completion declared and return types

pkg/analysis_server/test/services/completion/completion_test_util.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 test.services.completion.util;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
@@ skipping 26 matching lines @@
 
   void addTestSource(String content) {
     expect(completionOffset, isNull, reason: 'Call addTestUnit exactly once');
     completionOffset = content.indexOf('^');
     expect(completionOffset, isNot(equals(-1)), reason: 'missing ^');
     int nextOffset = content.indexOf('^', completionOffset + 1);
     expect(nextOffset, equals(-1), reason: 'too many ^');
     content = content.substring(0, completionOffset) +
         content.substring(completionOffset + 1);
     testSource = addSource(testFile, content);
-    request = new DartCompletionRequest(
-        context,
-        searchEngine,
-        testSource,
-        completionOffset);
+    request =
+        new DartCompletionRequest(context, searchEngine, testSource, completionOffset);
   }
 
   void assertNotSuggested(String completion) {
     if (request.suggestions.any((cs) => cs.completion == completion)) {
       fail('did not expect completion: $completion');
     }
   }
 
-  void assertSuggest(CompletionSuggestionKind kind, String completion,
-      [CompletionRelevance relevance = CompletionRelevance.DEFAULT, bool isDeprecated
-      = false, bool isPotential = false]) {
+  CompletionSuggestion assertSuggest(CompletionSuggestionKind kind,
+      String completion, [CompletionRelevance relevance = CompletionRelevance.DEFAULT,
+      bool isDeprecated = false, bool isPotential = false]) {
     CompletionSuggestion cs;
     request.suggestions.forEach((s) {
       if (s.completion == completion) {
         if (cs == null) {
           cs = s;
         } else {
           List<CompletionSuggestion> matchSuggestions =
               request.suggestions.where((s) => s.completion == completion).toList();
           fail(
               'expected exactly one $completion but found > 1\n $matchSuggestions');
         }
       }
     });
     if (cs == null) {
       List<CompletionSuggestion> completions =
           request.suggestions.map((s) => s.completion).toList();
       fail('expected "$completion" but found\n $completions');
     }
     expect(cs.kind, equals(kind));
     expect(cs.relevance, equals(relevance));
     expect(cs.selectionOffset, equals(completion.length));
     expect(cs.selectionLength, equals(0));
     expect(cs.isDeprecated, equals(isDeprecated));
     expect(cs.isPotential, equals(isPotential));
+    return cs;
   }
 
   void assertSuggestClass(String className, [CompletionRelevance relevance =
       CompletionRelevance.DEFAULT]) {
     assertSuggest(CompletionSuggestionKind.CLASS, className, relevance);
   }
 
-  void assertSuggestField(String completion, [CompletionRelevance relevance =
-      CompletionRelevance.DEFAULT]) {
-    assertSuggest(CompletionSuggestionKind.FIELD, completion, relevance);
+  void assertSuggestField(String completion, String declaringType, String type,
+      [CompletionRelevance relevance = CompletionRelevance.DEFAULT]) {
+    CompletionSuggestion cs =
+        assertSuggest(CompletionSuggestionKind.FIELD, completion, relevance);
+    expect(cs.declaringType, equals(declaringType));
+    expect(cs.returnType, equals(type));
   }
 
-  void assertSuggestFunction(String completion, [CompletionRelevance relevance =
-      CompletionRelevance.DEFAULT]) {
-    assertSuggest(CompletionSuggestionKind.FUNCTION, completion, relevance);
+  void assertSuggestFunction(String completion, String returnType,
+      [CompletionRelevance relevance = CompletionRelevance.DEFAULT]) {
+    CompletionSuggestion cs =
+        assertSuggest(CompletionSuggestionKind.FUNCTION, completion, relevance);
+    expect(cs.returnType, equals(returnType));
   }
 
-  void assertSuggestGetter(String className, [CompletionRelevance relevance =
-      CompletionRelevance.DEFAULT]) {
-    assertSuggest(CompletionSuggestionKind.GETTER, className, relevance);
+  void assertSuggestGetter(String className, String returnType,
+      [CompletionRelevance relevance = CompletionRelevance.DEFAULT]) {
+    CompletionSuggestion cs =
+        assertSuggest(CompletionSuggestionKind.GETTER, className, relevance);
+    expect(cs.returnType, equals(returnType));
   }
 
   void assertSuggestLibraryPrefix(String completion,
       [CompletionRelevance relevance = CompletionRelevance.DEFAULT]) {
     assertSuggest(
         CompletionSuggestionKind.LIBRARY_PREFIX,
         completion,
         relevance);
   }
 
-  void assertSuggestLocalVariable(String completion,
+  void assertSuggestLocalVariable(String completion, String returnType,
       [CompletionRelevance relevance = CompletionRelevance.DEFAULT]) {
-    assertSuggest(
-        CompletionSuggestionKind.LOCAL_VARIABLE,
-        completion,
-        relevance);
+    CompletionSuggestion cs =
+        assertSuggest(CompletionSuggestionKind.LOCAL_VARIABLE, completion, relevance);
+    expect(cs.returnType, equals(returnType));
   }
 
-  void assertSuggestMethod(String className, [CompletionRelevance relevance =
+  void assertSuggestMethod(String className, String declaringType,
+      String returnType, [CompletionRelevance relevance =
       CompletionRelevance.DEFAULT]) {
-    assertSuggest(CompletionSuggestionKind.METHOD, className, relevance);
+    CompletionSuggestion cs =
+        assertSuggest(CompletionSuggestionKind.METHOD, className, relevance);
+    expect(cs.declaringType, equals(declaringType));
+    expect(cs.returnType, equals(returnType));
   }
 
-  void assertSuggestMethodName(String completion, [CompletionRelevance relevance
-      = CompletionRelevance.DEFAULT]) {
-    assertSuggest(CompletionSuggestionKind.METHOD_NAME, completion, relevance);
+  void assertSuggestMethodName(String completion, String declaringType,
+      String returnType, [CompletionRelevance relevance =
+      CompletionRelevance.DEFAULT]) {
+    CompletionSuggestion cs =
+        assertSuggest(CompletionSuggestionKind.METHOD_NAME, completion, relevance);
+    expect(cs.declaringType, equals(declaringType));
+    expect(cs.returnType, equals(returnType));
   }
 
-  void assertSuggestParameter(String completion, [CompletionRelevance relevance
-      = CompletionRelevance.DEFAULT]) {
+  void assertSuggestParameter(String completion, String returnType,
+      [CompletionRelevance relevance = CompletionRelevance.DEFAULT]) {
     assertSuggest(CompletionSuggestionKind.PARAMETER, completion, relevance);
   }
 
   void assertSuggestSetter(String className, [CompletionRelevance relevance =
       CompletionRelevance.DEFAULT]) {
     assertSuggest(CompletionSuggestionKind.SETTER, className, relevance);
   }
 
-  void assertSuggestTopLevelVar(String completion,
+  void assertSuggestTopLevelVar(String completion, String returnType,
       [CompletionRelevance relevance = CompletionRelevance.DEFAULT]) {
-    assertSuggest(
+    CompletionSuggestion cs = assertSuggest(
         CompletionSuggestionKind.TOP_LEVEL_VARIABLE,
         completion,
         relevance);
+    expect(cs.returnType, equals(returnType));
   }
 
   bool computeFast() {
     _computeFastCalled = true;
     CompilationUnit unit = context.parseCompilationUnit(testSource);
     request.unit = unit;
     request.node = new NodeLocator.con1(completionOffset).searchWithin(unit);
     return computer.computeFast(request);
   }
 
   Future<bool> computeFull([bool fullAnalysis = false]) {
     if (!_computeFastCalled) {
       expect(computeFast(), isFalse);
     }
 
     // Index SDK
     for (Source librarySource in context.librarySources) {
-      CompilationUnit unit = context.getResolvedCompilationUnit2(librarySource, librarySource);
+      CompilationUnit unit =
+          context.getResolvedCompilationUnit2(librarySource, librarySource);
       if (unit != null) {
-          index.indexUnit(context, unit);
+        index.indexUnit(context, unit);
       }
     }
 
     var result = context.performAnalysisTask();
     bool resolved = false;
     while (result.hasMoreWork) {
 
       // Update the index
       result.changeNotices.forEach((ChangeNotice notice) {
         CompilationUnit unit = notice.compilationUnit;
         if (unit != null) {
           index.indexUnit(context, unit);
         }
       });
 
       // If the unit has been resolved, then finish the completion
       LibraryElement library = context.getLibraryElement(testSource);
       if (library != null) {
         CompilationUnit unit =
             context.getResolvedCompilationUnit(testSource, library);
         if (unit != null) {
           request.unit = unit;
-          request.node = new NodeLocator.con1(
-              completionOffset).searchWithin(unit);
+          request.node =
+              new NodeLocator.con1(completionOffset).searchWithin(unit);
           resolved = true;
           if (!fullAnalysis) {
             break;
           }
         }
       }
 
       result = context.performAnalysisTask();
     }
     if (!resolved) {
       fail('expected unit to be resolved');
     }
     return computer.computeFull(request);
   }
 
   @override
   void setUp() {
     super.setUp();
     index = createLocalMemoryIndex();
     searchEngine = new SearchEngineImpl(index);
   }
 }