More tweaks for 'for' completion.

pkg/analysis_server/test/services/completion/dart/optype_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.completion.contributor.dart.optype;
 
 import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analysis_server/src/provisional/completion/dart/completion_target.dart';
 import 'package:analysis_server/src/services/completion/dart/optype.dart';
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 650 matching lines @@
 
   test_FormalParameterList() {
     // FormalParameterList MethodDeclaration
     addTestSource('class A {a(^) { }}');
     assertOpType(typeNames: true);
   }
 
   test_ForStatement_condition() {
     // SimpleIdentifier  ForStatement
     addTestSource('main() {for (int index = 0; i^)}');
-    // TODO (danrubel) may want to exclude methods/functions with void return
-    assertOpType(returnValue: true, typeNames: true, voidReturn: true);
+    assertOpType(returnValue: true, typeNames: true);
   }
 
   test_ForStatement_initializer() {
     // SimpleIdentifier  ForStatement
     addTestSource('main() {List a; for (^)}');
-    // TODO (danrubel) may want to exclude methods/functions with void return
-    assertOpType(returnValue: true, typeNames: true, voidReturn: true);
+    assertOpType(typeNames: true);
   }
 
   test_ForStatement_initializer_inKeyword() {
     addTestSource('main() { for (var v i^) }');
     assertOpType();
   }
 
+  test_ForStatement_initializer_type() {
+    // SimpleIdentifier  ForStatement
+    addTestSource('main() {List a; for (i^ v = 0;)}');
+    assertOpType(typeNames: true);
+  }
+
   test_ForStatement_initializer_variableNameEmpty_afterType() {
     addTestSource('main() { for (String ^) }');
     assertOpType(varNames: true);
   }
 
   test_ForStatement_updaters() {
     // SimpleIdentifier  ForStatement
     addTestSource('main() {for (int index = 0; index < 10; i^)}');
     // TODO (danrubel) may want to exclude methods/functions with void return
     assertOpType(returnValue: true, typeNames: true, voidReturn: true);
@@ skipping 851 matching lines @@
   bool get isInSystemLibrary => false;
 
   @override
   String get shortName => fullName;
 
   @override
   Source get source => this;
 
   noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }