Analysis server code generation improvements

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 212 matching lines @@
   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 {');
+    writeln('class $className implements HasToJson {');
     indent(() {
       for (TypeObjectField field in type.fields) {
         if (field.value != null) {
           continue;
         }
         docComment(toHtmlVisitor.collectHtml(() {
           toHtmlVisitor.translateHtml(field.html);
         }));
         writeln('final ${dartType(field.type)} ${field.name};');
         writeln();
       }
       emitObjectConstructor(type, className);
       writeln();
       emitObjectFromJsonConstructor(className, type, impliedType);
       writeln();
       if (emitConvenienceConstructor(className, impliedType)) {
         writeln();
       }
       emitToJsonMember(type);
       writeln();
+      if (emitToRequestMember(impliedType)) {
+        writeln();
+      }
       writeln('@override');
       writeln('String toString() => JSON.encode(toJson());');
       writeln();
       emitObjectEqualsMember(type, className);
       writeln();
       emitObjectHashCode(type);
     });
     writeln('}');
   }
 
@@ skipping 44 matching lines @@
         } else {
           writeln(populateField);
         }
       }
       writeln('return result;');
     });
     writeln('}');
   }
 
   /**
+   * 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());');
+      });
+      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) {
@@ skipping 105 matching lines @@
   ToJsonCode toJsonCode(TypeDecl type) {
     TypeDecl resolvedType = resolveTypeReferenceChain(type);
     if (resolvedType is TypeReference) {
       return new ToJsonIdentity(dartType(type));
     } else if (resolvedType is TypeList) {
       ToJsonCode itemCode = toJsonCode(resolvedType.itemType);
       if (itemCode.isIdentity) {
         return new ToJsonIdentity(dartType(type));
       } else {
         return new ToJsonSnippet(dartType(type), (String value) =>
-            '$value.map(${itemCode.asClosure})');
+            '$value.map(${itemCode.asClosure}).toList()');
       }
     } else if (resolvedType is TypeMap) {
       ToJsonCode keyCode;
       if (dartType(resolvedType.keyType) != 'String') {
         keyCode = toJsonCode(resolvedType.keyType);
       } else {
         keyCode = new ToJsonIdentity(dartType(resolvedType.keyType));
       }
       ToJsonCode valueCode = toJsonCode(resolvedType.valueType);
       if (keyCode.isIdentity && valueCode.isIdentity) {
@@ skipping 348 matching lines @@
   CodegenProtocolVisitor visitor = new CodegenProtocolVisitor(readApi());
   return visitor.collectCode(visitor.visitApi);
 });
 
 /**
  * Translate spec_input.html into protocol_matchers.dart.
  */
 main() {
   target.generate();
 }