Change integration test send...() methods to use structured objects.

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_dart.dart';
 import 'codegen_tools.dart';
 import 'from_html.dart';
 import 'implied_types.dart';
 import 'to_html.dart';
 
 import 'package:html5lib/dom.dart' as dom;
 
 /**
  * Container for code that can be used to translate a data type from JSON.
  */
@@ skipping 158 matching lines @@
 };
 
 /**
  * Callback type used to represent arbitrary code generation.
  */
 typedef void CodegenCallback();
 
 /**
  * Visitor which produces Dart code representing the API.
  */
-class CodegenProtocolVisitor extends HierarchicalApiVisitor with CodeGenerator {
-  /**
-   * Type references in the spec that are named something else in Dart.
-   */
-  static const Map<String, String> _typeRenames = const {
-    'long': 'int',
-    'object': 'Map',
-  };
-
+class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator {
   /**
    * Class members for which the constructor argument should be optional, even
    * if the member is not an optional part of the protocol.  For list types,
    * the constructor will default the member to the empty list.
    */
   static const Map<String, List<String>> _optionalConstructorArguments = const {
     'AnalysisErrorFixes': const ['fixes'],
     'SourceChange': const ['edits', 'linkedEditGroups'],
     'SourceFileEdit': const ['edits'],
     'TypeHierarchyItem': const ['interfaces', 'mixins', 'subclasses'],
@@ skipping 353 matching lines @@
       case 'SourceChange':
         docComment(
             [new dom.Text('Adds [edit] to the [FileEdit] for the given [file].')]);
         writeln('void addEdit(String file, int fileStamp, SourceEdit edit) =>');
         writeln('    _addEditToSourceChange(this, file, fileStamp, edit);');
         writeln();
         docComment(
             [new dom.Text('Adds [edit] to the [FileEdit] for the given [source].')]);
         writeln('void addSourceEdit(engine.AnalysisContext context,');
         writeln('    engine.Source source, SourceEdit edit) =>');
-        writeln('    _addSourceEditToSourceChange(this, context, source, edit);');
+        writeln(
+            '    _addSourceEditToSourceChange(this, context, source, edit);');
         writeln();
         docComment(
             [new dom.Text('Adds [edit] to the [FileEdit] for the given [element].')]);
-        writeln('void addElementEdit(engine.Element element, SourceEdit edit) =>');
+        writeln(
+            'void addElementEdit(engine.Element element, SourceEdit edit) =>');
         writeln('    _addElementEditToSourceChange(this, element, edit);');
         writeln();
         docComment([new dom.Text('Adds the given [FileEdit].')]);
         writeln('void addFileEdit(SourceFileEdit edit) {');
         indent(() {
           writeln('edits.add(edit);');
         });
         writeln('}');
         writeln();
         docComment([new dom.Text('Adds the given [LinkedEditGroup].')]);
@@ skipping 392 matching lines @@
   }
 
   /**
    * Emit the method for decoding an object from JSON.
    */
   void emitObjectFromJsonConstructor(String className, TypeObject type,
       ImpliedType impliedType) {
     String humanReadableNameString =
         literalString(impliedType.humanReadableName);
     if (className == 'RefactoringFeedback') {
-      writeln('factory RefactoringFeedback.fromJson(JsonDecoder jsonDecoder, '
-          'String jsonPath, Object json, Map responseJson) {');
+      writeln(
+          'factory RefactoringFeedback.fromJson(JsonDecoder jsonDecoder, '
+              'String jsonPath, Object json, Map responseJson) {');
       indent(() {
-        writeln('return _refactoringFeedbackFromJson(jsonDecoder, jsonPath, '
-            'json, responseJson);');
+        writeln(
+            'return _refactoringFeedbackFromJson(jsonDecoder, jsonPath, '
+                'json, responseJson);');
       });
       writeln('}');
       return;
     }
     if (className == 'RefactoringOptions') {
-      writeln('factory RefactoringOptions.fromJson(JsonDecoder jsonDecoder, '
-          'String jsonPath, Object json, RefactoringKind kind) {');
+      writeln(
+          'factory RefactoringOptions.fromJson(JsonDecoder jsonDecoder, '
+              'String jsonPath, Object json, RefactoringKind kind) {');
       indent(() {
-        writeln('return _refactoringOptionsFromJson(jsonDecoder, jsonPath, '
-            'json, kind);');
+        writeln(
+            'return _refactoringOptionsFromJson(jsonDecoder, jsonPath, ' 'json, kind);');
       });
       writeln('}');
       return;
     }
     writeln(
         'factory $className.fromJson(JsonDecoder jsonDecoder, String jsonPath, Object json) {');
     indent(() {
       writeln('if (json == null) {');
       indent(() {
         writeln('json = {};');
@@ skipping 93 matching lines @@
 
   /**
    * Compute the code necessary to translate [type] from JSON.
    */
   FromJsonCode fromJsonCode(TypeDecl type) {
     if (type is TypeReference) {
       TypeDefinition referencedDefinition = api.types[type.typeName];
       if (referencedDefinition != null) {
         TypeDecl referencedType = referencedDefinition.type;
         if (referencedType is TypeObject || referencedType is TypeEnum) {
-          return new FromJsonSnippet(
-              (String jsonPath, String json) {
-                String typeName = dartType(type);
-                if (typeName == 'RefactoringFeedback') {
-                  return 'new $typeName.fromJson(jsonDecoder, $jsonPath, $json, json)';
-                } else if (typeName == 'RefactoringOptions') {
-                  return 'new $typeName.fromJson(jsonDecoder, $jsonPath, $json, kind)';
-                } else {
-                  return 'new $typeName.fromJson(jsonDecoder, $jsonPath, $json)';
-                }
-              });
+          return new FromJsonSnippet((String jsonPath, String json) {
+            String typeName = dartType(type);
+            if (typeName == 'RefactoringFeedback') {
+              return
+                  'new $typeName.fromJson(jsonDecoder, $jsonPath, $json, json)';
+            } else if (typeName == 'RefactoringOptions') {
+              return
+                  'new $typeName.fromJson(jsonDecoder, $jsonPath, $json, kind)';
+            } else {
+              return 'new $typeName.fromJson(jsonDecoder, $jsonPath, $json)';
+            }
+          });
         } else {
           return fromJsonCode(referencedType);
         }
       } else {
         switch (type.typeName) {
           case 'String':
             return new FromJsonFunction('jsonDecoder._decodeString');
           case 'bool':
             return new FromJsonFunction('jsonDecoder._decodeBool');
           case 'int':
@@ skipping 135 matching lines @@
     writeln('}');
     return true;
   }
 
   /**
    * Create a string literal that evaluates to [s].
    */
   String literalString(String s) {
     return JSON.encode(s);
   }
-
-  /**
-   * Convert the given [TypeDecl] to a Dart type.
-   */
-  String dartType(TypeDecl type) {
-    if (type is TypeReference) {
-      String typeName = type.typeName;
-      TypeDefinition referencedDefinition = api.types[typeName];
-      if (_typeRenames.containsKey(typeName)) {
-        return _typeRenames[typeName];
-      }
-      if (referencedDefinition == null) {
-        return typeName;
-      }
-      TypeDecl referencedType = referencedDefinition.type;
-      if (referencedType is TypeObject || referencedType is TypeEnum) {
-        return typeName;
-      }
-      return dartType(referencedType);
-    } else if (type is TypeList) {
-      return 'List<${dartType(type.itemType)}>';
-    } else if (type is TypeMap) {
-      return 'Map<${dartType(type.keyType)}, ${dartType(type.valueType)}>';
-    } else if (type is TypeUnion) {
-      return 'dynamic';
-    } else {
-      throw new Exception("Can't convert to a dart type");
-    }
-  }
 }
 
 final GeneratedFile target =
     new GeneratedFile('../../lib/src/generated_protocol.dart', () {
   CodegenProtocolVisitor visitor = new CodegenProtocolVisitor(readApi());
   return visitor.collectCode(visitor.visitApi);
 });
 
 /**
  * Translate spec_input.html into protocol_matchers.dart.
  */
 main() {
   target.generate();
 }