More tweaks for 'for' completion.

pkg/analysis_server/lib/src/services/completion/dart/keyword_contributor.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.dart.keyword;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
@@ skipping 208 matching lines @@
     }
   }
 
   @override
   visitForStatement(ForStatement node) {
     // Actual: for (va^)
     // Parsed: for (va^; ;)
     if (node.initialization == entity && entity is SimpleIdentifier) {
       if (_isNextTokenSynthetic(entity, TokenType.SEMICOLON)) {
         _addSuggestion(Keyword.VAR, DART_RELEVANCE_HIGH);
-        _addSuggestion(Keyword.FINAL, DART_RELEVANCE_HIGH);
       }
     }
     // Actual: for (int x i^)
     // Parsed: for (int x; i^;)
     // Handle the degenerate case while typing - for (int x i^)
-    if (node.condition == entity && entity is SimpleIdentifier) {
+    if (node.condition == entity &&
+        entity is SimpleIdentifier &&
+        node.variables != null) {
       if (_isPreviousTokenSynthetic(entity, TokenType.SEMICOLON)) {
         _addSuggestion(Keyword.IN, DART_RELEVANCE_HIGH);
       }
     }
   }
 
   @override
   visitFunctionExpression(FunctionExpression node) {
     if (entity == node.body) {
       FunctionBody body = node.body;
@@ skipping 348 matching lines @@
 
   static bool _isPreviousTokenSynthetic(Object entity, TokenType type) {
     if (entity is AstNode) {
       Token token = entity.beginToken;
       Token previousToken = token.previous;
       return previousToken.isSynthetic && previousToken.type == type;
     }
     return false;
   }
 }