new TokenType and Keyword API

pkg/analysis_server/lib/src/utilities/change_builder_dart.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.
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart'
     hide Element, ElementKind;
 import 'package:analysis_server/src/provisional/edit/utilities/change_builder_core.dart';
 import 'package:analysis_server/src/provisional/edit/utilities/change_builder_dart.dart';
@@ skipping 85 matching lines @@
       {Iterable<DartType> interfaces,
       bool isAbstract: false,
       void memberWriter(),
       Iterable<DartType> mixins,
       String nameGroupName,
       DartType superclass,
       String superclassGroupName}) {
     // TODO(brianwilkerson) Add support for type parameters, probably as a
     // parameterWriter parameter.
     if (isAbstract) {
-      write(Keyword.ABSTRACT.syntax);
+      write(Keyword.ABSTRACT.lexeme);
       write(' ');
     }
     write('class ');
     if (nameGroupName == null) {
       write(name);
     } else {
       addLinkedEdit(nameGroupName, (LinkedEditBuilder builder) {
         write(name);
       });
     }
@@ skipping 15 matching lines @@
   }
 
   @override
   void writeConstructorDeclaration(String className,
       {ArgumentList argumentList,
       SimpleIdentifier constructorName,
       String constructorNameGroupName,
       List<String> fieldNames,
       bool isConst: false}) {
     if (isConst) {
-      write(Keyword.CONST.syntax);
+      write(Keyword.CONST.lexeme);
       write(' ');
     }
     write(className);
     if (constructorName != null) {
       write('.');
       if (constructorNameGroupName == null) {
         write(constructorName.name);
       } else {
         addLinkedEdit(constructorNameGroupName, (LinkedEditBuilder builder) {
           write(constructorName.name);
@@ skipping 18 matching lines @@
   @override
   void writeFieldDeclaration(String name,
       {void initializerWriter(),
       bool isConst: false,
       bool isFinal: false,
       bool isStatic: false,
       String nameGroupName,
       DartType type,
       String typeGroupName}) {
     if (isStatic) {
-      write(Keyword.STATIC.syntax);
+      write(Keyword.STATIC.lexeme);
       write(' ');
     }
     bool typeRequired = true;
     if (isConst) {
-      write(Keyword.CONST.syntax);
+      write(Keyword.CONST.lexeme);
       typeRequired = false;
     } else if (isFinal) {
-      write(Keyword.FINAL.syntax);
+      write(Keyword.FINAL.lexeme);
       typeRequired = false;
     }
     if (type != null) {
       writeType(type, groupName: typeGroupName, required: true);
     } else if (typeRequired) {
-      write(Keyword.VAR.syntax);
+      write(Keyword.VAR.lexeme);
     }
     write(' ');
     if (nameGroupName != null) {
       addLinkedEdit(nameGroupName, (LinkedEditBuilder builder) {
         write(name);
       });
     } else {
       write(name);
     }
     if (initializerWriter != null) {
       write(' = ');
       initializerWriter();
     }
     write(';');
   }
 
   @override
   void writeFunctionDeclaration(String name,
       {void bodyWriter(),
       bool isStatic: false,
       String nameGroupName,
       void parameterWriter(),
       DartType returnType,
       String returnTypeGroupName}) {
     if (isStatic) {
-      write(Keyword.STATIC.syntax);
+      write(Keyword.STATIC.lexeme);
       write(' ');
     }
     if (returnType != null) {
       writeType(returnType, groupName: returnTypeGroupName);
       write(' ');
     }
     if (nameGroupName != null) {
       addLinkedEdit(nameGroupName, (LinkedEditBuilder builder) {
         write(name);
       });
@@ skipping 18 matching lines @@
   }
 
   @override
   void writeGetterDeclaration(String name,
       {void bodyWriter(),
       bool isStatic: false,
       String nameGroupName,
       DartType returnType,
       String returnTypeGroupName}) {
     if (isStatic) {
-      write(Keyword.STATIC.syntax);
+      write(Keyword.STATIC.lexeme);
       write(' ');
     }
     if (returnType != null && !returnType.isDynamic) {
       writeType(returnType, groupName: returnTypeGroupName);
       write(' ');
     }
-    write(Keyword.GET.syntax);
+    write(Keyword.GET.lexeme);
     write(' ');
     if (nameGroupName != null) {
       addLinkedEdit(nameGroupName, (LinkedEditBuilder builder) {
         write(name);
       });
     } else {
       write(name);
     }
     if (bodyWriter == null) {
       write(' => null;');
     } else {
       write(' ');
       bodyWriter();
     }
   }
 
   @override
   void writeLocalVariableDeclaration(String name,
       {void initializerWriter(),
       bool isConst: false,
       bool isFinal: false,
       String nameGroupName,
       DartType type,
       String typeGroupName}) {
     bool typeRequired = true;
     if (isConst) {
-      write(Keyword.CONST.syntax);
+      write(Keyword.CONST.lexeme);
       typeRequired = false;
     } else if (isFinal) {
-      write(Keyword.FINAL.syntax);
+      write(Keyword.FINAL.lexeme);
       typeRequired = false;
     }
     if (type != null) {
       if (!typeRequired) {
         // The type is required unless we're written a keyword.
         write(' ');
       }
       writeType(type, groupName: typeGroupName);
     } else if (typeRequired) {
-      write(Keyword.VAR.syntax);
+      write(Keyword.VAR.lexeme);
     }
     write(' ');
     if (nameGroupName != null) {
       addLinkedEdit(nameGroupName, (LinkedEditBuilder builder) {
         write(name);
       });
     } else {
       write(name);
     }
     if (initializerWriter != null) {
@@ skipping 21 matching lines @@
       write(prefix);
     }
     // @override
     writeln('@override');
     write(prefix);
     // return type
     bool shouldReturn =
         writeType(member.type.returnType, groupName: returnTypeGroupName);
     write(' ');
     if (isGetter) {
-      write(Keyword.GET.syntax);
+      write(Keyword.GET.lexeme);
       write(' ');
     } else if (isSetter) {
-      write(Keyword.SET.syntax);
+      write(Keyword.SET.lexeme);
       write(' ');
     } else if (isOperator) {
-      write(Keyword.OPERATOR.syntax);
+      write(Keyword.OPERATOR.lexeme);
       write(' ');
     }
     // name
     write(member.displayName);
     // parameters + body
     if (isGetter) {
       writeln(' => null;');
     } else {
       List<ParameterElement> parameters = member.parameters;
       writeParameters(parameters);
@@ skipping 128 matching lines @@
               _addSuperTypeProposals(builder, type, new Set<DartType>());
             }
           });
         } else {
           write(typeSource);
         }
         return true;
       }
     }
     if (required) {
-      write(Keyword.VAR.syntax);
+      write(Keyword.VAR.lexeme);
       return true;
     }
     return false;
   }
 
   @override
   void writeTypeParameter(TypeParameterElement typeParameter) {
     write(typeParameter.name);
     if (typeParameter.bound != null) {
       write(' extends ');
@@ skipping 203 matching lines @@
   void _addSuperTypesAsSuggestions(DartType type, Set<DartType> alreadyAdded) {
     if (type is InterfaceType && alreadyAdded.add(type)) {
       addSuggestion(LinkedEditSuggestionKind.TYPE, type.displayName);
       _addSuperTypesAsSuggestions(type.superclass, alreadyAdded);
       for (InterfaceType interfaceType in type.interfaces) {
         _addSuperTypesAsSuggestions(interfaceType, alreadyAdded);
       }
     }
   }
 }