Add colon to switch cases and default

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;
@@ skipping 159 matching lines @@
     }
     node = new NodeLocator(selectionOffset).searchWithin(unit);
     if (node == null) {
       return NO_COMPLETION;
     }
     // TODO(messick): This needs to work for declarations.
     AstNode newNode = node.getAncestor((n) => n is Statement);
     if (newNode is Block) {
       Block blockNode = newNode;
       if (blockNode.statements.isNotEmpty) {
-        node = blockNode.statements[blockNode.statements.length - 1];
+        node = blockNode.statements.last;
       } else {
-        newNode = node.getAncestor((n) => n is CatchClause);
-        if (newNode != null) {
-          node = newNode.parent;
-        } else {
-          node = node.getAncestor((n) => n is Statement).parent;
-        }
+        node = newNode;
       }
     } else {
       node = newNode;

[Brian Wilkerson, 2017/04/24 21:07:40]

Given that 'node' is set to 'newNode' in two thirds of the cases, seems like
there's an opportunity for more clean-up here. Certainly not required for this
CL, though.

[messick, 2017/04/25 18:13:23]

Acknowledged.

     }
     if (_isEmptyStatement(node)) {
       node = node.parent;
     }
     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);
         }
@@ skipping 440 matching lines @@
       if (_isSyntheticExpression(switchNode.expression)) {
         exitPosition =
             new Position(file, switchNode.leftParenthesis.offset + 1);
       }
     }
     if (switchNode
         .leftBracket.isSynthetic /*&& switchNode.rightBracket.isSynthetic*/) {
       // See https://github.com/dart-lang/sdk/issues/29391
       sb.append(' ');
       _appendEmptyBraces(sb, exitPosition == null);
+    } else {
+      SwitchMember member = _findInvalidElement(switchNode.members);
+      if (member != null) {
+        if (member.colon.isSynthetic) {
+          int loc =
+              member is SwitchCase ? member.expression.end : member.keyword.end;
+          sb = new SourceBuilder(file, loc);
+          sb.append(': ');
+          exitPosition = new Position(file, loc + 2);
+        }
+      }
     }
     _insertBuilder(sb);
     _setCompletion(DartStatementCompletion.COMPLETE_SWITCH_STMT);
     return true;
   }
 
   bool _complete_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)
           .startsWith(new RegExp(r'[ \t]+'))) {
         // keywordSpace
         sb = new SourceBuilder(file, tryNode.tryKeyword.end + 1);
       } else {
         // keywordOnly
         sb = new SourceBuilder(file, tryNode.tryKeyword.end);
         sb.append(' ');
       }
       _appendEmptyBraces(sb, true);
       _insertBuilder(sb);
       sb = null;
-    } else if ((catchNode = _findInvalidCatch(tryNode.catchClauses)) != null) {
+    } else if ((catchNode = _findInvalidElement(tryNode.catchClauses)) !=
+        null) {
       if (catchNode.onKeyword != null) {
         if (catchNode.exceptionType.length == 0) {
           String src = utils.getNodeText(catchNode);
           if (src.startsWith(new RegExp(r'on[ \t]+'))) {
             if (src.startsWith(new RegExp(r'on[ \t][ \t]+'))) {
               // onSpaces
               exitPosition = new Position(file, catchNode.onKeyword.end + 1);
               sb = new SourceBuilder(file, catchNode.onKeyword.end + 2);
               addSpace = false;
             } else {
@@ skipping 73 matching lines @@
         errors.firstWhere((err) => err.errorCode == code, orElse: () => null);
     if (error != null) {
       if (partialMatch != null) {
         return error.message.contains(partialMatch) ? error : null;
       }
       return error;
     }
     return null;
   }
 
-  CatchClause _findInvalidCatch(NodeList<CatchClause> list) {
+  T _findInvalidElement<T extends AstNode>(NodeList<T> list) {
     return list.firstWhere(
         (catchClause) =>

[Brian Wilkerson, 2017/04/24 21:07:40]

Given that the method has been generalized, perhaps a more general parameter
name?

[messick, 2017/04/25 18:13:23]

Acknowledged.

             selectionOffset >= catchClause.offset &&
             selectionOffset <= catchClause.end,
         orElse: () => null);
   }
 
   LinkedEditGroup _getLinkedPosition(String groupId) {
     LinkedEditGroup group = linkedPositionGroups[groupId];
     if (group == null) {
       group = new LinkedEditGroup.empty();
       linkedPositionGroups[groupId] = group;
@@ skipping 77 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;
 }