remove type suggestion when interpolation completion

pkg/analysis_server/lib/src/services/completion/imported_computer.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.dart.toplevel;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analysis_server/src/protocol_server.dart'
@@ skipping 12 matching lines @@
 class ImportedComputer extends DartCompletionComputer {
   bool shouldWaitForLowPrioritySuggestions;
   bool suggestionsComputed;
   _ImportedSuggestionBuilder builder;
 
   ImportedComputer({this.shouldWaitForLowPrioritySuggestions: false});
 
   @override
   bool computeFast(DartCompletionRequest request) {
     OpType optype = request.optype;
-    if (optype.includeTopLevelSuggestions ||
+    if (optype.includeReturnValueSuggestions ||
+        optype.includeTypeNameSuggestions ||
+        optype.includeVoidReturnSuggestions ||
         optype.includeConstructorSuggestions) {
-      builder = new _ImportedSuggestionBuilder(request,
-          typesOnly: optype.includeOnlyTypeNameSuggestions,
-          excludeVoidReturn: !optype.includeVoidReturnSuggestions,
-          constructorsOnly: optype.includeConstructorSuggestions);
+      builder = new _ImportedSuggestionBuilder(request, optype);
       builder.shouldWaitForLowPrioritySuggestions =
           shouldWaitForLowPrioritySuggestions;
       // If target is an argument in an argument list
       // then suggestions may need to be adjusted
       suggestionsComputed = builder.computeFast(request.node);
       return suggestionsComputed && request.target.argIndex == null;
     }
     return true;
   }
 
@@ skipping 23 matching lines @@
 }
 
 /**
  * [_ImportedSuggestionBuilder] traverses the imports and builds suggestions
  * based upon imported elements.
  */
 class _ImportedSuggestionBuilder extends ElementSuggestionBuilder
     implements SuggestionBuilder {
   bool shouldWaitForLowPrioritySuggestions;
   final DartCompletionRequest request;
-  final bool typesOnly;
-  final bool excludeVoidReturn;
-  final bool constructorsOnly;
+  final OpType optype;
   DartCompletionCache cache;
 
-  _ImportedSuggestionBuilder(this.request, {this.typesOnly: false,
-      this.excludeVoidReturn: false, this.constructorsOnly: false}) {
+  _ImportedSuggestionBuilder(this.request, this.optype) {
     cache = request.cache;
   }
 
   @override
   CompletionSuggestionKind get kind => CompletionSuggestionKind.INVOCATION;
 
   /**
    * If the needed information is cached, then add suggestions and return `true`
    * else return `false` indicating that additional work is necessary.
    */
@@ skipping 43 matching lines @@
     _addFilteredSuggestions(filterText, cache.libraryPrefixSuggestions);
   }
 
   /**
    * Add imported element suggestions.
    */
   void _addElementSuggestions(List<Element> elements,
       {int relevance: DART_RELEVANCE_DEFAULT}) {
     elements.forEach((Element elem) {
       if (elem is! ClassElement) {
-        if (typesOnly) {
+        if (optype.includeOnlyTypeNameSuggestions) {
           return;
         }
         if (elem is ExecutableElement) {
           DartType returnType = elem.returnType;
           if (returnType != null && returnType.isVoid) {
-            if (excludeVoidReturn) {
+            if (!optype.includeVoidReturnSuggestions) {
               return;
             }
           }
         }
       }
       addSuggestion(elem, relevance: relevance);
     });
   }
 
   /**
@@ skipping 52 matching lines @@
           });
         }
       }
     }
   }
 
   /**
    * Add suggested based upon imported elements.
    */
   void _addSuggestions(AstNode node) {
-    if (constructorsOnly) {
+    if (optype.includeConstructorSuggestions) {
       _addConstructorSuggestions();
-    } else {
+    }
+    if (optype.includeReturnValueSuggestions ||
+        optype.includeTypeNameSuggestions ||
+        optype.includeVoidReturnSuggestions) {
       _addInheritedSuggestions(node);
       _addTopLevelSuggestions();
     }
   }
 
   /**
    * Add top level suggestions from the cache.
    * To reduce the number of suggestions sent to the client,
    * filter the suggestions based upon the first character typed.
    * If no characters are available to use for filtering,
    * then exclude all low priority suggestions.
    */
   void _addTopLevelSuggestions() {
     String filterText = request.filterText;
     if (filterText.length > 1) {
       filterText = filterText.substring(0, 1);
     }
     DartCompletionCache cache = request.cache;
-    _addFilteredSuggestions(filterText, cache.importedTypeSuggestions);
-    _addFilteredSuggestions(filterText, cache.libraryPrefixSuggestions);
-    if (!typesOnly) {
+    if (optype.includeTypeNameSuggestions) {
+      _addFilteredSuggestions(filterText, cache.importedTypeSuggestions);
+      _addFilteredSuggestions(filterText, cache.libraryPrefixSuggestions);
+    }
+    if (optype.includeReturnValueSuggestions) {
       _addFilteredSuggestions(filterText, cache.otherImportedSuggestions);
-      if (!excludeVoidReturn) {
-        _addFilteredSuggestions(
-            filterText, cache.importedVoidReturnSuggestions);
-      }
+    }
+    if (optype.includeVoidReturnSuggestions) {
+      _addFilteredSuggestions(filterText, cache.importedVoidReturnSuggestions);
     }
   }
 }