Use typed RefactoringOptions in the Dart version of the protocol.

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 265 matching lines @@
       emitObjectHashCode(null, className);
     });
     writeln('}');
   }
 
   /**
    * Emit the class to encapsulate an object type.
    */
   void emitObjectClass(String className, TypeObject type,
       ImpliedType impliedType) {
+    print(impliedType.kind);

[Paul Berry, 2014/09/03 21:23:55]

Was this temporary debug code?  It looks like it should be deleted.

[scheglov, 2014/09/04 01:37:17]

Fixed.

     docComment(toHtmlVisitor.collectHtml(() {
       toHtmlVisitor.p(() {
         toHtmlVisitor.write(impliedType.humanReadableName);
       });
       if (impliedType.type != null) {
         toHtmlVisitor.showType(null, impliedType.type);
       }
     }));
-    writeln('class $className implements HasToJson {');
+    write('class $className');
+    if (impliedType.kind == 'refactoringOptions') {
+      write(' extends RefactoringOptions');
+    }
+    writeln(' implements HasToJson {');
     indent(() {
       if (emitSpecialStaticMembers(className)) {
         writeln();
       }
       for (TypeObjectField field in type.fields) {
         if (field.value != null) {
           continue;
         }
         docComment(toHtmlVisitor.collectHtml(() {
           toHtmlVisitor.translateHtml(field.html);
@@ skipping 652 matching lines @@
         "Don't know how to compare for equality: $resolvedType");
   }
 
   /**
    * Emit the method for decoding an object from JSON.
    */
   void emitObjectFromJsonConstructor(String className, TypeObject type,
       ImpliedType impliedType) {
     String humanReadableNameString =
         literalString(impliedType.humanReadableName);
+    if (className == 'RefactoringOptions') {
+      writeln('factory RefactoringOptions.fromJson(JsonDecoder jsonDecoder, '
+          'String jsonPath, Object json, RefactoringKind kind) {');
+      indent(() {
+        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 = {};');
       });
       writeln('}');
       writeln('if (json is Map) {');
       indent(() {
@@ skipping 16 matching lines @@
           if (isOptionalConstructorArg(className, field)) {
             optionalArgs.add('${field.name}: ${field.name}');
           } else {
             args.add(field.name);
           }
           TypeDecl fieldType = field.type;
           String fieldDartType = dartType(fieldType);
           writeln('$fieldDartType ${field.name};');
           writeln('if (json.containsKey($fieldNameString)) {');
           indent(() {
-            String toJson =
+            String fromJson =

[Paul Berry, 2014/09/03 21:23:55]

Oops.  Thanks for fixing this.

                 fromJsonCode(fieldType).asSnippet(jsonPath, fieldAccessor);
-            writeln('${field.name} = $toJson;');
+            writeln('${field.name} = $fromJson;');
           });
           write('}');
           if (!field.optional) {
             writeln(' else {');
             indent(() {
               writeln(
                   "throw jsonDecoder.missingKey(jsonPath, $fieldNameString);");
             });
             writeln('}');
           } else if (fieldType is TypeList) {
@@ skipping 51 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) =>
-                  'new ${dartType(type)}.fromJson(jsonDecoder, $jsonPath, $json)');
+              (String jsonPath, String json) {
+                String typeName = dartType(type);
+                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 177 matching lines @@
   CodegenProtocolVisitor visitor = new CodegenProtocolVisitor(readApi());
   return visitor.collectCode(visitor.visitApi);
 });
 
 /**
  * Translate spec_input.html into protocol_matchers.dart.
  */
 main() {
   target.generate();
 }