Clean up TODOs

pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart

 // Copyright (c) 2017, 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.src.completion.statement;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/src/protocol_server.dart' hide Element;
 import 'package:analysis_server/src/services/correction/source_buffer.dart';
 import 'package:analysis_server/src/services/correction/source_range.dart';
 import 'package:analysis_server/src/services/correction/util.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/error/error.dart' as engine;
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dart/error/hint_codes.dart';
 import 'package:analyzer/src/dart/error/syntactic_errors.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/generated/source.dart';
 
@@ skipping 151 matching lines @@
     }
     for (engine.AnalysisError error in statementContext.errors) {
       if (error.offset >= node.offset &&
           error.offset <= node.offset + node.length) {
         if (error.errorCode is! HintCode) {
           errors.add(error);
         }
       }
     }
 
-    // TODO(messick) Consider changing (some of) this to a visitor.
-    if (_complete_ifStatement() ||
-        _complete_doStatement() ||
-        _complete_forStatement() ||
-        _complete_forEachStatement() ||
-        _complete_switchStatement() ||
-        _complete_tryStatement() ||
-        _complete_whileStatement() ||
-        _complete_simpleSemicolon() ||
-        _complete_controlFlowBlock() ||
-        _complete_simpleEnter()) {
-      return completion;
+    if (errors.isEmpty) {
+      if (_complete_simpleEnter()) {
+        return completion;
+      }
+    } else {
+      if (_complete_ifStatement() ||
+          _complete_doStatement() ||
+          _complete_forStatement() ||
+          _complete_forEachStatement() ||
+          _complete_switchStatement() ||
+          _complete_tryStatement() ||
+          _complete_whileStatement() ||
+          _complete_simpleSemicolon() ||
+          _complete_controlFlowBlock() ||
+          _complete_simpleEnter()) {
+        return completion;
+      }
     }
     return NO_COMPLETION;
   }
 
   void _addInsertEdit(int offset, String text) {
     SourceEdit edit = new SourceEdit(offset, 0, text);
     doSourceChange_addElementEdit(change, unitElement, edit);
   }
 
   void _addReplaceEdit(SourceRange range, String text) {
@@ skipping 30 matching lines @@
       text = text.substring(0, text.length - eol.length);
     }
     return text;
   }
 
   bool _complete_controlFlowBlock() {
     //TODO(messick) Implement _complete_controlFlowBlock
     // Use statement completion to move the cursor to a new line outside the
     // current block. The statement has no errors in this case. Used to jump
     // out of do/for/if/while blocks.
-    //TODO(messick) Move has-errors checking into dispatch method.
     return false;
   }
 
   bool _complete_doStatement() {
-    if (errors.isEmpty || node is! DoStatement) {
+    if (node is! DoStatement) {
       return false;
     }
     DoStatement statement = node;
     SourceBuilder sb = _sourceBuilderAfterKeyword(statement.doKeyword);
     bool hasWhileKeyword = statement.whileKeyword.lexeme == "while";
     int exitDelta = 0;
     if (statement.body is EmptyStatement) {
       String text = utils.getNodeText(statement.body);
       int delta = 0;
       if (text.startsWith(';')) {
@@ skipping 58 matching lines @@
     _insertBuilder(sb);
     if (exitDelta != 0) {
       exitPosition =
           new Position(exitPosition.file, exitPosition.offset + exitDelta);
     }
     _setCompletion(DartStatementCompletion.COMPLETE_DO_STMT);
     return true;
   }
 
   bool _complete_forEachStatement() {
-    if (errors.isEmpty || node is! ForEachStatement) {
+    if (node is! ForEachStatement) {
       return false;
     }
     ForEachStatement forNode = node;
     if (forNode.inKeyword.isSynthetic) {
       return false; // Can't happen -- would be parsed as a for-statement.
     }
     SourceBuilder sb =
         new SourceBuilder(file, forNode.rightParenthesis.offset + 1);
     AstNode name = forNode.identifier;
     name ??= forNode.loopVariable;
@@ skipping 25 matching lines @@
     if (_isEmptyStatement(forNode.body)) {
       sb.append(' ');
       _appendEmptyBraces(sb, exitPosition == null);
     }
     _insertBuilder(sb);
     _setCompletion(DartStatementCompletion.COMPLETE_FOR_EACH_STMT);
     return true;
   }
 
   bool _complete_forStatement() {
-    if (errors.isEmpty || node is! ForStatement) {
+    if (node is! ForStatement) {
       return false;
     }
     ForStatement forNode = node;
     SourceBuilder sb;
     int delta = 0;
     if (forNode.leftParenthesis.isSynthetic) {
       if (!forNode.rightParenthesis.isSynthetic) {
         return false;
       }
       // keywordOnly (unit test name suffix that exercises this branch)
       sb = _sourceBuilderAfterKeyword(forNode.forKeyword);
       sb.append('(');
       sb.setExitOffset();
       sb.append(')');
     } else {
       if (!forNode.rightSeparator.isSynthetic) {
         // Fully-defined init, cond, updaters so nothing more needed here.
         // emptyParts
         sb = new SourceBuilder(file, forNode.rightParenthesis.offset + 1);
       } else if (!forNode.leftSeparator.isSynthetic) {
         if (_isSyntheticExpression(forNode.condition)) {
           exitPosition = _newPosition(forNode.leftSeparator.offset + 1);
           String text = utils
               .getNodeText(forNode)
               .substring(forNode.leftSeparator.offset - forNode.offset);
           if (text.startsWith(new RegExp(r';\s*\)'))) {
             // emptyCondition
             int end = text.indexOf(')');
             sb = new SourceBuilder(file, forNode.leftSeparator.offset);
-            // TODO(messick) Consider adding two semicolons here.
-            _addReplaceEdit(rangeStartLength(sb.offset, end), '; ');
+            _addReplaceEdit(rangeStartLength(sb.offset, end), '; ; ');
             delta = end - '; '.length;
           } else {
             // emptyInitializersEmptyCondition
             exitPosition = _newPosition(forNode.rightParenthesis.offset);
             sb = new SourceBuilder(file, forNode.rightParenthesis.offset);
           }
         } else {
           // emptyUpdaters
           exitPosition = _newPosition(forNode.rightSeparator.offset);
           sb = new SourceBuilder(file, forNode.rightSeparator.offset);
@@ skipping 45 matching lines @@
     if (statement.block is EmptyStatement) {
       sb.append(' ');
       _appendEmptyBraces(sb, exitPosition == null);
     }
     _insertBuilder(sb);
     _setCompletion(kind);
     return true;
   }
 
   bool _complete_ifStatement() {
-    if (errors.isEmpty || node is! IfStatement) {
+    if (node is! IfStatement) {
       return false;
     }
     IfStatement ifNode = node;
     if (ifNode != null) {
       if (ifNode.elseKeyword != null) {
         return false;
       }
       var stmt = new _KeywordConditionBlockStructure(
           ifNode.ifKeyword,
           ifNode.leftParenthesis,
@@ skipping 52 matching lines @@
       int insertOffset = error.offset + error.length;
       _addInsertEdit(insertOffset, ';');
       int offset = _appendNewlinePlusIndent() + 1 /* ';' */;
       _setCompletionAt(DartStatementCompletion.SIMPLE_SEMICOLON, offset);
       return true;
     }
     return false;
   }
 
   bool _complete_switchStatement() {
-    if (errors.isEmpty || node is! SwitchStatement) {
+    if (node is! SwitchStatement) {
       return false;
     }
     SourceBuilder sb;
     SwitchStatement switchNode = node;
     if (switchNode.leftParenthesis.isSynthetic &&
         switchNode.rightParenthesis.isSynthetic) {
       exitPosition = new Position(file, switchNode.switchKeyword.end + 2);
       String src = utils.getNodeText(switchNode);
       if (src
           .substring(switchNode.switchKeyword.end - switchNode.offset)
@@ skipping 19 matching lines @@
       // See https://github.com/dart-lang/sdk/issues/29391
       sb.append(' ');
       _appendEmptyBraces(sb, exitPosition == null);
     }
     _insertBuilder(sb);
     _setCompletion(DartStatementCompletion.COMPLETE_SWITCH_STMT);
     return true;
   }
 
   bool _complete_tryStatement() {
-    if (errors.isEmpty || node is! TryStatement) {
+    if (node is! TryStatement) {
       return false;
     }
     TryStatement tryNode = node;
     SourceBuilder sb;
     CatchClause catchNode;
     bool addSpace = true;
     if (tryNode.body.leftBracket.isSynthetic) {
       String src = utils.getNodeText(tryNode);
       if (src
           .substring(tryNode.tryKeyword.end - tryNode.offset)
@@ skipping 66 matching lines @@
         sb.append(' ');
         _appendEmptyBraces(sb, true);
         _insertBuilder(sb);
       }
     }
     _setCompletion(DartStatementCompletion.COMPLETE_TRY_STMT);
     return true;
   }
 
   bool _complete_whileStatement() {
-    if (errors.isEmpty || node is! WhileStatement) {
+    if (node is! WhileStatement) {
       return false;
     }
     WhileStatement whileNode = node;
     if (whileNode != null) {
       var stmt = new _KeywordConditionBlockStructure(
           whileNode.whileKeyword,
           whileNode.leftParenthesis,
           whileNode.condition,
           whileNode.rightParenthesis,
           whileNode.body);
@@ skipping 115 matching lines @@
   final Token keyword;
   final Token leftParenthesis, rightParenthesis;
   final Expression condition;
   final Statement block;
 
   _KeywordConditionBlockStructure(this.keyword, this.leftParenthesis,
       this.condition, this.rightParenthesis, this.block);
 
   int get offset => keyword.offset;
 }