Finish modifying analysis server to make use of code generation.

pkg/analysis_server/tool/spec/codegen_dart_protocol.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 codegen.protocol;
 
 import 'dart:convert';
 
 import 'api.dart';
 import 'codegen_tools.dart';
@@ skipping 208 matching lines @@
 
   CodegenProtocolVisitor(Api api)
       : super(api),
         toHtmlVisitor = new ToHtmlVisitor(api),
         impliedTypes = computeImpliedTypes(api);
 
   @override
   visitApi() {
     outputHeader();
     writeln();
-    writeln('part of protocol2;');
+    writeln('part of protocol;');
     emitClasses();
   }
 
   /**
    * Translate each type implied by the API to a class.
    */
   void emitClasses() {
     for (ImpliedType impliedType in impliedTypes.values) {
       TypeDecl type = impliedType.type;
-      if (type != null) {
-        String dartTypeName = capitalize(impliedType.camelName);
-        if (type is TypeObject) {
-          writeln();
-          emitObjectClass(dartTypeName, type, impliedType);
-        } else if (type is TypeEnum) {
-          writeln();
-          emitEnumClass(dartTypeName, type, impliedType);
-        }
+      String dartTypeName = capitalize(impliedType.camelName);
+      if (type == null) {
+        emitEmptyObjectClass(dartTypeName, impliedType);
+      } else if (type is TypeObject || type == null) {
+        writeln();
+        emitObjectClass(dartTypeName, type, impliedType);
+      } else if (type is TypeEnum) {
+        writeln();
+        emitEnumClass(dartTypeName, type, impliedType);
       }
     }
   }
 
   /**
+   * Emit a class representing an data structure that doesn't exist in the
+   * protocol because it is empty (e.g. the "params" object for a request that
+   * doesn't have any parameters).
+   */
+  void emitEmptyObjectClass(String className, ImpliedType impliedType) {
+    docComment(toHtmlVisitor.collectHtml(() {
+      toHtmlVisitor.p(() {
+        toHtmlVisitor.write(impliedType.humanReadableName);
+      });
+    }));
+    writeln('class $className {');
+    indent(() {
+      if (emitToRequestMember(impliedType)) {
+        writeln();
+      }
+      if (emitToResponseMember(impliedType)) {
+        writeln();
+      }
+      if (emitToNotificationMember(impliedType)) {
+        writeln();
+      }
+      emitObjectEqualsMember(null, className);
+      writeln();
+      emitObjectHashCode(null, className);
+    });
+    writeln('}');
+  }
+
+  /**
    * Emit the class to encapsulate an object type.
    */
   void emitObjectClass(String className, TypeObject type,
       ImpliedType impliedType) {
     docComment(toHtmlVisitor.collectHtml(() {
       toHtmlVisitor.p(() {
         toHtmlVisitor.write(impliedType.humanReadableName);
       });
       if (impliedType.type != null) {
         toHtmlVisitor.showType(null, impliedType.type);
       }
     }));
-    writeln('class $className implements HasToJson {');
+    writeln('class $className {');
     indent(() {
       if (emitSpecialStaticMembers(className)) {
         writeln();
       }
       for (TypeObjectField field in type.fields) {
         if (field.value != null) {
           continue;
         }
         docComment(toHtmlVisitor.collectHtml(() {
           toHtmlVisitor.translateHtml(field.html);
@@ skipping 26 matching lines @@
         writeln();
       }
       if (emitSpecialMethods(className)) {
         writeln();
       }
       writeln('@override');
       writeln('String toString() => JSON.encode(toJson());');
       writeln();
       emitObjectEqualsMember(type, className);
       writeln();
-      emitObjectHashCode(type);
+      emitObjectHashCode(type, className);
     });
     writeln('}');
   }
 
   /**
    * If the class named [className] requires special static members, emit them
    * and return true.
    */
   bool emitSpecialStaticMembers(String className) {
     switch (className) {
@@ skipping 338 matching lines @@
   /**
    * Emit the toRequest() code for a class, if appropriate.  Returns true if
    * code was emitted.
    */
   bool emitToRequestMember(ImpliedType impliedType) {
     if (impliedType.kind == 'requestParams') {
       writeln('Request toRequest(String id) {');
       indent(() {
         String methodString =
             literalString((impliedType.apiNode as Request).longMethod);
-        writeln('return new Request(id, $methodString, toJson());');
+        String jsonPart = impliedType.type != null ? 'toJson()' : 'null';
+        writeln('return new Request(id, $methodString, $jsonPart);');
       });
       writeln('}');
       return true;
     }
     return false;
   }
 
   /**
    * Emit the toResponse() code for a class, if appropriate.  Returns true if
    * code was emitted.
    */
   bool emitToResponseMember(ImpliedType impliedType) {
     if (impliedType.kind == 'requestResult') {
       writeln('Response toResponse(String id) {');
       indent(() {
-        writeln('return new Response(id, result: toJson());');
+        String jsonPart = impliedType.type != null ? 'toJson()' : 'null';
+        writeln('return new Response(id, result: $jsonPart);');
       });
       writeln('}');
       return true;
     }
     return false;
   }
 
   /**
    * Emit the toNotification() code for a class, if appropriate.  Returns true
    * if code was emitted.
    */
   bool emitToNotificationMember(ImpliedType impliedType) {
     if (impliedType.kind == 'notificationParams') {
       writeln('Notification toNotification() {');
       indent(() {
         String eventString =
             literalString((impliedType.apiNode as Notification).longEvent);
-        writeln('return new Notification($eventString, toJson());');
+        String jsonPart = impliedType.type != null ? 'toJson()' : 'null';
+        writeln('return new Notification($eventString, $jsonPart);');
       });
       writeln('}');
       return true;
     }
     return false;
   }
 
   /**
    * Emit the operator== code for an object class.
    */
   void emitObjectEqualsMember(TypeObject type, String className) {
     writeln('@override');
     writeln('bool operator==(other) {');
     indent(() {
       writeln('if (other is $className) {');
       indent(() {
         var comparisons = <String>[];
-        for (TypeObjectField field in type.fields) {
-          if (field.value != null) {
-            continue;
+        if (type != null) {
+          for (TypeObjectField field in type.fields) {
+            if (field.value != null) {
+              continue;
+            }
+            comparisons.add(
+                compareEqualsCode(field.type, field.name, 'other.${field.name}'));
           }
-          comparisons.add(
-              compareEqualsCode(field.type, field.name, 'other.${field.name}'));
         }
         if (comparisons.isEmpty) {
           writeln('return true;');
         } else {
           String concatenated = comparisons.join(' &&\n    ');
           writeln('return $concatenated;');
         }
       });
       writeln('}');
       writeln('return false;');
     });
     writeln('}');
   }
 
   /**
    * Emit the hashCode getter for an object class.
    */
-  void emitObjectHashCode(TypeObject type) {
+  void emitObjectHashCode(TypeObject type, String className) {
     writeln('@override');
     writeln('int get hashCode {');
     indent(() {
-      writeln('int hash = 0;');
-      for (TypeObjectField field in type.fields) {
-        String valueToCombine;
-        if (field.value != null) {
-          valueToCombine = field.value.hashCode.toString();
-        } else {
-          valueToCombine = '${field.name}.hashCode';
+      if (type == null) {
+        writeln('return ${className.hashCode};');
+      } else {
+        writeln('int hash = 0;');
+        for (TypeObjectField field in type.fields) {
+          String valueToCombine;
+          if (field.value != null) {
+            valueToCombine = field.value.hashCode.toString();
+          } else {
+            valueToCombine = '${field.name}.hashCode';
+          }
+          writeln('hash = _JenkinsSmiHash.combine(hash, $valueToCombine);');
         }
-        writeln('hash = _JenkinsSmiHash.combine(hash, $valueToCombine);');
+        writeln('return _JenkinsSmiHash.finish(hash);');
       }
-      writeln('return _JenkinsSmiHash.finish(hash);');
     });
     writeln('}');
   }
 
   /**
    * Emit a class to encapsulate an enum.
    */
   void emitEnumClass(String className, TypeEnum type, ImpliedType impliedType) {
     docComment(toHtmlVisitor.collectHtml(() {
       toHtmlVisitor.p(() {
@@ skipping 359 matching lines @@
     // Constructor call to create the JsonDecoder object.
     String makeDecoder;
     // Name of the constructor to create.
     String constructorName;
     // Extra arguments for the constructor.
     List<String> extraArgs = <String>[];
     switch (impliedType.kind) {
       case 'requestParams':
         inputType = 'Request';
         inputName = 'request';
-        fieldName = 'params';
+        fieldName = '_params';
         makeDecoder = 'new RequestDecoder(request)';
         constructorName = 'fromRequest';
         break;
       case 'requestResult':
         inputType = 'Response';
         inputName = 'response';
-        fieldName = 'result';
+        fieldName = '_result';
         makeDecoder = 'new ResponseDecoder()';
         constructorName = 'fromResponse';
         break;
       case 'notificationParams':
         inputType = 'Notification';
         inputName = 'notification';
-        fieldName = 'params';
+        fieldName = '_params';
         makeDecoder = 'new ResponseDecoder()';
         constructorName = 'fromNotification';
         break;
       case 'refactoringFeedback':
         inputType = 'EditGetRefactoringResult';
         inputName = 'refactoringResult';
         fieldName = 'feedback';
         makeDecoder = 'new ResponseDecoder()';
         constructorName = 'fromRefactoringResult';
         break;
       case 'refactoringOptions':
         inputType = 'EditGetRefactoringParams';
         inputName = 'refactoringParams';
         fieldName = 'options';
         makeDecoder = 'new RequestDecoder(request)';
         constructorName = 'fromRefactoringParams';
         extraArgs.add('Request request');
         break;
       default:
         return false;
     }
     List<String> args = ['$inputType $inputName'];
     args.addAll(extraArgs);
     writeln('factory $className.$constructorName(${args.join(', ')}) {');
     indent(() {
-      String fieldNameString = literalString(fieldName);
+      String fieldNameString =
+          literalString(fieldName.replaceFirst(new RegExp('^_'), ''));
       writeln('return new $className.fromJson(');
       writeln('    $makeDecoder, $fieldNameString, $inputName.$fieldName);');
     });
     writeln('}');
     return true;
   }
 
   /**
    * Create a string literal that evaluates to [s].
    */
@@ skipping 36 matching lines @@
   CodegenProtocolVisitor visitor = new CodegenProtocolVisitor(readApi());
   return visitor.collectCode(visitor.visitApi);
 });
 
 /**
  * Translate spec_input.html into protocol_matchers.dart.
  */
 main() {
   target.generate();
 }