new TokenType and Keyword API

pkg/analysis_server/lib/src/provisional/completion/dart/completion_target.dart

 // Copyright (c) 2015, 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 analysis_server.src.provisional.completion.dart.completion_target;
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
@@ skipping 371 matching lines @@
   }
 
   /**
    * Determine whether [node] could possibly be the [entity] for a
    * [CompletionTarget] associated with the given [offset].
    */
   static bool _isCandidateNode(AstNode node, int offset) {
     // If the node's first token is a keyword or identifier, then the node is a
     // candidate entity if its first token is.
     Token beginToken = node.beginToken;
-    if (beginToken.type == TokenType.KEYWORD ||
-        beginToken.type == TokenType.IDENTIFIER) {
+    if (beginToken.type.isKeyword || beginToken.type == TokenType.IDENTIFIER) {
       return _isCandidateToken(beginToken, offset);
     }
 
     // Otherwise, the node is a candidate entity only if the offset is before
     // the beginning of the node.  This ensures that completions within a token
     // (e.g. inside a literal string or inside a comment) are evaluated within
     // the context of the token itself.
     return offset <= node.offset;
   }
 
   /**
    * Determine whether [token] could possibly be the [entity] for a
    * [CompletionTarget] associated with the given [offset].
    */
   static bool _isCandidateToken(Token token, int offset) {
     // A token is considered a candidate entity if the cursor offset is (a)
     // before the start of the token, (b) within the token, (c) at the end of
     // the token and the token is a keyword or identifier, or (d) at the
     // location of the token and the token is zero length.
     if (offset < token.end) {
       return true;
     } else if (offset == token.end) {
-      return token.type == TokenType.KEYWORD ||
+      return token.type.isKeyword ||
           token.type == TokenType.IDENTIFIER ||
           token.length == 0;
     } else if (!token.isSynthetic) {
       return false;
     }
     // If the current token is synthetic, then check the previous token
     // because it may have been dropped from the parse tree
     Token previous = token.previous;
     if (offset < previous.end) {
       return true;
     } else if (offset == previous.end) {
-      return token.type == TokenType.KEYWORD ||
-          previous.type == TokenType.IDENTIFIER;
+      return token.type.isKeyword || previous.type == TokenType.IDENTIFIER;
     } else {
       return false;
     }
   }
 
   /**
    * Return `true` if the parameter is a functional parameter.
    */
   static bool _isFunctionalParameter(List<ParameterElement> parameters,
       int paramIndex, AstNode containingNode) {
@@ skipping 10 matching lines @@
               orElse: () => null);
           paramType = param?.type;
         }
       } else {
         paramType = param.type;
       }
     }
     return paramType is FunctionType || paramType is FunctionTypeAlias;
   }
 }