WEB-20151. Include type arguments into type proposals.

pkg/analysis_server/test/services/correction/fix_test.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.correction.fix;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/edit/fix/fix_core.dart';
 import 'package:analysis_server/plugin/edit/fix/fix_dart.dart';
@@ skipping 3866 matching lines @@
 class A {
   List<int> items;
   main() {
     process(items);
   }
 }
 
 void process(List<int> items) {
 }
 ''');
+    _assertLinkedGroup(
+        change.linkedEditGroups[2],
+        ['List<int> items) {'],
+        expectedSuggestions(LinkedEditSuggestionKind.TYPE,
+            ['List<int>', 'Iterable<int>', 'Object']));
   }
 
   test_undefinedFunction_create_importType() async {
     addSource(
         '/lib.dart',
         r'''
 library lib;
 import 'dart:async';
 Future getFuture() => null;
 ''');
@@ skipping 532 matching lines @@
     // linked positions
     int index = 0;
     _assertLinkedGroup(
         change.linkedEditGroups[index++], ['void myUndefinedMethod(']);
     _assertLinkedGroup(change.linkedEditGroups[index++],
         ['myUndefinedMethod(0', 'myUndefinedMethod(int']);
     _assertLinkedGroup(
         change.linkedEditGroups[index++],
         ['int i'],
         expectedSuggestions(LinkedEditSuggestionKind.TYPE,
-            ['int', 'num', 'Object', 'Comparable']));
+            ['int', 'num', 'Object', 'Comparable<num>']));
     _assertLinkedGroup(change.linkedEditGroups[index++], ['i,']);
     _assertLinkedGroup(
         change.linkedEditGroups[index++],
         ['double d'],
         expectedSuggestions(LinkedEditSuggestionKind.TYPE,
-            ['double', 'num', 'Object', 'Comparable']));
+            ['double', 'num', 'Object', 'Comparable<num>']));
     _assertLinkedGroup(change.linkedEditGroups[index++], ['d,']);
     _assertLinkedGroup(
         change.linkedEditGroups[index++],
         ['String s'],
-        expectedSuggestions(
-            LinkedEditSuggestionKind.TYPE, ['String', 'Object', 'Comparable']));
+        expectedSuggestions(LinkedEditSuggestionKind.TYPE,
+            ['String', 'Object', 'Comparable<String>']));
     _assertLinkedGroup(change.linkedEditGroups[index++], ['s)']);
   }
 
   test_undefinedMethod_createUnqualified_parameters_named() async {
     resolveTestUnit('''
 class A {
   main() {
     myUndefinedMethod(0, bbb: 1.0, ccc: '2');
   }
 }
@@ skipping 13 matching lines @@
     // linked positions
     int index = 0;
     _assertLinkedGroup(
         change.linkedEditGroups[index++], ['void myUndefinedMethod(']);
     _assertLinkedGroup(change.linkedEditGroups[index++],
         ['myUndefinedMethod(0', 'myUndefinedMethod(int']);
     _assertLinkedGroup(
         change.linkedEditGroups[index++],
         ['int i'],
         expectedSuggestions(LinkedEditSuggestionKind.TYPE,
-            ['int', 'num', 'Object', 'Comparable']));
+            ['int', 'num', 'Object', 'Comparable<num>']));
     _assertLinkedGroup(change.linkedEditGroups[index++], ['i,']);
     _assertLinkedGroup(
         change.linkedEditGroups[index++],
         ['double bbb'],
         expectedSuggestions(LinkedEditSuggestionKind.TYPE,
-            ['double', 'num', 'Object', 'Comparable']));
+            ['double', 'num', 'Object', 'Comparable<num>']));
     _assertLinkedGroup(
         change.linkedEditGroups[index++],
         ['String ccc'],
-        expectedSuggestions(
-            LinkedEditSuggestionKind.TYPE, ['String', 'Object', 'Comparable']));
+        expectedSuggestions(LinkedEditSuggestionKind.TYPE,
+            ['String', 'Object', 'Comparable<String>']));
   }
 
   test_undefinedMethod_createUnqualified_returnType() async {
     resolveTestUnit('''
 class A {
   main() {
     int v = myUndefinedMethod();
   }
 }
 ''');
@@ skipping 420 matching lines @@
       int offset = resultCode.indexOf(search);
       positions.add(new Position(testFile, offset));
     }
     return positions;
   }
 
   void _performAnalysis() {
     while (context.performAnalysisTask().hasMoreWork);
   }
 }