Unify the server and plugin versions of the generators

pkg/analysis_server/lib/protocol/protocol_generated.dart

-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2017, 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.
 //
 // This file has been automatically generated.  Please do not edit it manually.
 // To regenerate the file, use the script
 // "pkg/analysis_server/tool/spec/generate_files".
 
-part of analysis_server.plugin.protocol.protocol;
+import 'dart:convert' hide JsonDecoder;
+
+import 'package:analyzer/src/generated/utilities_general.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/src/protocol/protocol_internal.dart';
 
 /**
- * server.getVersion params
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ServerGetVersionParams {
-  Request toRequest(String id) {
-    return new Request(id, "server.getVersion", null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is ServerGetVersionParams) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 55877452;
-  }
-}
-
-/**
- * server.getVersion result
+ * AddContentOverlay
  *
  * {
- *   "version": String
+ *   "type": "add"
+ *   "content": String
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ServerGetVersionResult implements HasToJson {
-  String _version;
+class AddContentOverlay implements HasToJson {
+  String _content;
 
   /**
-   * The version number of the analysis server.
+   * The new content of the file.
    */
-  String get version => _version;
+  String get content => _content;
 
   /**
-   * The version number of the analysis server.
+   * The new content of the file.
    */
-  void set version(String value) {
+  void set content(String value) {
     assert(value != null);
-    this._version = value;
+    this._content = value;
   }
 
-  ServerGetVersionResult(String version) {
-    this.version = version;
+  AddContentOverlay(String content) {
+    this.content = content;
   }
 
-  factory ServerGetVersionResult.fromJson(
+  factory AddContentOverlay.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String version;
-      if (json.containsKey("version")) {
-        version =
-            jsonDecoder.decodeString(jsonPath + ".version", json["version"]);
+      if (json["type"] != "add") {
+        throw jsonDecoder.mismatch(jsonPath, "equal " + "add", json);
+      }
+      String content;
+      if (json.containsKey("content")) {
+        content =
+            jsonDecoder.decodeString(jsonPath + ".content", json["content"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "version");
+        throw jsonDecoder.mismatch(jsonPath, "content");
       }
-      return new ServerGetVersionResult(version);
+      return new AddContentOverlay(content);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "server.getVersion result", json);
+      throw jsonDecoder.mismatch(jsonPath, "AddContentOverlay", json);
     }
   }
 
-  factory ServerGetVersionResult.fromResponse(Response response) {
-    return new ServerGetVersionResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
-  }
-
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["version"] = version;
+    result["type"] = "add";
+    result["content"] = content;
     return result;
   }
 
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
-  }
-
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ServerGetVersionResult) {
-      return version == other.version;
+    if (other is AddContentOverlay) {
+      return content == other.content;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, version.hashCode);
+    hash = JenkinsSmiHash.combine(hash, 704418402);
+    hash = JenkinsSmiHash.combine(hash, content.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * server.shutdown params
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ServerShutdownParams {
-  Request toRequest(String id) {
-    return new Request(id, "server.shutdown", null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is ServerShutdownParams) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 366630911;
-  }
-}
-
-/**
- * server.shutdown result
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ServerShutdownResult {
-  Response toResponse(String id) {
-    return new Response(id, result: null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is ServerShutdownResult) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 193626532;
-  }
-}
-
-/**
- * server.setSubscriptions params
+ * analysis.analyzedFiles params
  *
  * {
- *   "subscriptions": List<ServerService>
+ *   "directories": List<FilePath>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ServerSetSubscriptionsParams implements HasToJson {
-  List<ServerService> _subscriptions;
+class AnalysisAnalyzedFilesParams implements HasToJson {
+  List<String> _directories;
 
   /**
-   * A list of the services being subscribed to.
+   * A list of the paths of the files that are being analyzed.
    */
-  List<ServerService> get subscriptions => _subscriptions;
+  List<String> get directories => _directories;
 
   /**
-   * A list of the services being subscribed to.
+   * A list of the paths of the files that are being analyzed.
    */
-  void set subscriptions(List<ServerService> value) {
+  void set directories(List<String> value) {
     assert(value != null);
-    this._subscriptions = value;
+    this._directories = value;
   }
 
-  ServerSetSubscriptionsParams(List<ServerService> subscriptions) {
-    this.subscriptions = subscriptions;
+  AnalysisAnalyzedFilesParams(List<String> directories) {
+    this.directories = directories;
   }
 
-  factory ServerSetSubscriptionsParams.fromJson(
+  factory AnalysisAnalyzedFilesParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<ServerService> subscriptions;
-      if (json.containsKey("subscriptions")) {
-        subscriptions = jsonDecoder.decodeList(
-            jsonPath + ".subscriptions",
-            json["subscriptions"],
-            (String jsonPath, Object json) =>
-                new ServerService.fromJson(jsonDecoder, jsonPath, json));
+      List<String> directories;
+      if (json.containsKey("directories")) {
+        directories = jsonDecoder.decodeList(jsonPath + ".directories",
+            json["directories"], jsonDecoder.decodeString);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "subscriptions");
+        throw jsonDecoder.mismatch(jsonPath, "directories");
       }
-      return new ServerSetSubscriptionsParams(subscriptions);
+      return new AnalysisAnalyzedFilesParams(directories);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "server.setSubscriptions params", json);
+          jsonPath, "analysis.analyzedFiles params", json);
     }
   }
 
-  factory ServerSetSubscriptionsParams.fromRequest(Request request) {
-    return new ServerSetSubscriptionsParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory AnalysisAnalyzedFilesParams.fromNotification(
+      Notification notification) {
+    return new AnalysisAnalyzedFilesParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["subscriptions"] =
-        subscriptions.map((ServerService value) => value.toJson()).toList();
+    result["directories"] = directories;
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "server.setSubscriptions", toJson());
+  Notification toNotification() {
+    return new Notification("analysis.analyzedFiles", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ServerSetSubscriptionsParams) {
-      return listEqual(subscriptions, other.subscriptions,
-          (ServerService a, ServerService b) => a == b);
+    if (other is AnalysisAnalyzedFilesParams) {
+      return listEqual(
+          directories, other.directories, (String a, String b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode);
+    hash = JenkinsSmiHash.combine(hash, directories.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * server.setSubscriptions result
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ServerSetSubscriptionsResult {
-  Response toResponse(String id) {
-    return new Response(id, result: null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is ServerSetSubscriptionsResult) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 748820900;
-  }
-}
-
-/**
- * server.connected params
+ * AnalysisError
  *
  * {
- *   "version": String
- *   "pid": int
- *   "sessionId": optional String
+ *   "severity": AnalysisErrorSeverity
+ *   "type": AnalysisErrorType
+ *   "location": Location
+ *   "message": String
+ *   "correction": optional String
+ *   "code": String
+ *   "hasFix": optional bool
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ServerConnectedParams implements HasToJson {
-  String _version;
-
-  int _pid;
-
-  String _sessionId;
-
-  /**
-   * The version number of the analysis server.
-   */
-  String get version => _version;
-
-  /**
-   * The version number of the analysis server.
-   */
-  void set version(String value) {
-    assert(value != null);
-    this._version = value;
-  }
-
-  /**
-   * The process id of the analysis server process.
-   */
-  int get pid => _pid;
-
-  /**
-   * The process id of the analysis server process.
-   */
-  void set pid(int value) {
-    assert(value != null);
-    this._pid = value;
-  }
-
-  /**
-   * The session id for this session.
-   */
-  String get sessionId => _sessionId;
-
-  /**
-   * The session id for this session.
-   */
-  void set sessionId(String value) {
-    this._sessionId = value;
-  }
-
-  ServerConnectedParams(String version, int pid, {String sessionId}) {
-    this.version = version;
-    this.pid = pid;
-    this.sessionId = sessionId;
-  }
-
-  factory ServerConnectedParams.fromJson(
+class AnalysisError implements HasToJson {
+  AnalysisErrorSeverity _severity;
+
+  AnalysisErrorType _type;
+
+  Location _location;
+
+  String _message;
+
+  String _correction;
+
+  String _code;
+
+  bool _hasFix;
+
+  /**
+   * The severity of the error.
+   */
+  AnalysisErrorSeverity get severity => _severity;
+
+  /**
+   * The severity of the error.
+   */
+  void set severity(AnalysisErrorSeverity value) {
+    assert(value != null);
+    this._severity = value;
+  }
+
+  /**
+   * The type of the error.
+   */
+  AnalysisErrorType get type => _type;
+
+  /**
+   * The type of the error.
+   */
+  void set type(AnalysisErrorType value) {
+    assert(value != null);
+    this._type = value;
+  }
+
+  /**
+   * The location associated with the error.
+   */
+  Location get location => _location;
+
+  /**
+   * The location associated with the error.
+   */
+  void set location(Location value) {
+    assert(value != null);
+    this._location = value;
+  }
+
+  /**
+   * The message to be displayed for this error. The message should indicate
+   * what is wrong with the code and why it is wrong.
+   */
+  String get message => _message;
+
+  /**
+   * The message to be displayed for this error. The message should indicate
+   * what is wrong with the code and why it is wrong.
+   */
+  void set message(String value) {
+    assert(value != null);
+    this._message = value;
+  }
+
+  /**
+   * The correction message to be displayed for this error. The correction
+   * message should indicate how the user can fix the error. The field is
+   * omitted if there is no correction message associated with the error code.
+   */
+  String get correction => _correction;
+
+  /**
+   * The correction message to be displayed for this error. The correction
+   * message should indicate how the user can fix the error. The field is
+   * omitted if there is no correction message associated with the error code.
+   */
+  void set correction(String value) {
+    this._correction = value;
+  }
+
+  /**
+   * The name, as a string, of the error code associated with this error.
+   */
+  String get code => _code;
+
+  /**
+   * The name, as a string, of the error code associated with this error.
+   */
+  void set code(String value) {
+    assert(value != null);
+    this._code = value;
+  }
+
+  /**
+   * A hint to indicate to interested clients that this error has an associated
+   * fix (or fixes). The absence of this field implies there are not known to
+   * be fixes. Note that since the operation to calculate whether fixes apply
+   * needs to be performant it is possible that complicated tests will be
+   * skipped and a false negative returned. For this reason, this attribute
+   * should be treated as a "hint". Despite the possibility of false negatives,
+   * no false positives should be returned. If a client sees this flag set they
+   * can proceed with the confidence that there are in fact associated fixes.
+   */
+  bool get hasFix => _hasFix;
+
+  /**
+   * A hint to indicate to interested clients that this error has an associated
+   * fix (or fixes). The absence of this field implies there are not known to
+   * be fixes. Note that since the operation to calculate whether fixes apply
+   * needs to be performant it is possible that complicated tests will be
+   * skipped and a false negative returned. For this reason, this attribute
+   * should be treated as a "hint". Despite the possibility of false negatives,
+   * no false positives should be returned. If a client sees this flag set they
+   * can proceed with the confidence that there are in fact associated fixes.
+   */
+  void set hasFix(bool value) {
+    this._hasFix = value;
+  }
+
+  AnalysisError(AnalysisErrorSeverity severity, AnalysisErrorType type,
+      Location location, String message, String code,
+      {String correction, bool hasFix}) {
+    this.severity = severity;
+    this.type = type;
+    this.location = location;
+    this.message = message;
+    this.correction = correction;
+    this.code = code;
+    this.hasFix = hasFix;
+  }
+
+  factory AnalysisError.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String version;
-      if (json.containsKey("version")) {
-        version =
-            jsonDecoder.decodeString(jsonPath + ".version", json["version"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "version");
-      }
-      int pid;
-      if (json.containsKey("pid")) {
-        pid = jsonDecoder.decodeInt(jsonPath + ".pid", json["pid"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "pid");
-      }
-      String sessionId;
-      if (json.containsKey("sessionId")) {
-        sessionId = jsonDecoder.decodeString(
-            jsonPath + ".sessionId", json["sessionId"]);
-      }
-      return new ServerConnectedParams(version, pid, sessionId: sessionId);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "server.connected params", json);
-    }
-  }
-
-  factory ServerConnectedParams.fromNotification(Notification notification) {
-    return new ServerConnectedParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["version"] = version;
-    result["pid"] = pid;
-    if (sessionId != null) {
-      result["sessionId"] = sessionId;
-    }
-    return result;
-  }
-
-  Notification toNotification() {
-    return new Notification("server.connected", toJson());
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is ServerConnectedParams) {
-      return version == other.version &&
-          pid == other.pid &&
-          sessionId == other.sessionId;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, version.hashCode);
-    hash = JenkinsSmiHash.combine(hash, pid.hashCode);
-    hash = JenkinsSmiHash.combine(hash, sessionId.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * server.error params
- *
- * {
- *   "isFatal": bool
- *   "message": String
- *   "stackTrace": String
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ServerErrorParams implements HasToJson {
-  bool _isFatal;
-
-  String _message;
-
-  String _stackTrace;
-
-  /**
-   * True if the error is a fatal error, meaning that the server will shutdown
-   * automatically after sending this notification.
-   */
-  bool get isFatal => _isFatal;
-
-  /**
-   * True if the error is a fatal error, meaning that the server will shutdown
-   * automatically after sending this notification.
-   */
-  void set isFatal(bool value) {
-    assert(value != null);
-    this._isFatal = value;
-  }
-
-  /**
-   * The error message indicating what kind of error was encountered.
-   */
-  String get message => _message;
-
-  /**
-   * The error message indicating what kind of error was encountered.
-   */
-  void set message(String value) {
-    assert(value != null);
-    this._message = value;
-  }
-
-  /**
-   * The stack trace associated with the generation of the error, used for
-   * debugging the server.
-   */
-  String get stackTrace => _stackTrace;
-
-  /**
-   * The stack trace associated with the generation of the error, used for
-   * debugging the server.
-   */
-  void set stackTrace(String value) {
-    assert(value != null);
-    this._stackTrace = value;
-  }
-
-  ServerErrorParams(bool isFatal, String message, String stackTrace) {
-    this.isFatal = isFatal;
-    this.message = message;
-    this.stackTrace = stackTrace;
-  }
-
-  factory ServerErrorParams.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      bool isFatal;
-      if (json.containsKey("isFatal")) {
-        isFatal =
-            jsonDecoder.decodeBool(jsonPath + ".isFatal", json["isFatal"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "isFatal");
+      AnalysisErrorSeverity severity;
+      if (json.containsKey("severity")) {
+        severity = new AnalysisErrorSeverity.fromJson(
+            jsonDecoder, jsonPath + ".severity", json["severity"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "severity");
+      }
+      AnalysisErrorType type;
+      if (json.containsKey("type")) {
+        type = new AnalysisErrorType.fromJson(
+            jsonDecoder, jsonPath + ".type", json["type"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "type");
+      }
+      Location location;
+      if (json.containsKey("location")) {
+        location = new Location.fromJson(
+            jsonDecoder, jsonPath + ".location", json["location"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "location");
       }
       String message;
       if (json.containsKey("message")) {
         message =
             jsonDecoder.decodeString(jsonPath + ".message", json["message"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "message");
-      }
-      String stackTrace;
-      if (json.containsKey("stackTrace")) {
-        stackTrace = jsonDecoder.decodeString(
-            jsonPath + ".stackTrace", json["stackTrace"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "stackTrace");
-      }
-      return new ServerErrorParams(isFatal, message, stackTrace);
+        throw jsonDecoder.mismatch(jsonPath, "message");
+      }
+      String correction;
+      if (json.containsKey("correction")) {
+        correction = jsonDecoder.decodeString(
+            jsonPath + ".correction", json["correction"]);
+      }
+      String code;
+      if (json.containsKey("code")) {
+        code = jsonDecoder.decodeString(jsonPath + ".code", json["code"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "code");
+      }
+      bool hasFix;
+      if (json.containsKey("hasFix")) {
+        hasFix = jsonDecoder.decodeBool(jsonPath + ".hasFix", json["hasFix"]);
+      }
+      return new AnalysisError(severity, type, location, message, code,
+          correction: correction, hasFix: hasFix);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "server.error params", json);
-    }
-  }
-
-  factory ServerErrorParams.fromNotification(Notification notification) {
-    return new ServerErrorParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "AnalysisError", json);
+    }
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["isFatal"] = isFatal;
+    result["severity"] = severity.toJson();
+    result["type"] = type.toJson();
+    result["location"] = location.toJson();
     result["message"] = message;
-    result["stackTrace"] = stackTrace;
+    if (correction != null) {
+      result["correction"] = correction;
+    }
+    result["code"] = code;
+    if (hasFix != null) {
+      result["hasFix"] = hasFix;
+    }
     return result;
   }
 
-  Notification toNotification() {
-    return new Notification("server.error", toJson());
-  }
-
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ServerErrorParams) {
-      return isFatal == other.isFatal &&
+    if (other is AnalysisError) {
+      return severity == other.severity &&
+          type == other.type &&
+          location == other.location &&
           message == other.message &&
-          stackTrace == other.stackTrace;
+          correction == other.correction &&
+          code == other.code &&
+          hasFix == other.hasFix;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, isFatal.hashCode);
+    hash = JenkinsSmiHash.combine(hash, severity.hashCode);
+    hash = JenkinsSmiHash.combine(hash, type.hashCode);
+    hash = JenkinsSmiHash.combine(hash, location.hashCode);
     hash = JenkinsSmiHash.combine(hash, message.hashCode);
-    hash = JenkinsSmiHash.combine(hash, stackTrace.hashCode);
+    hash = JenkinsSmiHash.combine(hash, correction.hashCode);
+    hash = JenkinsSmiHash.combine(hash, code.hashCode);
+    hash = JenkinsSmiHash.combine(hash, hasFix.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * server.status params
+ * AnalysisErrorFixes
  *
  * {
- *   "analysis": optional AnalysisStatus
- *   "pub": optional PubStatus
+ *   "error": AnalysisError
+ *   "fixes": List<SourceChange>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ServerStatusParams implements HasToJson {
-  AnalysisStatus _analysis;
+class AnalysisErrorFixes implements HasToJson {
+  AnalysisError _error;
 
-  PubStatus _pub;
+  List<SourceChange> _fixes;
 
   /**
-   * The current status of analysis, including whether analysis is being
-   * performed and if so what is being analyzed.
+   * The error with which the fixes are associated.
    */
-  AnalysisStatus get analysis => _analysis;
+  AnalysisError get error => _error;
 
   /**
-   * The current status of analysis, including whether analysis is being
-   * performed and if so what is being analyzed.
+   * The error with which the fixes are associated.
    */
-  void set analysis(AnalysisStatus value) {
-    this._analysis = value;
+  void set error(AnalysisError value) {
+    assert(value != null);
+    this._error = value;
   }
 
   /**
-   * The current status of pub execution, indicating whether we are currently
-   * running pub.
+   * The fixes associated with the error.
    */
-  PubStatus get pub => _pub;
+  List<SourceChange> get fixes => _fixes;
 
   /**
-   * The current status of pub execution, indicating whether we are currently
-   * running pub.
+   * The fixes associated with the error.
    */
-  void set pub(PubStatus value) {
-    this._pub = value;
+  void set fixes(List<SourceChange> value) {
+    assert(value != null);
+    this._fixes = value;
   }
 
-  ServerStatusParams({AnalysisStatus analysis, PubStatus pub}) {
-    this.analysis = analysis;
-    this.pub = pub;
+  AnalysisErrorFixes(AnalysisError error, {List<SourceChange> fixes}) {
+    this.error = error;
+    if (fixes == null) {
+      this.fixes = <SourceChange>[];
+    } else {
+      this.fixes = fixes;
+    }
   }
 
-  factory ServerStatusParams.fromJson(
+  factory AnalysisErrorFixes.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      AnalysisStatus analysis;
-      if (json.containsKey("analysis")) {
-        analysis = new AnalysisStatus.fromJson(
-            jsonDecoder, jsonPath + ".analysis", json["analysis"]);
+      AnalysisError error;
+      if (json.containsKey("error")) {
+        error = new AnalysisError.fromJson(
+            jsonDecoder, jsonPath + ".error", json["error"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "error");
       }
-      PubStatus pub;
-      if (json.containsKey("pub")) {
-        pub =
-            new PubStatus.fromJson(jsonDecoder, jsonPath + ".pub", json["pub"]);
+      List<SourceChange> fixes;
+      if (json.containsKey("fixes")) {
+        fixes = jsonDecoder.decodeList(
+            jsonPath + ".fixes",
+            json["fixes"],
+            (String jsonPath, Object json) =>
+                new SourceChange.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "fixes");
       }
-      return new ServerStatusParams(analysis: analysis, pub: pub);
+      return new AnalysisErrorFixes(error, fixes: fixes);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "server.status params", json);
+      throw jsonDecoder.mismatch(jsonPath, "AnalysisErrorFixes", json);
     }
   }
 
-  factory ServerStatusParams.fromNotification(Notification notification) {
-    return new ServerStatusParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
-  }
-
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    if (analysis != null) {
-      result["analysis"] = analysis.toJson();
-    }
-    if (pub != null) {
-      result["pub"] = pub.toJson();
-    }
+    result["error"] = error.toJson();
+    result["fixes"] =
+        fixes.map((SourceChange value) => value.toJson()).toList();
     return result;
   }
 
-  Notification toNotification() {
-    return new Notification("server.status", toJson());
-  }
-
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ServerStatusParams) {
-      return analysis == other.analysis && pub == other.pub;
+    if (other is AnalysisErrorFixes) {
+      return error == other.error &&
+          listEqual(
+              fixes, other.fixes, (SourceChange a, SourceChange b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, analysis.hashCode);
-    hash = JenkinsSmiHash.combine(hash, pub.hashCode);
+    hash = JenkinsSmiHash.combine(hash, error.hashCode);
+    hash = JenkinsSmiHash.combine(hash, fixes.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.getErrors params
+ * AnalysisErrorSeverity
  *
- * {
- *   "file": FilePath
+ * enum {
+ *   INFO
+ *   WARNING
+ *   ERROR
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisGetErrorsParams implements HasToJson {
-  String _file;
+class AnalysisErrorSeverity implements Enum {
+  static const AnalysisErrorSeverity INFO =
+      const AnalysisErrorSeverity._("INFO");
+
+  static const AnalysisErrorSeverity WARNING =
+      const AnalysisErrorSeverity._("WARNING");
+
+  static const AnalysisErrorSeverity ERROR =
+      const AnalysisErrorSeverity._("ERROR");
 
   /**
-   * The file for which errors are being requested.
+   * A list containing all of the enum values that are defined.
    */
-  String get file => _file;
+  static const List<AnalysisErrorSeverity> VALUES =
+      const <AnalysisErrorSeverity>[INFO, WARNING, ERROR];
 
-  /**
-   * The file for which errors are being requested.
-   */
-  void set file(String value) {
-    assert(value != null);
-    this._file = value;
+  @override
+  final String name;
+
+  const AnalysisErrorSeverity._(this.name);
+
+  factory AnalysisErrorSeverity(String name) {
+    switch (name) {
+      case "INFO":
+        return INFO;
+      case "WARNING":
+        return WARNING;
+      case "ERROR":
+        return ERROR;
+    }
+    throw new Exception('Illegal enum value: $name');
   }
 
-  AnalysisGetErrorsParams(String file) {
-    this.file = file;
-  }
-
-  factory AnalysisGetErrorsParams.fromJson(
+  factory AnalysisErrorSeverity.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
+    if (json is String) {
+      try {
+        return new AnalysisErrorSeverity(json);
+      } catch (_) {
+        // Fall through
+      }
     }
-    if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
-      }
-      return new AnalysisGetErrorsParams(file);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.getErrors params", json);
-    }
-  }
-
-  factory AnalysisGetErrorsParams.fromRequest(Request request) {
-    return new AnalysisGetErrorsParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["file"] = file;
-    return result;
-  }
-
-  Request toRequest(String id) {
-    return new Request(id, "analysis.getErrors", toJson());
+    throw jsonDecoder.mismatch(jsonPath, "AnalysisErrorSeverity", json);
   }
 
   @override
-  String toString() => JSON.encode(toJson());
+  String toString() => "AnalysisErrorSeverity.$name";
+
+  String toJson() => name;
+}
+
+/**
+ * AnalysisErrorType
+ *
+ * enum {
+ *   CHECKED_MODE_COMPILE_TIME_ERROR
+ *   COMPILE_TIME_ERROR
+ *   HINT
+ *   LINT
+ *   STATIC_TYPE_WARNING
+ *   STATIC_WARNING
+ *   SYNTACTIC_ERROR
+ *   TODO
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class AnalysisErrorType implements Enum {
+  static const AnalysisErrorType CHECKED_MODE_COMPILE_TIME_ERROR =
+      const AnalysisErrorType._("CHECKED_MODE_COMPILE_TIME_ERROR");
+
+  static const AnalysisErrorType COMPILE_TIME_ERROR =
+      const AnalysisErrorType._("COMPILE_TIME_ERROR");
+
+  static const AnalysisErrorType HINT = const AnalysisErrorType._("HINT");
+
+  static const AnalysisErrorType LINT = const AnalysisErrorType._("LINT");
+
+  static const AnalysisErrorType STATIC_TYPE_WARNING =
+      const AnalysisErrorType._("STATIC_TYPE_WARNING");
+
+  static const AnalysisErrorType STATIC_WARNING =
+      const AnalysisErrorType._("STATIC_WARNING");
+
+  static const AnalysisErrorType SYNTACTIC_ERROR =
+      const AnalysisErrorType._("SYNTACTIC_ERROR");
+
+  static const AnalysisErrorType TODO = const AnalysisErrorType._("TODO");
+
+  /**
+   * A list containing all of the enum values that are defined.
+   */
+  static const List<AnalysisErrorType> VALUES = const <AnalysisErrorType>[
+    CHECKED_MODE_COMPILE_TIME_ERROR,
+    COMPILE_TIME_ERROR,
+    HINT,
+    LINT,
+    STATIC_TYPE_WARNING,
+    STATIC_WARNING,
+    SYNTACTIC_ERROR,
+    TODO
+  ];
 
   @override
-  bool operator ==(other) {
-    if (other is AnalysisGetErrorsParams) {
-      return file == other.file;
+  final String name;
+
+  const AnalysisErrorType._(this.name);
+
+  factory AnalysisErrorType(String name) {
+    switch (name) {
+      case "CHECKED_MODE_COMPILE_TIME_ERROR":
+        return CHECKED_MODE_COMPILE_TIME_ERROR;
+      case "COMPILE_TIME_ERROR":
+        return COMPILE_TIME_ERROR;
+      case "HINT":
+        return HINT;
+      case "LINT":
+        return LINT;
+      case "STATIC_TYPE_WARNING":
+        return STATIC_TYPE_WARNING;
+      case "STATIC_WARNING":
+        return STATIC_WARNING;
+      case "SYNTACTIC_ERROR":
+        return SYNTACTIC_ERROR;
+      case "TODO":
+        return TODO;
     }
-    return false;
+    throw new Exception('Illegal enum value: $name');
+  }
+
+  factory AnalysisErrorType.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json is String) {
+      try {
+        return new AnalysisErrorType(json);
+      } catch (_) {
+        // Fall through
+      }
+    }
+    throw jsonDecoder.mismatch(jsonPath, "AnalysisErrorType", json);
   }
 
   @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
+  String toString() => "AnalysisErrorType.$name";
+
+  String toJson() => name;
 }
 
 /**
- * analysis.getErrors result
+ * analysis.errors params
  *
  * {
+ *   "file": FilePath
  *   "errors": List<AnalysisError>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisGetErrorsResult implements HasToJson {
+class AnalysisErrorsParams implements HasToJson {
+  String _file;
+
   List<AnalysisError> _errors;
 
   /**
-   * The errors associated with the file.
-   */
-  List<AnalysisError> get errors => _errors;
-
-  /**
-   * The errors associated with the file.
-   */
-  void set errors(List<AnalysisError> value) {
-    assert(value != null);
-    this._errors = value;
-  }
-
-  AnalysisGetErrorsResult(List<AnalysisError> errors) {
-    this.errors = errors;
-  }
-
-  factory AnalysisGetErrorsResult.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      List<AnalysisError> errors;
-      if (json.containsKey("errors")) {
-        errors = jsonDecoder.decodeList(
-            jsonPath + ".errors",
-            json["errors"],
-            (String jsonPath, Object json) =>
-                new AnalysisError.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "errors");
-      }
-      return new AnalysisGetErrorsResult(errors);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.getErrors result", json);
-    }
-  }
-
-  factory AnalysisGetErrorsResult.fromResponse(Response response) {
-    return new AnalysisGetErrorsResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["errors"] =
-        errors.map((AnalysisError value) => value.toJson()).toList();
-    return result;
-  }
-
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is AnalysisGetErrorsResult) {
-      return listEqual(
-          errors, other.errors, (AnalysisError a, AnalysisError b) => a == b);
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, errors.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * analysis.getHover params
- *
- * {
- *   "file": FilePath
- *   "offset": int
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisGetHoverParams implements HasToJson {
-  String _file;
-
-  int _offset;
-
-  /**
-   * The file in which hover information is being requested.
+   * The file containing the errors.
    */
   String get file => _file;
 
   /**
-   * The file in which hover information is being requested.
+   * The file containing the errors.
    */
   void set file(String value) {
     assert(value != null);
     this._file = value;
   }
 
   /**
-   * The offset for which hover information is being requested.
+   * The errors contained in the file.
    */
-  int get offset => _offset;
+  List<AnalysisError> get errors => _errors;
 
   /**
-   * The offset for which hover information is being requested.
+   * The errors contained in the file.
    */
-  void set offset(int value) {
+  void set errors(List<AnalysisError> value) {
     assert(value != null);
-    this._offset = value;
+    this._errors = value;
   }
 
-  AnalysisGetHoverParams(String file, int offset) {
+  AnalysisErrorsParams(String file, List<AnalysisError> errors) {
     this.file = file;
-    this.offset = offset;
+    this.errors = errors;
   }
 
-  factory AnalysisGetHoverParams.fromJson(
+  factory AnalysisErrorsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      List<AnalysisError> errors;
+      if (json.containsKey("errors")) {
+        errors = jsonDecoder.decodeList(
+            jsonPath + ".errors",
+            json["errors"],
+            (String jsonPath, Object json) =>
+                new AnalysisError.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
+        throw jsonDecoder.mismatch(jsonPath, "errors");
       }
-      return new AnalysisGetHoverParams(file, offset);
+      return new AnalysisErrorsParams(file, errors);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.getHover params", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.errors params", json);
     }
   }
 
-  factory AnalysisGetHoverParams.fromRequest(Request request) {
-    return new AnalysisGetHoverParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory AnalysisErrorsParams.fromNotification(Notification notification) {
+    return new AnalysisErrorsParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["file"] = file;
-    result["offset"] = offset;
+    result["errors"] =
+        errors.map((AnalysisError value) => value.toJson()).toList();
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "analysis.getHover", toJson());
+  Notification toNotification() {
+    return new Notification("analysis.errors", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisGetHoverParams) {
-      return file == other.file && offset == other.offset;
+    if (other is AnalysisErrorsParams) {
+      return file == other.file &&
+          listEqual(errors, other.errors,
+              (AnalysisError a, AnalysisError b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, errors.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.getHover result
+ * analysis.flushResults params
  *
  * {
- *   "hovers": List<HoverInformation>
+ *   "files": List<FilePath>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisGetHoverResult implements HasToJson {
-  List<HoverInformation> _hovers;
+class AnalysisFlushResultsParams implements HasToJson {
+  List<String> _files;
 
   /**
-   * The hover information associated with the location. The list will be empty
-   * if no information could be determined for the location. The list can
-   * contain multiple items if the file is being analyzed in multiple contexts
-   * in conflicting ways (such as a part that is included in multiple
-   * libraries).
+   * The files that are no longer being analyzed.
    */
-  List<HoverInformation> get hovers => _hovers;
+  List<String> get files => _files;
 
   /**
-   * The hover information associated with the location. The list will be empty
-   * if no information could be determined for the location. The list can
-   * contain multiple items if the file is being analyzed in multiple contexts
-   * in conflicting ways (such as a part that is included in multiple
-   * libraries).
+   * The files that are no longer being analyzed.
    */
-  void set hovers(List<HoverInformation> value) {
+  void set files(List<String> value) {
     assert(value != null);
-    this._hovers = value;
+    this._files = value;
   }
 
-  AnalysisGetHoverResult(List<HoverInformation> hovers) {
-    this.hovers = hovers;
+  AnalysisFlushResultsParams(List<String> files) {
+    this.files = files;
   }
 
-  factory AnalysisGetHoverResult.fromJson(
+  factory AnalysisFlushResultsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<HoverInformation> hovers;
-      if (json.containsKey("hovers")) {
-        hovers = jsonDecoder.decodeList(
-            jsonPath + ".hovers",
-            json["hovers"],
-            (String jsonPath, Object json) =>
-                new HoverInformation.fromJson(jsonDecoder, jsonPath, json));
+      List<String> files;
+      if (json.containsKey("files")) {
+        files = jsonDecoder.decodeList(
+            jsonPath + ".files", json["files"], jsonDecoder.decodeString);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "hovers");
+        throw jsonDecoder.mismatch(jsonPath, "files");
       }
-      return new AnalysisGetHoverResult(hovers);
+      return new AnalysisFlushResultsParams(files);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.getHover result", json);
+      throw jsonDecoder.mismatch(
+          jsonPath, "analysis.flushResults params", json);
     }
   }
 
-  factory AnalysisGetHoverResult.fromResponse(Response response) {
-    return new AnalysisGetHoverResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
+  factory AnalysisFlushResultsParams.fromNotification(
+      Notification notification) {
+    return new AnalysisFlushResultsParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["hovers"] =
-        hovers.map((HoverInformation value) => value.toJson()).toList();
+    result["files"] = files;
     return result;
   }
 
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
+  Notification toNotification() {
+    return new Notification("analysis.flushResults", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisGetHoverResult) {
-      return listEqual(hovers, other.hovers,
-          (HoverInformation a, HoverInformation b) => a == b);
+    if (other is AnalysisFlushResultsParams) {
+      return listEqual(files, other.files, (String a, String b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, hovers.hashCode);
+    hash = JenkinsSmiHash.combine(hash, files.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.getReachableSources params
+ * analysis.folding params
  *
  * {
  *   "file": FilePath
+ *   "regions": List<FoldingRegion>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisGetReachableSourcesParams implements HasToJson {
+class AnalysisFoldingParams implements HasToJson {
   String _file;
 
+  List<FoldingRegion> _regions;
+
   /**
-   * The file for which reachable source information is being requested.
+   * The file containing the folding regions.
    */
   String get file => _file;
 
   /**
-   * The file for which reachable source information is being requested.
+   * The file containing the folding regions.
    */
   void set file(String value) {
     assert(value != null);
     this._file = value;
   }
 
-  AnalysisGetReachableSourcesParams(String file) {
-    this.file = file;
+  /**
+   * The folding regions contained in the file.
+   */
+  List<FoldingRegion> get regions => _regions;
+
+  /**
+   * The folding regions contained in the file.
+   */
+  void set regions(List<FoldingRegion> value) {
+    assert(value != null);
+    this._regions = value;
   }
 
-  factory AnalysisGetReachableSourcesParams.fromJson(
+  AnalysisFoldingParams(String file, List<FoldingRegion> regions) {
+    this.file = file;
+    this.regions = regions;
+  }
+
+  factory AnalysisFoldingParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      return new AnalysisGetReachableSourcesParams(file);
+      List<FoldingRegion> regions;
+      if (json.containsKey("regions")) {
+        regions = jsonDecoder.decodeList(
+            jsonPath + ".regions",
+            json["regions"],
+            (String jsonPath, Object json) =>
+                new FoldingRegion.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "regions");
+      }
+      return new AnalysisFoldingParams(file, regions);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "analysis.getReachableSources params", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.folding params", json);
     }
   }
 
-  factory AnalysisGetReachableSourcesParams.fromRequest(Request request) {
-    return new AnalysisGetReachableSourcesParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory AnalysisFoldingParams.fromNotification(Notification notification) {
+    return new AnalysisFoldingParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["file"] = file;
+    result["regions"] =
+        regions.map((FoldingRegion value) => value.toJson()).toList();
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "analysis.getReachableSources", toJson());
+  Notification toNotification() {
+    return new Notification("analysis.folding", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisGetReachableSourcesParams) {
-      return file == other.file;
+    if (other is AnalysisFoldingParams) {
+      return file == other.file &&
+          listEqual(regions, other.regions,
+              (FoldingRegion a, FoldingRegion b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, regions.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.getReachableSources result
+ * analysis.getErrors params
  *
  * {
- *   "sources": Map<String, List<String>>
+ *   "file": FilePath
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisGetReachableSourcesResult implements HasToJson {
-  Map<String, List<String>> _sources;
+class AnalysisGetErrorsParams implements RequestParams {
+  String _file;
 
   /**
-   * A mapping from source URIs to directly reachable source URIs. For example,
-   * a file "foo.dart" that imports "bar.dart" would have the corresponding
-   * mapping { "file:///foo.dart" : ["file:///bar.dart"] }. If "bar.dart" has
-   * further imports (or exports) there will be a mapping from the URI
-   * "file:///bar.dart" to them. To check if a specific URI is reachable from a
-   * given file, clients can check for its presence in the resulting key set.
+   * The file for which errors are being requested.
    */
-  Map<String, List<String>> get sources => _sources;
+  String get file => _file;
 
   /**
-   * A mapping from source URIs to directly reachable source URIs. For example,
-   * a file "foo.dart" that imports "bar.dart" would have the corresponding
-   * mapping { "file:///foo.dart" : ["file:///bar.dart"] }. If "bar.dart" has
-   * further imports (or exports) there will be a mapping from the URI
-   * "file:///bar.dart" to them. To check if a specific URI is reachable from a
-   * given file, clients can check for its presence in the resulting key set.
+   * The file for which errors are being requested.
    */
-  void set sources(Map<String, List<String>> value) {
+  void set file(String value) {
     assert(value != null);
-    this._sources = value;
+    this._file = value;
   }
 
-  AnalysisGetReachableSourcesResult(Map<String, List<String>> sources) {
-    this.sources = sources;
+  AnalysisGetErrorsParams(String file) {
+    this.file = file;
   }
 
-  factory AnalysisGetReachableSourcesResult.fromJson(
+  factory AnalysisGetErrorsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      Map<String, List<String>> sources;
-      if (json.containsKey("sources")) {
-        sources = jsonDecoder.decodeMap(jsonPath + ".sources", json["sources"],
-            valueDecoder: (String jsonPath, Object json) => jsonDecoder
-                .decodeList(jsonPath, json, jsonDecoder.decodeString));
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "sources");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      return new AnalysisGetReachableSourcesResult(sources);
+      return new AnalysisGetErrorsParams(file);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "analysis.getReachableSources result", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.getErrors params", json);
     }
   }
 
-  factory AnalysisGetReachableSourcesResult.fromResponse(Response response) {
-    return new AnalysisGetReachableSourcesResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
+  factory AnalysisGetErrorsParams.fromRequest(Request request) {
+    return new AnalysisGetErrorsParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["sources"] = sources;
+    result["file"] = file;
     return result;
   }
 
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "analysis.getErrors", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisGetReachableSourcesResult) {
-      return mapEqual(
-          sources,
-          other.sources,
-          (List<String> a, List<String> b) =>
-              listEqual(a, b, (String a, String b) => a == b));
+    if (other is AnalysisGetErrorsParams) {
+      return file == other.file;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, sources.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.getLibraryDependencies params
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisGetLibraryDependenciesParams {
-  Request toRequest(String id) {
-    return new Request(id, "analysis.getLibraryDependencies", null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is AnalysisGetLibraryDependenciesParams) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 246577680;
-  }
-}
-
-/**
- * analysis.getLibraryDependencies result
+ * analysis.getErrors result
  *
  * {
- *   "libraries": List<FilePath>
- *   "packageMap": Map<String, Map<String, List<FilePath>>>
+ *   "errors": List<AnalysisError>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisGetLibraryDependenciesResult implements HasToJson {
-  List<String> _libraries;
-
-  Map<String, Map<String, List<String>>> _packageMap;
+class AnalysisGetErrorsResult implements ResponseResult {
+  List<AnalysisError> _errors;
 
   /**
-   * A list of the paths of library elements referenced by files in existing
-   * analysis roots.
+   * The errors associated with the file.
    */
-  List<String> get libraries => _libraries;
+  List<AnalysisError> get errors => _errors;
 
   /**
-   * A list of the paths of library elements referenced by files in existing
-   * analysis roots.
+   * The errors associated with the file.
    */
-  void set libraries(List<String> value) {
+  void set errors(List<AnalysisError> value) {
     assert(value != null);
-    this._libraries = value;
+    this._errors = value;
   }
 
-  /**
-   * A mapping from context source roots to package maps which map package
-   * names to source directories for use in client-side package URI resolution.
-   */
-  Map<String, Map<String, List<String>>> get packageMap => _packageMap;
-
-  /**
-   * A mapping from context source roots to package maps which map package
-   * names to source directories for use in client-side package URI resolution.
-   */
-  void set packageMap(Map<String, Map<String, List<String>>> value) {
-    assert(value != null);
-    this._packageMap = value;
+  AnalysisGetErrorsResult(List<AnalysisError> errors) {
+    this.errors = errors;
   }
 
-  AnalysisGetLibraryDependenciesResult(List<String> libraries,
-      Map<String, Map<String, List<String>>> packageMap) {
-    this.libraries = libraries;
-    this.packageMap = packageMap;
-  }
-
-  factory AnalysisGetLibraryDependenciesResult.fromJson(
+  factory AnalysisGetErrorsResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<String> libraries;
-      if (json.containsKey("libraries")) {
-        libraries = jsonDecoder.decodeList(jsonPath + ".libraries",
-            json["libraries"], jsonDecoder.decodeString);
+      List<AnalysisError> errors;
+      if (json.containsKey("errors")) {
+        errors = jsonDecoder.decodeList(
+            jsonPath + ".errors",
+            json["errors"],
+            (String jsonPath, Object json) =>
+                new AnalysisError.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "libraries");
+        throw jsonDecoder.mismatch(jsonPath, "errors");
       }
-      Map<String, Map<String, List<String>>> packageMap;
-      if (json.containsKey("packageMap")) {
-        packageMap = jsonDecoder.decodeMap(
-            jsonPath + ".packageMap", json["packageMap"],
-            valueDecoder: (String jsonPath, Object json) =>
-                jsonDecoder.decodeMap(jsonPath, json,
-                    valueDecoder: (String jsonPath, Object json) => jsonDecoder
-                        .decodeList(jsonPath, json, jsonDecoder.decodeString)));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "packageMap");
-      }
-      return new AnalysisGetLibraryDependenciesResult(libraries, packageMap);
+      return new AnalysisGetErrorsResult(errors);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "analysis.getLibraryDependencies result", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.getErrors result", json);
     }
   }
 
-  factory AnalysisGetLibraryDependenciesResult.fromResponse(Response response) {
-    return new AnalysisGetLibraryDependenciesResult.fromJson(
+  factory AnalysisGetErrorsResult.fromResponse(Response response) {
+    return new AnalysisGetErrorsResult.fromJson(
         new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
         "result",
-        response._result);
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["libraries"] = libraries;
-    result["packageMap"] = packageMap;
+    result["errors"] =
+        errors.map((AnalysisError value) => value.toJson()).toList();
     return result;
   }
 
+  @override
   Response toResponse(String id) {
     return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisGetLibraryDependenciesResult) {
+    if (other is AnalysisGetErrorsResult) {
       return listEqual(
-              libraries, other.libraries, (String a, String b) => a == b) &&
-          mapEqual(
-              packageMap,
-              other.packageMap,
-              (Map<String, List<String>> a, Map<String, List<String>> b) =>
-                  mapEqual(
-                      a,
-                      b,
-                      (List<String> a, List<String> b) =>
-                          listEqual(a, b, (String a, String b) => a == b)));
+          errors, other.errors, (AnalysisError a, AnalysisError b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, libraries.hashCode);
-    hash = JenkinsSmiHash.combine(hash, packageMap.hashCode);
+    hash = JenkinsSmiHash.combine(hash, errors.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.getNavigation params
+ * analysis.getHover params
  *
  * {
  *   "file": FilePath
  *   "offset": int
- *   "length": int
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisGetNavigationParams implements HasToJson {
+class AnalysisGetHoverParams implements RequestParams {
   String _file;
 
   int _offset;
 
-  int _length;
-
   /**
-   * The file in which navigation information is being requested.
+   * The file in which hover information is being requested.
    */
   String get file => _file;
 
   /**
-   * The file in which navigation information is being requested.
+   * The file in which hover information is being requested.
    */
   void set file(String value) {
     assert(value != null);
     this._file = value;
   }
 
   /**
-   * The offset of the region for which navigation information is being
-   * requested.
+   * The offset for which hover information is being requested.
    */
   int get offset => _offset;
 
   /**
-   * The offset of the region for which navigation information is being
-   * requested.
+   * The offset for which hover information is being requested.
    */
   void set offset(int value) {
     assert(value != null);
     this._offset = value;
   }
 
-  /**
-   * The length of the region for which navigation information is being
-   * requested.
-   */
-  int get length => _length;
-
-  /**
-   * The length of the region for which navigation information is being
-   * requested.
-   */
-  void set length(int value) {
-    assert(value != null);
-    this._length = value;
+  AnalysisGetHoverParams(String file, int offset) {
+    this.file = file;
+    this.offset = offset;
   }
 
-  AnalysisGetNavigationParams(String file, int offset, int length) {
-    this.file = file;
-    this.offset = offset;
-    this.length = length;
-  }
-
-  factory AnalysisGetNavigationParams.fromJson(
+  factory AnalysisGetHoverParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
       int offset;
       if (json.containsKey("offset")) {
         offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
+        throw jsonDecoder.mismatch(jsonPath, "offset");
       }
-      int length;
-      if (json.containsKey("length")) {
-        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
-      }
-      return new AnalysisGetNavigationParams(file, offset, length);
+      return new AnalysisGetHoverParams(file, offset);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "analysis.getNavigation params", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.getHover params", json);
     }
   }
 
-  factory AnalysisGetNavigationParams.fromRequest(Request request) {
-    return new AnalysisGetNavigationParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory AnalysisGetHoverParams.fromRequest(Request request) {
+    return new AnalysisGetHoverParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["file"] = file;
     result["offset"] = offset;
-    result["length"] = length;
     return result;
   }
 
+  @override
   Request toRequest(String id) {
-    return new Request(id, "analysis.getNavigation", toJson());
+    return new Request(id, "analysis.getHover", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisGetNavigationParams) {
-      return file == other.file &&
-          offset == other.offset &&
-          length == other.length;
+    if (other is AnalysisGetHoverParams) {
+      return file == other.file && offset == other.offset;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, file.hashCode);
     hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, length.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.getNavigation result
+ * analysis.getHover result
  *
  * {
- *   "files": List<FilePath>
- *   "targets": List<NavigationTarget>
- *   "regions": List<NavigationRegion>
+ *   "hovers": List<HoverInformation>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisGetNavigationResult implements HasToJson {
-  List<String> _files;
-
-  List<NavigationTarget> _targets;
-
-  List<NavigationRegion> _regions;
+class AnalysisGetHoverResult implements ResponseResult {
+  List<HoverInformation> _hovers;
 
   /**
-   * A list of the paths of files that are referenced by the navigation
-   * targets.
+   * The hover information associated with the location. The list will be empty
+   * if no information could be determined for the location. The list can
+   * contain multiple items if the file is being analyzed in multiple contexts
+   * in conflicting ways (such as a part that is included in multiple
+   * libraries).
    */
-  List<String> get files => _files;
+  List<HoverInformation> get hovers => _hovers;
 
   /**
-   * A list of the paths of files that are referenced by the navigation
-   * targets.
+   * The hover information associated with the location. The list will be empty
+   * if no information could be determined for the location. The list can
+   * contain multiple items if the file is being analyzed in multiple contexts
+   * in conflicting ways (such as a part that is included in multiple
+   * libraries).
    */
-  void set files(List<String> value) {
+  void set hovers(List<HoverInformation> value) {
     assert(value != null);
-    this._files = value;
+    this._hovers = value;
   }
 
-  /**
-   * A list of the navigation targets that are referenced by the navigation
-   * regions.
-   */
-  List<NavigationTarget> get targets => _targets;
-
-  /**
-   * A list of the navigation targets that are referenced by the navigation
-   * regions.
-   */
-  void set targets(List<NavigationTarget> value) {
-    assert(value != null);
-    this._targets = value;
+  AnalysisGetHoverResult(List<HoverInformation> hovers) {
+    this.hovers = hovers;
   }
 
-  /**
-   * A list of the navigation regions within the requested region of the file.
-   */
-  List<NavigationRegion> get regions => _regions;
-
-  /**
-   * A list of the navigation regions within the requested region of the file.
-   */
-  void set regions(List<NavigationRegion> value) {
-    assert(value != null);
-    this._regions = value;
-  }
-
-  AnalysisGetNavigationResult(List<String> files,
-      List<NavigationTarget> targets, List<NavigationRegion> regions) {
-    this.files = files;
-    this.targets = targets;
-    this.regions = regions;
-  }
-
-  factory AnalysisGetNavigationResult.fromJson(
+  factory AnalysisGetHoverResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<String> files;
-      if (json.containsKey("files")) {
-        files = jsonDecoder.decodeList(
-            jsonPath + ".files", json["files"], jsonDecoder.decodeString);
+      List<HoverInformation> hovers;
+      if (json.containsKey("hovers")) {
+        hovers = jsonDecoder.decodeList(
+            jsonPath + ".hovers",
+            json["hovers"],
+            (String jsonPath, Object json) =>
+                new HoverInformation.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "files");
+        throw jsonDecoder.mismatch(jsonPath, "hovers");
       }
-      List<NavigationTarget> targets;
-      if (json.containsKey("targets")) {
-        targets = jsonDecoder.decodeList(
-            jsonPath + ".targets",
-            json["targets"],
-            (String jsonPath, Object json) =>
-                new NavigationTarget.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "targets");
-      }
-      List<NavigationRegion> regions;
-      if (json.containsKey("regions")) {
-        regions = jsonDecoder.decodeList(
-            jsonPath + ".regions",
-            json["regions"],
-            (String jsonPath, Object json) =>
-                new NavigationRegion.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "regions");
-      }
-      return new AnalysisGetNavigationResult(files, targets, regions);
+      return new AnalysisGetHoverResult(hovers);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "analysis.getNavigation result", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.getHover result", json);
     }
   }
 
-  factory AnalysisGetNavigationResult.fromResponse(Response response) {
-    return new AnalysisGetNavigationResult.fromJson(
+  factory AnalysisGetHoverResult.fromResponse(Response response) {
+    return new AnalysisGetHoverResult.fromJson(
         new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
         "result",
-        response._result);
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["files"] = files;
-    result["targets"] =
-        targets.map((NavigationTarget value) => value.toJson()).toList();
-    result["regions"] =
-        regions.map((NavigationRegion value) => value.toJson()).toList();
+    result["hovers"] =
+        hovers.map((HoverInformation value) => value.toJson()).toList();
     return result;
   }
 
+  @override
   Response toResponse(String id) {
     return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisGetNavigationResult) {
-      return listEqual(files, other.files, (String a, String b) => a == b) &&
-          listEqual(targets, other.targets,
-              (NavigationTarget a, NavigationTarget b) => a == b) &&
-          listEqual(regions, other.regions,
-              (NavigationRegion a, NavigationRegion b) => a == b);
+    if (other is AnalysisGetHoverResult) {
+      return listEqual(hovers, other.hovers,
+          (HoverInformation a, HoverInformation b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, files.hashCode);
-    hash = JenkinsSmiHash.combine(hash, targets.hashCode);
-    hash = JenkinsSmiHash.combine(hash, regions.hashCode);
+    hash = JenkinsSmiHash.combine(hash, hovers.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.reanalyze params
- *
- * {
- *   "roots": optional List<FilePath>
- * }
+ * analysis.getLibraryDependencies params
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisReanalyzeParams implements HasToJson {
-  List<String> _roots;
-
-  /**
-   * A list of the analysis roots that are to be re-analyzed.
-   */
-  List<String> get roots => _roots;
-
-  /**
-   * A list of the analysis roots that are to be re-analyzed.
-   */
-  void set roots(List<String> value) {
-    this._roots = value;
-  }
-
-  AnalysisReanalyzeParams({List<String> roots}) {
-    this.roots = roots;
-  }
-
-  factory AnalysisReanalyzeParams.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      List<String> roots;
-      if (json.containsKey("roots")) {
-        roots = jsonDecoder.decodeList(
-            jsonPath + ".roots", json["roots"], jsonDecoder.decodeString);
-      }
-      return new AnalysisReanalyzeParams(roots: roots);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.reanalyze params", json);
-    }
-  }
-
-  factory AnalysisReanalyzeParams.fromRequest(Request request) {
-    return new AnalysisReanalyzeParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    if (roots != null) {
-      result["roots"] = roots;
-    }
-    return result;
-  }
-
-  Request toRequest(String id) {
-    return new Request(id, "analysis.reanalyze", toJson());
-  }
+class AnalysisGetLibraryDependenciesParams implements RequestParams {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
 
   @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is AnalysisReanalyzeParams) {
-      return listEqual(roots, other.roots, (String a, String b) => a == b);
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, roots.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * analysis.reanalyze result
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisReanalyzeResult {
-  Response toResponse(String id) {
-    return new Response(id, result: null);
+  Request toRequest(String id) {
+    return new Request(id, "analysis.getLibraryDependencies", null);
   }
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisReanalyzeResult) {
+    if (other is AnalysisGetLibraryDependenciesParams) {
       return true;
     }
     return false;
   }
 
   @override
   int get hashCode {
-    return 846803925;
+    return 246577680;
   }
 }
 
 /**
- * analysis.setAnalysisRoots params
+ * analysis.getLibraryDependencies result
  *
  * {
- *   "included": List<FilePath>
- *   "excluded": List<FilePath>
- *   "packageRoots": optional Map<FilePath, FilePath>
+ *   "libraries": List<FilePath>
+ *   "packageMap": Map<String, Map<String, List<FilePath>>>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisSetAnalysisRootsParams implements HasToJson {
-  List<String> _included;
+class AnalysisGetLibraryDependenciesResult implements ResponseResult {
+  List<String> _libraries;
 
-  List<String> _excluded;
-
-  Map<String, String> _packageRoots;
+  Map<String, Map<String, List<String>>> _packageMap;
 
   /**
-   * A list of the files and directories that should be analyzed.
+   * A list of the paths of library elements referenced by files in existing
+   * analysis roots.
    */
-  List<String> get included => _included;
+  List<String> get libraries => _libraries;
 
   /**
-   * A list of the files and directories that should be analyzed.
+   * A list of the paths of library elements referenced by files in existing
+   * analysis roots.
    */
-  void set included(List<String> value) {
+  void set libraries(List<String> value) {
     assert(value != null);
-    this._included = value;
+    this._libraries = value;
   }
 
   /**
-   * A list of the files and directories within the included directories that
-   * should not be analyzed.
+   * A mapping from context source roots to package maps which map package
+   * names to source directories for use in client-side package URI resolution.
    */
-  List<String> get excluded => _excluded;
+  Map<String, Map<String, List<String>>> get packageMap => _packageMap;
 
   /**
-   * A list of the files and directories within the included directories that
-   * should not be analyzed.
+   * A mapping from context source roots to package maps which map package
+   * names to source directories for use in client-side package URI resolution.
    */
-  void set excluded(List<String> value) {
+  void set packageMap(Map<String, Map<String, List<String>>> value) {
     assert(value != null);
-    this._excluded = value;
+    this._packageMap = value;
   }
 
-  /**
-   * A mapping from source directories to package roots that should override
-   * the normal package: URI resolution mechanism.
-   *
-   * If a package root is a directory, then the analyzer will behave as though
-   * the associated source directory in the map contains a special pubspec.yaml
-   * file which resolves any package: URI to the corresponding path within that
-   * package root directory. The effect is the same as specifying the package
-   * root directory as a "--package_root" parameter to the Dart VM when
-   * executing any Dart file inside the source directory.
-   *
-   * If a package root is a file, then the analyzer will behave as though that
-   * file is a ".packages" file in the source directory. The effect is the same
-   * as specifying the file as a "--packages" parameter to the Dart VM when
-   * executing any Dart file inside the source directory.
-   *
-   * Files in any directories that are not overridden by this mapping have
-   * their package: URI's resolved using the normal pubspec.yaml mechanism. If
-   * this field is absent, or the empty map is specified, that indicates that
-   * the normal pubspec.yaml mechanism should always be used.
-   */
-  Map<String, String> get packageRoots => _packageRoots;
-
-  /**
-   * A mapping from source directories to package roots that should override
-   * the normal package: URI resolution mechanism.
-   *
-   * If a package root is a directory, then the analyzer will behave as though
-   * the associated source directory in the map contains a special pubspec.yaml
-   * file which resolves any package: URI to the corresponding path within that
-   * package root directory. The effect is the same as specifying the package
-   * root directory as a "--package_root" parameter to the Dart VM when
-   * executing any Dart file inside the source directory.
-   *
-   * If a package root is a file, then the analyzer will behave as though that
-   * file is a ".packages" file in the source directory. The effect is the same
-   * as specifying the file as a "--packages" parameter to the Dart VM when
-   * executing any Dart file inside the source directory.
-   *
-   * Files in any directories that are not overridden by this mapping have
-   * their package: URI's resolved using the normal pubspec.yaml mechanism. If
-   * this field is absent, or the empty map is specified, that indicates that
-   * the normal pubspec.yaml mechanism should always be used.
-   */
-  void set packageRoots(Map<String, String> value) {
-    this._packageRoots = value;
+  AnalysisGetLibraryDependenciesResult(List<String> libraries,
+      Map<String, Map<String, List<String>>> packageMap) {
+    this.libraries = libraries;
+    this.packageMap = packageMap;
   }
 
-  AnalysisSetAnalysisRootsParams(List<String> included, List<String> excluded,
-      {Map<String, String> packageRoots}) {
-    this.included = included;
-    this.excluded = excluded;
-    this.packageRoots = packageRoots;
-  }
-
-  factory AnalysisSetAnalysisRootsParams.fromJson(
+  factory AnalysisGetLibraryDependenciesResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<String> included;
-      if (json.containsKey("included")) {
-        included = jsonDecoder.decodeList(
-            jsonPath + ".included", json["included"], jsonDecoder.decodeString);
+      List<String> libraries;
+      if (json.containsKey("libraries")) {
+        libraries = jsonDecoder.decodeList(jsonPath + ".libraries",
+            json["libraries"], jsonDecoder.decodeString);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "included");
+        throw jsonDecoder.mismatch(jsonPath, "libraries");
       }
-      List<String> excluded;
-      if (json.containsKey("excluded")) {
-        excluded = jsonDecoder.decodeList(
-            jsonPath + ".excluded", json["excluded"], jsonDecoder.decodeString);
+      Map<String, Map<String, List<String>>> packageMap;
+      if (json.containsKey("packageMap")) {
+        packageMap = jsonDecoder.decodeMap(
+            jsonPath + ".packageMap", json["packageMap"],
+            valueDecoder: (String jsonPath, Object json) =>
+                jsonDecoder.decodeMap(jsonPath, json,
+                    valueDecoder: (String jsonPath, Object json) => jsonDecoder
+                        .decodeList(jsonPath, json, jsonDecoder.decodeString)));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "excluded");
+        throw jsonDecoder.mismatch(jsonPath, "packageMap");
       }
-      Map<String, String> packageRoots;
-      if (json.containsKey("packageRoots")) {
-        packageRoots = jsonDecoder.decodeMap(
-            jsonPath + ".packageRoots", json["packageRoots"],
-            valueDecoder: jsonDecoder.decodeString);
-      }
-      return new AnalysisSetAnalysisRootsParams(included, excluded,
-          packageRoots: packageRoots);
+      return new AnalysisGetLibraryDependenciesResult(libraries, packageMap);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "analysis.setAnalysisRoots params", json);
+          jsonPath, "analysis.getLibraryDependencies result", json);
     }
   }
 
-  factory AnalysisSetAnalysisRootsParams.fromRequest(Request request) {
-    return new AnalysisSetAnalysisRootsParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory AnalysisGetLibraryDependenciesResult.fromResponse(Response response) {
+    return new AnalysisGetLibraryDependenciesResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["included"] = included;
-    result["excluded"] = excluded;
-    if (packageRoots != null) {
-      result["packageRoots"] = packageRoots;
-    }
+    result["libraries"] = libraries;
+    result["packageMap"] = packageMap;
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "analysis.setAnalysisRoots", toJson());
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisSetAnalysisRootsParams) {
+    if (other is AnalysisGetLibraryDependenciesResult) {
       return listEqual(
-              included, other.included, (String a, String b) => a == b) &&
-          listEqual(excluded, other.excluded, (String a, String b) => a == b) &&
+              libraries, other.libraries, (String a, String b) => a == b) &&
           mapEqual(
-              packageRoots, other.packageRoots, (String a, String b) => a == b);
+              packageMap,
+              other.packageMap,
+              (Map<String, List<String>> a, Map<String, List<String>> b) =>
+                  mapEqual(
+                      a,
+                      b,
+                      (List<String> a, List<String> b) =>
+                          listEqual(a, b, (String a, String b) => a == b)));
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, included.hashCode);
-    hash = JenkinsSmiHash.combine(hash, excluded.hashCode);
-    hash = JenkinsSmiHash.combine(hash, packageRoots.hashCode);
+    hash = JenkinsSmiHash.combine(hash, libraries.hashCode);
+    hash = JenkinsSmiHash.combine(hash, packageMap.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.setAnalysisRoots result
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisSetAnalysisRootsResult {
-  Response toResponse(String id) {
-    return new Response(id, result: null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is AnalysisSetAnalysisRootsResult) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 866004753;
-  }
-}
-
-/**
- * analysis.setGeneralSubscriptions params
+ * analysis.getNavigation params
  *
  * {
- *   "subscriptions": List<GeneralAnalysisService>
+ *   "file": FilePath
+ *   "offset": int
+ *   "length": int
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisSetGeneralSubscriptionsParams implements HasToJson {
-  List<GeneralAnalysisService> _subscriptions;
+class AnalysisGetNavigationParams implements RequestParams {
+  String _file;
+
+  int _offset;
+
+  int _length;
 
   /**
-   * A list of the services being subscribed to.
+   * The file in which navigation information is being requested.
    */
-  List<GeneralAnalysisService> get subscriptions => _subscriptions;
+  String get file => _file;
 
   /**
-   * A list of the services being subscribed to.
+   * The file in which navigation information is being requested.
    */
-  void set subscriptions(List<GeneralAnalysisService> value) {
+  void set file(String value) {
     assert(value != null);
-    this._subscriptions = value;
+    this._file = value;
   }
 
-  AnalysisSetGeneralSubscriptionsParams(
-      List<GeneralAnalysisService> subscriptions) {
-    this.subscriptions = subscriptions;
+  /**
+   * The offset of the region for which navigation information is being
+   * requested.
+   */
+  int get offset => _offset;
+
+  /**
+   * The offset of the region for which navigation information is being
+   * requested.
+   */
+  void set offset(int value) {
+    assert(value != null);
+    this._offset = value;
   }
 
-  factory AnalysisSetGeneralSubscriptionsParams.fromJson(
+  /**
+   * The length of the region for which navigation information is being
+   * requested.
+   */
+  int get length => _length;
+
+  /**
+   * The length of the region for which navigation information is being
+   * requested.
+   */
+  void set length(int value) {
+    assert(value != null);
+    this._length = value;
+  }
+
+  AnalysisGetNavigationParams(String file, int offset, int length) {
+    this.file = file;
+    this.offset = offset;
+    this.length = length;
+  }
+
+  factory AnalysisGetNavigationParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<GeneralAnalysisService> subscriptions;
-      if (json.containsKey("subscriptions")) {
-        subscriptions = jsonDecoder.decodeList(
-            jsonPath + ".subscriptions",
-            json["subscriptions"],
-            (String jsonPath, Object json) =>
-                new GeneralAnalysisService.fromJson(
-                    jsonDecoder, jsonPath, json));
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "subscriptions");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      return new AnalysisSetGeneralSubscriptionsParams(subscriptions);
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offset");
+      }
+      int length;
+      if (json.containsKey("length")) {
+        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "length");
+      }
+      return new AnalysisGetNavigationParams(file, offset, length);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "analysis.setGeneralSubscriptions params", json);
+          jsonPath, "analysis.getNavigation params", json);
     }
   }
 
-  factory AnalysisSetGeneralSubscriptionsParams.fromRequest(Request request) {
-    return new AnalysisSetGeneralSubscriptionsParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory AnalysisGetNavigationParams.fromRequest(Request request) {
+    return new AnalysisGetNavigationParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["subscriptions"] = subscriptions
-        .map((GeneralAnalysisService value) => value.toJson())
-        .toList();
+    result["file"] = file;
+    result["offset"] = offset;
+    result["length"] = length;
     return result;
   }
 
+  @override
   Request toRequest(String id) {
-    return new Request(id, "analysis.setGeneralSubscriptions", toJson());
+    return new Request(id, "analysis.getNavigation", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisSetGeneralSubscriptionsParams) {
-      return listEqual(subscriptions, other.subscriptions,
-          (GeneralAnalysisService a, GeneralAnalysisService b) => a == b);
+    if (other is AnalysisGetNavigationParams) {
+      return file == other.file &&
+          offset == other.offset &&
+          length == other.length;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, length.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.setGeneralSubscriptions result
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisSetGeneralSubscriptionsResult {
-  Response toResponse(String id) {
-    return new Response(id, result: null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is AnalysisSetGeneralSubscriptionsResult) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 386759562;
-  }
-}
-
-/**
- * analysis.setPriorityFiles params
+ * analysis.getNavigation result
  *
  * {
  *   "files": List<FilePath>
+ *   "targets": List<NavigationTarget>
+ *   "regions": List<NavigationRegion>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisSetPriorityFilesParams implements HasToJson {
+class AnalysisGetNavigationResult implements ResponseResult {
   List<String> _files;
 
+  List<NavigationTarget> _targets;
+
+  List<NavigationRegion> _regions;
+
   /**
-   * The files that are to be a priority for analysis.
+   * A list of the paths of files that are referenced by the navigation
+   * targets.
    */
   List<String> get files => _files;
 
   /**
-   * The files that are to be a priority for analysis.
+   * A list of the paths of files that are referenced by the navigation
+   * targets.
    */
   void set files(List<String> value) {
     assert(value != null);
     this._files = value;
   }
 
-  AnalysisSetPriorityFilesParams(List<String> files) {
-    this.files = files;
+  /**
+   * A list of the navigation targets that are referenced by the navigation
+   * regions.
+   */
+  List<NavigationTarget> get targets => _targets;
+
+  /**
+   * A list of the navigation targets that are referenced by the navigation
+   * regions.
+   */
+  void set targets(List<NavigationTarget> value) {
+    assert(value != null);
+    this._targets = value;
   }
 
-  factory AnalysisSetPriorityFilesParams.fromJson(
+  /**
+   * A list of the navigation regions within the requested region of the file.
+   */
+  List<NavigationRegion> get regions => _regions;
+
+  /**
+   * A list of the navigation regions within the requested region of the file.
+   */
+  void set regions(List<NavigationRegion> value) {
+    assert(value != null);
+    this._regions = value;
+  }
+
+  AnalysisGetNavigationResult(List<String> files,
+      List<NavigationTarget> targets, List<NavigationRegion> regions) {
+    this.files = files;
+    this.targets = targets;
+    this.regions = regions;
+  }
+
+  factory AnalysisGetNavigationResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       List<String> files;
       if (json.containsKey("files")) {
         files = jsonDecoder.decodeList(
             jsonPath + ".files", json["files"], jsonDecoder.decodeString);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "files");
+        throw jsonDecoder.mismatch(jsonPath, "files");
       }
-      return new AnalysisSetPriorityFilesParams(files);
+      List<NavigationTarget> targets;
+      if (json.containsKey("targets")) {
+        targets = jsonDecoder.decodeList(
+            jsonPath + ".targets",
+            json["targets"],
+            (String jsonPath, Object json) =>
+                new NavigationTarget.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "targets");
+      }
+      List<NavigationRegion> regions;
+      if (json.containsKey("regions")) {
+        regions = jsonDecoder.decodeList(
+            jsonPath + ".regions",
+            json["regions"],
+            (String jsonPath, Object json) =>
+                new NavigationRegion.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "regions");
+      }
+      return new AnalysisGetNavigationResult(files, targets, regions);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "analysis.setPriorityFiles params", json);
+          jsonPath, "analysis.getNavigation result", json);
     }
   }
 
-  factory AnalysisSetPriorityFilesParams.fromRequest(Request request) {
-    return new AnalysisSetPriorityFilesParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory AnalysisGetNavigationResult.fromResponse(Response response) {
+    return new AnalysisGetNavigationResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["files"] = files;
+    result["targets"] =
+        targets.map((NavigationTarget value) => value.toJson()).toList();
+    result["regions"] =
+        regions.map((NavigationRegion value) => value.toJson()).toList();
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "analysis.setPriorityFiles", toJson());
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisSetPriorityFilesParams) {
-      return listEqual(files, other.files, (String a, String b) => a == b);
+    if (other is AnalysisGetNavigationResult) {
+      return listEqual(files, other.files, (String a, String b) => a == b) &&
+          listEqual(targets, other.targets,
+              (NavigationTarget a, NavigationTarget b) => a == b) &&
+          listEqual(regions, other.regions,
+              (NavigationRegion a, NavigationRegion b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, files.hashCode);
+    hash = JenkinsSmiHash.combine(hash, targets.hashCode);
+    hash = JenkinsSmiHash.combine(hash, regions.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.setPriorityFiles result
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisSetPriorityFilesResult {
-  Response toResponse(String id) {
-    return new Response(id, result: null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is AnalysisSetPriorityFilesResult) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 330050055;
-  }
-}
-
-/**
- * analysis.setSubscriptions params
+ * analysis.getReachableSources params
  *
  * {
- *   "subscriptions": Map<AnalysisService, List<FilePath>>
+ *   "file": FilePath
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisSetSubscriptionsParams implements HasToJson {
-  Map<AnalysisService, List<String>> _subscriptions;
+class AnalysisGetReachableSourcesParams implements RequestParams {
+  String _file;
 
   /**
-   * A table mapping services to a list of the files being subscribed to the
-   * service.
+   * The file for which reachable source information is being requested.
    */
-  Map<AnalysisService, List<String>> get subscriptions => _subscriptions;
+  String get file => _file;
 
   /**
-   * A table mapping services to a list of the files being subscribed to the
-   * service.
+   * The file for which reachable source information is being requested.
    */
-  void set subscriptions(Map<AnalysisService, List<String>> value) {
+  void set file(String value) {
     assert(value != null);
-    this._subscriptions = value;
+    this._file = value;
   }
 
-  AnalysisSetSubscriptionsParams(
-      Map<AnalysisService, List<String>> subscriptions) {
-    this.subscriptions = subscriptions;
+  AnalysisGetReachableSourcesParams(String file) {
+    this.file = file;
   }
 
-  factory AnalysisSetSubscriptionsParams.fromJson(
+  factory AnalysisGetReachableSourcesParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      Map<AnalysisService, List<String>> subscriptions;
-      if (json.containsKey("subscriptions")) {
-        subscriptions = jsonDecoder.decodeMap(
-            jsonPath + ".subscriptions", json["subscriptions"],
-            keyDecoder: (String jsonPath, Object json) =>
-                new AnalysisService.fromJson(jsonDecoder, jsonPath, json),
-            valueDecoder: (String jsonPath, Object json) => jsonDecoder
-                .decodeList(jsonPath, json, jsonDecoder.decodeString));
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "subscriptions");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      return new AnalysisSetSubscriptionsParams(subscriptions);
+      return new AnalysisGetReachableSourcesParams(file);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "analysis.setSubscriptions params", json);
+          jsonPath, "analysis.getReachableSources params", json);
     }
   }
 
-  factory AnalysisSetSubscriptionsParams.fromRequest(Request request) {
-    return new AnalysisSetSubscriptionsParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory AnalysisGetReachableSourcesParams.fromRequest(Request request) {
+    return new AnalysisGetReachableSourcesParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["subscriptions"] = mapMap(subscriptions,
-        keyCallback: (AnalysisService value) => value.toJson());
+    result["file"] = file;
     return result;
   }
 
+  @override
   Request toRequest(String id) {
-    return new Request(id, "analysis.setSubscriptions", toJson());
+    return new Request(id, "analysis.getReachableSources", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisSetSubscriptionsParams) {
-      return mapEqual(
-          subscriptions,
-          other.subscriptions,
-          (List<String> a, List<String> b) =>
-              listEqual(a, b, (String a, String b) => a == b));
+    if (other is AnalysisGetReachableSourcesParams) {
+      return file == other.file;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.setSubscriptions result
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisSetSubscriptionsResult {
-  Response toResponse(String id) {
-    return new Response(id, result: null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is AnalysisSetSubscriptionsResult) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 218088493;
-  }
-}
-
-/**
- * analysis.updateContent params
+ * analysis.getReachableSources result
  *
  * {
- *   "files": Map<FilePath, AddContentOverlay | ChangeContentOverlay | RemoveContentOverlay>
+ *   "sources": Map<String, List<String>>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisUpdateContentParams implements HasToJson {
-  Map<String, dynamic> _files;
+class AnalysisGetReachableSourcesResult implements ResponseResult {
+  Map<String, List<String>> _sources;
 
   /**
-   * A table mapping the files whose content has changed to a description of
-   * the content change.
+   * A mapping from source URIs to directly reachable source URIs. For example,
+   * a file "foo.dart" that imports "bar.dart" would have the corresponding
+   * mapping { "file:///foo.dart" : ["file:///bar.dart"] }. If "bar.dart" has
+   * further imports (or exports) there will be a mapping from the URI
+   * "file:///bar.dart" to them. To check if a specific URI is reachable from a
+   * given file, clients can check for its presence in the resulting key set.
    */
-  Map<String, dynamic> get files => _files;
+  Map<String, List<String>> get sources => _sources;
 
   /**
-   * A table mapping the files whose content has changed to a description of
-   * the content change.
+   * A mapping from source URIs to directly reachable source URIs. For example,
+   * a file "foo.dart" that imports "bar.dart" would have the corresponding
+   * mapping { "file:///foo.dart" : ["file:///bar.dart"] }. If "bar.dart" has
+   * further imports (or exports) there will be a mapping from the URI
+   * "file:///bar.dart" to them. To check if a specific URI is reachable from a
+   * given file, clients can check for its presence in the resulting key set.
    */
-  void set files(Map<String, dynamic> value) {
+  void set sources(Map<String, List<String>> value) {
     assert(value != null);
-    this._files = value;
+    this._sources = value;
   }
 
-  AnalysisUpdateContentParams(Map<String, dynamic> files) {
-    this.files = files;
+  AnalysisGetReachableSourcesResult(Map<String, List<String>> sources) {
+    this.sources = sources;
   }
 
-  factory AnalysisUpdateContentParams.fromJson(
+  factory AnalysisGetReachableSourcesResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      Map<String, dynamic> files;
-      if (json.containsKey("files")) {
-        files = jsonDecoder.decodeMap(jsonPath + ".files", json["files"],
-            valueDecoder: (String jsonPath, Object json) =>
-                jsonDecoder.decodeUnion(jsonPath, json, "type", {
-                  "add": (String jsonPath, Object json) =>
-                      new AddContentOverlay.fromJson(
-                          jsonDecoder, jsonPath, json),
-                  "change": (String jsonPath, Object json) =>
-                      new ChangeContentOverlay.fromJson(
-                          jsonDecoder, jsonPath, json),
-                  "remove": (String jsonPath, Object json) =>
-                      new RemoveContentOverlay.fromJson(
-                          jsonDecoder, jsonPath, json)
-                }));
+      Map<String, List<String>> sources;
+      if (json.containsKey("sources")) {
+        sources = jsonDecoder.decodeMap(jsonPath + ".sources", json["sources"],
+            valueDecoder: (String jsonPath, Object json) => jsonDecoder
+                .decodeList(jsonPath, json, jsonDecoder.decodeString));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "files");
+        throw jsonDecoder.mismatch(jsonPath, "sources");
       }
-      return new AnalysisUpdateContentParams(files);
+      return new AnalysisGetReachableSourcesResult(sources);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "analysis.updateContent params", json);
+          jsonPath, "analysis.getReachableSources result", json);
     }
   }
 
-  factory AnalysisUpdateContentParams.fromRequest(Request request) {
-    return new AnalysisUpdateContentParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory AnalysisGetReachableSourcesResult.fromResponse(Response response) {
+    return new AnalysisGetReachableSourcesResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["files"] =
-        mapMap(files, valueCallback: (dynamic value) => value.toJson());
+    result["sources"] = sources;
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "analysis.updateContent", toJson());
-  }
-
   @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is AnalysisUpdateContentParams) {
-      return mapEqual(files, other.files, (dynamic a, dynamic b) => a == b);
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, files.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * analysis.updateContent result
- *
- * {
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisUpdateContentResult implements HasToJson {
-  AnalysisUpdateContentResult();
-
-  factory AnalysisUpdateContentResult.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      return new AnalysisUpdateContentResult();
-    } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "analysis.updateContent result", json);
-    }
-  }
-
-  factory AnalysisUpdateContentResult.fromResponse(Response response) {
-    return new AnalysisUpdateContentResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    return result;
-  }
-
   Response toResponse(String id) {
     return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisUpdateContentResult) {
-      return true;
+    if (other is AnalysisGetReachableSourcesResult) {
+      return mapEqual(
+          sources,
+          other.sources,
+          (List<String> a, List<String> b) =>
+              listEqual(a, b, (String a, String b) => a == b));
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, sources.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.updateOptions params
+ * analysis.highlights params
  *
  * {
- *   "options": AnalysisOptions
+ *   "file": FilePath
+ *   "regions": List<HighlightRegion>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisUpdateOptionsParams implements HasToJson {
-  AnalysisOptions _options;
+class AnalysisHighlightsParams implements HasToJson {
+  String _file;
+
+  List<HighlightRegion> _regions;
 
   /**
-   * The options that are to be used to control analysis.
+   * The file containing the highlight regions.
    */
-  AnalysisOptions get options => _options;
+  String get file => _file;
 
   /**
-   * The options that are to be used to control analysis.
+   * The file containing the highlight regions.
    */
-  void set options(AnalysisOptions value) {
+  void set file(String value) {
     assert(value != null);
-    this._options = value;
+    this._file = value;
   }
 
-  AnalysisUpdateOptionsParams(AnalysisOptions options) {
-    this.options = options;
+  /**
+   * The highlight regions contained in the file. Each highlight region
+   * represents a particular syntactic or semantic meaning associated with some
+   * range. Note that the highlight regions that are returned can overlap other
+   * highlight regions if there is more than one meaning associated with a
+   * particular region.
+   */
+  List<HighlightRegion> get regions => _regions;
+
+  /**
+   * The highlight regions contained in the file. Each highlight region
+   * represents a particular syntactic or semantic meaning associated with some
+   * range. Note that the highlight regions that are returned can overlap other
+   * highlight regions if there is more than one meaning associated with a
+   * particular region.
+   */
+  void set regions(List<HighlightRegion> value) {
+    assert(value != null);
+    this._regions = value;
   }
 
-  factory AnalysisUpdateOptionsParams.fromJson(
+  AnalysisHighlightsParams(String file, List<HighlightRegion> regions) {
+    this.file = file;
+    this.regions = regions;
+  }
+
+  factory AnalysisHighlightsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      AnalysisOptions options;
-      if (json.containsKey("options")) {
-        options = new AnalysisOptions.fromJson(
-            jsonDecoder, jsonPath + ".options", json["options"]);
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "options");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      return new AnalysisUpdateOptionsParams(options);
+      List<HighlightRegion> regions;
+      if (json.containsKey("regions")) {
+        regions = jsonDecoder.decodeList(
+            jsonPath + ".regions",
+            json["regions"],
+            (String jsonPath, Object json) =>
+                new HighlightRegion.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "regions");
+      }
+      return new AnalysisHighlightsParams(file, regions);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "analysis.updateOptions params", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.highlights params", json);
     }
   }
 
-  factory AnalysisUpdateOptionsParams.fromRequest(Request request) {
-    return new AnalysisUpdateOptionsParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory AnalysisHighlightsParams.fromNotification(Notification notification) {
+    return new AnalysisHighlightsParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["options"] = options.toJson();
+    result["file"] = file;
+    result["regions"] =
+        regions.map((HighlightRegion value) => value.toJson()).toList();
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "analysis.updateOptions", toJson());
+  Notification toNotification() {
+    return new Notification("analysis.highlights", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisUpdateOptionsParams) {
-      return options == other.options;
+    if (other is AnalysisHighlightsParams) {
+      return file == other.file &&
+          listEqual(regions, other.regions,
+              (HighlightRegion a, HighlightRegion b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, options.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, regions.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.updateOptions result
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisUpdateOptionsResult {
-  Response toResponse(String id) {
-    return new Response(id, result: null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is AnalysisUpdateOptionsResult) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 179689467;
-  }
-}
-
-/**
- * analysis.analyzedFiles params
+ * analysis.implemented params
  *
  * {
- *   "directories": List<FilePath>
+ *   "file": FilePath
+ *   "classes": List<ImplementedClass>
+ *   "members": List<ImplementedMember>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisAnalyzedFilesParams implements HasToJson {
-  List<String> _directories;
+class AnalysisImplementedParams implements HasToJson {
+  String _file;
+
+  List<ImplementedClass> _classes;
+
+  List<ImplementedMember> _members;
 
   /**
-   * A list of the paths of the files that are being analyzed.
+   * The file with which the implementations are associated.
    */
-  List<String> get directories => _directories;
+  String get file => _file;
 
   /**
-   * A list of the paths of the files that are being analyzed.
+   * The file with which the implementations are associated.
    */
-  void set directories(List<String> value) {
+  void set file(String value) {
     assert(value != null);
-    this._directories = value;
+    this._file = value;
   }
 
-  AnalysisAnalyzedFilesParams(List<String> directories) {
-    this.directories = directories;
+  /**
+   * The classes defined in the file that are implemented or extended.
+   */
+  List<ImplementedClass> get classes => _classes;
+
+  /**
+   * The classes defined in the file that are implemented or extended.
+   */
+  void set classes(List<ImplementedClass> value) {
+    assert(value != null);
+    this._classes = value;
   }
 
-  factory AnalysisAnalyzedFilesParams.fromJson(
+  /**
+   * The member defined in the file that are implemented or overridden.
+   */
+  List<ImplementedMember> get members => _members;
+
+  /**
+   * The member defined in the file that are implemented or overridden.
+   */
+  void set members(List<ImplementedMember> value) {
+    assert(value != null);
+    this._members = value;
+  }
+
+  AnalysisImplementedParams(String file, List<ImplementedClass> classes,
+      List<ImplementedMember> members) {
+    this.file = file;
+    this.classes = classes;
+    this.members = members;
+  }
+
+  factory AnalysisImplementedParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<String> directories;
-      if (json.containsKey("directories")) {
-        directories = jsonDecoder.decodeList(jsonPath + ".directories",
-            json["directories"], jsonDecoder.decodeString);
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "directories");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      return new AnalysisAnalyzedFilesParams(directories);
+      List<ImplementedClass> classes;
+      if (json.containsKey("classes")) {
+        classes = jsonDecoder.decodeList(
+            jsonPath + ".classes",
+            json["classes"],
+            (String jsonPath, Object json) =>
+                new ImplementedClass.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "classes");
+      }
+      List<ImplementedMember> members;
+      if (json.containsKey("members")) {
+        members = jsonDecoder.decodeList(
+            jsonPath + ".members",
+            json["members"],
+            (String jsonPath, Object json) =>
+                new ImplementedMember.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "members");
+      }
+      return new AnalysisImplementedParams(file, classes, members);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "analysis.analyzedFiles params", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.implemented params", json);
     }
   }
 
-  factory AnalysisAnalyzedFilesParams.fromNotification(
+  factory AnalysisImplementedParams.fromNotification(
       Notification notification) {
-    return new AnalysisAnalyzedFilesParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
+    return new AnalysisImplementedParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["directories"] = directories;
+    result["file"] = file;
+    result["classes"] =
+        classes.map((ImplementedClass value) => value.toJson()).toList();
+    result["members"] =
+        members.map((ImplementedMember value) => value.toJson()).toList();
     return result;
   }
 
   Notification toNotification() {
-    return new Notification("analysis.analyzedFiles", toJson());
+    return new Notification("analysis.implemented", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisAnalyzedFilesParams) {
-      return listEqual(
-          directories, other.directories, (String a, String b) => a == b);
+    if (other is AnalysisImplementedParams) {
+      return file == other.file &&
+          listEqual(classes, other.classes,
+              (ImplementedClass a, ImplementedClass b) => a == b) &&
+          listEqual(members, other.members,
+              (ImplementedMember a, ImplementedMember b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, directories.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, classes.hashCode);
+    hash = JenkinsSmiHash.combine(hash, members.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.errors params
+ * analysis.invalidate params
  *
  * {
  *   "file": FilePath
- *   "errors": List<AnalysisError>
+ *   "offset": int
+ *   "length": int
+ *   "delta": int
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisErrorsParams implements HasToJson {
+class AnalysisInvalidateParams implements HasToJson {
   String _file;
 
-  List<AnalysisError> _errors;
+  int _offset;
+
+  int _length;
+
+  int _delta;
 
   /**
-   * The file containing the errors.
+   * The file whose information has been invalidated.
    */
   String get file => _file;
 
   /**
-   * The file containing the errors.
+   * The file whose information has been invalidated.
    */
   void set file(String value) {
     assert(value != null);
     this._file = value;
   }
 
   /**
-   * The errors contained in the file.
+   * The offset of the invalidated region.
    */
-  List<AnalysisError> get errors => _errors;
+  int get offset => _offset;
 
   /**
-   * The errors contained in the file.
+   * The offset of the invalidated region.
    */
-  void set errors(List<AnalysisError> value) {
+  void set offset(int value) {
     assert(value != null);
-    this._errors = value;
+    this._offset = value;
   }
 
-  AnalysisErrorsParams(String file, List<AnalysisError> errors) {
-    this.file = file;
-    this.errors = errors;
+  /**
+   * The length of the invalidated region.
+   */
+  int get length => _length;
+
+  /**
+   * The length of the invalidated region.
+   */
+  void set length(int value) {
+    assert(value != null);
+    this._length = value;
   }
 
-  factory AnalysisErrorsParams.fromJson(
+  /**
+   * The delta to be applied to the offsets in information that follows the
+   * invalidated region in order to update it so that it doesn't need to be
+   * re-requested.
+   */
+  int get delta => _delta;
+
+  /**
+   * The delta to be applied to the offsets in information that follows the
+   * invalidated region in order to update it so that it doesn't need to be
+   * re-requested.
+   */
+  void set delta(int value) {
+    assert(value != null);
+    this._delta = value;
+  }
+
+  AnalysisInvalidateParams(String file, int offset, int length, int delta) {
+    this.file = file;
+    this.offset = offset;
+    this.length = length;
+    this.delta = delta;
+  }
+
+  factory AnalysisInvalidateParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      List<AnalysisError> errors;
-      if (json.containsKey("errors")) {
-        errors = jsonDecoder.decodeList(
-            jsonPath + ".errors",
-            json["errors"],
-            (String jsonPath, Object json) =>
-                new AnalysisError.fromJson(jsonDecoder, jsonPath, json));
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "errors");
+        throw jsonDecoder.mismatch(jsonPath, "offset");
       }
-      return new AnalysisErrorsParams(file, errors);
+      int length;
+      if (json.containsKey("length")) {
+        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "length");
+      }
+      int delta;
+      if (json.containsKey("delta")) {
+        delta = jsonDecoder.decodeInt(jsonPath + ".delta", json["delta"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "delta");
+      }
+      return new AnalysisInvalidateParams(file, offset, length, delta);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.errors params", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.invalidate params", json);
     }
   }
 
-  factory AnalysisErrorsParams.fromNotification(Notification notification) {
-    return new AnalysisErrorsParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
+  factory AnalysisInvalidateParams.fromNotification(Notification notification) {
+    return new AnalysisInvalidateParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["file"] = file;
-    result["errors"] =
-        errors.map((AnalysisError value) => value.toJson()).toList();
+    result["offset"] = offset;
+    result["length"] = length;
+    result["delta"] = delta;
     return result;
   }
 
   Notification toNotification() {
-    return new Notification("analysis.errors", toJson());
+    return new Notification("analysis.invalidate", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisErrorsParams) {
+    if (other is AnalysisInvalidateParams) {
       return file == other.file &&
-          listEqual(errors, other.errors,
-              (AnalysisError a, AnalysisError b) => a == b);
+          offset == other.offset &&
+          length == other.length &&
+          delta == other.delta;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, errors.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, length.hashCode);
+    hash = JenkinsSmiHash.combine(hash, delta.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.flushResults params
+ * analysis.navigation params
  *
  * {
+ *   "file": FilePath
+ *   "regions": List<NavigationRegion>
+ *   "targets": List<NavigationTarget>
  *   "files": List<FilePath>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisFlushResultsParams implements HasToJson {
+class AnalysisNavigationParams implements HasToJson {
+  String _file;
+
+  List<NavigationRegion> _regions;
+
+  List<NavigationTarget> _targets;
+
   List<String> _files;
 
   /**
-   * The files that are no longer being analyzed.
-   */
-  List<String> get files => _files;
-
-  /**
-   * The files that are no longer being analyzed.
-   */
-  void set files(List<String> value) {
-    assert(value != null);
-    this._files = value;
-  }
-
-  AnalysisFlushResultsParams(List<String> files) {
-    this.files = files;
-  }
-
-  factory AnalysisFlushResultsParams.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      List<String> files;
-      if (json.containsKey("files")) {
-        files = jsonDecoder.decodeList(
-            jsonPath + ".files", json["files"], jsonDecoder.decodeString);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "files");
-      }
-      return new AnalysisFlushResultsParams(files);
-    } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "analysis.flushResults params", json);
-    }
-  }
-
-  factory AnalysisFlushResultsParams.fromNotification(
-      Notification notification) {
-    return new AnalysisFlushResultsParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["files"] = files;
-    return result;
-  }
-
-  Notification toNotification() {
-    return new Notification("analysis.flushResults", toJson());
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is AnalysisFlushResultsParams) {
-      return listEqual(files, other.files, (String a, String b) => a == b);
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, files.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * analysis.folding params
- *
- * {
- *   "file": FilePath
- *   "regions": List<FoldingRegion>
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisFoldingParams implements HasToJson {
-  String _file;
-
-  List<FoldingRegion> _regions;
-
-  /**
-   * The file containing the folding regions.
+   * The file containing the navigation regions.
    */
   String get file => _file;
 
   /**
-   * The file containing the folding regions.
+   * The file containing the navigation regions.
    */
   void set file(String value) {
     assert(value != null);
     this._file = value;
   }
 
   /**
-   * The folding regions contained in the file.
+   * The navigation regions contained in the file. The regions are sorted by
+   * their offsets. Each navigation region represents a list of targets
+   * associated with some range. The lists will usually contain a single
+   * target, but can contain more in the case of a part that is included in
+   * multiple libraries or in Dart code that is compiled against multiple
+   * versions of a package. Note that the navigation regions that are returned
+   * do not overlap other navigation regions.
    */
-  List<FoldingRegion> get regions => _regions;
+  List<NavigationRegion> get regions => _regions;
 
   /**
-   * The folding regions contained in the file.
+   * The navigation regions contained in the file. The regions are sorted by
+   * their offsets. Each navigation region represents a list of targets
+   * associated with some range. The lists will usually contain a single
+   * target, but can contain more in the case of a part that is included in
+   * multiple libraries or in Dart code that is compiled against multiple
+   * versions of a package. Note that the navigation regions that are returned
+   * do not overlap other navigation regions.
    */
-  void set regions(List<FoldingRegion> value) {
+  void set regions(List<NavigationRegion> value) {
     assert(value != null);
     this._regions = value;
   }
 
-  AnalysisFoldingParams(String file, List<FoldingRegion> regions) {
+  /**
+   * The navigation targets referenced in the file. They are referenced by
+   * NavigationRegions by their index in this array.
+   */
+  List<NavigationTarget> get targets => _targets;
+
+  /**
+   * The navigation targets referenced in the file. They are referenced by
+   * NavigationRegions by their index in this array.
+   */
+  void set targets(List<NavigationTarget> value) {
+    assert(value != null);
+    this._targets = value;
+  }
+
+  /**
+   * The files containing navigation targets referenced in the file. They are
+   * referenced by NavigationTargets by their index in this array.
+   */
+  List<String> get files => _files;
+
+  /**
+   * The files containing navigation targets referenced in the file. They are
+   * referenced by NavigationTargets by their index in this array.
+   */
+  void set files(List<String> value) {
+    assert(value != null);
+    this._files = value;
+  }
+
+  AnalysisNavigationParams(String file, List<NavigationRegion> regions,
+      List<NavigationTarget> targets, List<String> files) {
     this.file = file;
     this.regions = regions;
+    this.targets = targets;
+    this.files = files;
   }
 
-  factory AnalysisFoldingParams.fromJson(
+  factory AnalysisNavigationParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      List<FoldingRegion> regions;
+      List<NavigationRegion> regions;
       if (json.containsKey("regions")) {
         regions = jsonDecoder.decodeList(
             jsonPath + ".regions",
             json["regions"],
             (String jsonPath, Object json) =>
-                new FoldingRegion.fromJson(jsonDecoder, jsonPath, json));
+                new NavigationRegion.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "regions");
+        throw jsonDecoder.mismatch(jsonPath, "regions");
       }
-      return new AnalysisFoldingParams(file, regions);
+      List<NavigationTarget> targets;
+      if (json.containsKey("targets")) {
+        targets = jsonDecoder.decodeList(
+            jsonPath + ".targets",
+            json["targets"],
+            (String jsonPath, Object json) =>
+                new NavigationTarget.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "targets");
+      }
+      List<String> files;
+      if (json.containsKey("files")) {
+        files = jsonDecoder.decodeList(
+            jsonPath + ".files", json["files"], jsonDecoder.decodeString);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "files");
+      }
+      return new AnalysisNavigationParams(file, regions, targets, files);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.folding params", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.navigation params", json);
     }
   }
 
-  factory AnalysisFoldingParams.fromNotification(Notification notification) {
-    return new AnalysisFoldingParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
+  factory AnalysisNavigationParams.fromNotification(Notification notification) {
+    return new AnalysisNavigationParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["file"] = file;
     result["regions"] =
-        regions.map((FoldingRegion value) => value.toJson()).toList();
+        regions.map((NavigationRegion value) => value.toJson()).toList();
+    result["targets"] =
+        targets.map((NavigationTarget value) => value.toJson()).toList();
+    result["files"] = files;
     return result;
   }
 
   Notification toNotification() {
-    return new Notification("analysis.folding", toJson());
+    return new Notification("analysis.navigation", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisFoldingParams) {
+    if (other is AnalysisNavigationParams) {
       return file == other.file &&
           listEqual(regions, other.regions,
-              (FoldingRegion a, FoldingRegion b) => a == b);
+              (NavigationRegion a, NavigationRegion b) => a == b) &&
+          listEqual(targets, other.targets,
+              (NavigationTarget a, NavigationTarget b) => a == b) &&
+          listEqual(files, other.files, (String a, String b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, file.hashCode);
     hash = JenkinsSmiHash.combine(hash, regions.hashCode);
+    hash = JenkinsSmiHash.combine(hash, targets.hashCode);
+    hash = JenkinsSmiHash.combine(hash, files.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.highlights params
+ * analysis.occurrences params
  *
  * {
  *   "file": FilePath
- *   "regions": List<HighlightRegion>
+ *   "occurrences": List<Occurrences>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisHighlightsParams implements HasToJson {
+class AnalysisOccurrencesParams implements HasToJson {
   String _file;
 
-  List<HighlightRegion> _regions;
+  List<Occurrences> _occurrences;
 
   /**
-   * The file containing the highlight regions.
+   * The file in which the references occur.
    */
   String get file => _file;
 
   /**
-   * The file containing the highlight regions.
+   * The file in which the references occur.
    */
   void set file(String value) {
     assert(value != null);
     this._file = value;
   }
 
   /**
-   * The highlight regions contained in the file. Each highlight region
-   * represents a particular syntactic or semantic meaning associated with some
-   * range. Note that the highlight regions that are returned can overlap other
-   * highlight regions if there is more than one meaning associated with a
-   * particular region.
+   * The occurrences of references to elements within the file.
    */
-  List<HighlightRegion> get regions => _regions;
+  List<Occurrences> get occurrences => _occurrences;
 
   /**
-   * The highlight regions contained in the file. Each highlight region
-   * represents a particular syntactic or semantic meaning associated with some
-   * range. Note that the highlight regions that are returned can overlap other
-   * highlight regions if there is more than one meaning associated with a
-   * particular region.
+   * The occurrences of references to elements within the file.
    */
-  void set regions(List<HighlightRegion> value) {
+  void set occurrences(List<Occurrences> value) {
     assert(value != null);
-    this._regions = value;
+    this._occurrences = value;
   }
 
-  AnalysisHighlightsParams(String file, List<HighlightRegion> regions) {
+  AnalysisOccurrencesParams(String file, List<Occurrences> occurrences) {
     this.file = file;
-    this.regions = regions;
+    this.occurrences = occurrences;
   }
 
-  factory AnalysisHighlightsParams.fromJson(
+  factory AnalysisOccurrencesParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      List<HighlightRegion> regions;
-      if (json.containsKey("regions")) {
-        regions = jsonDecoder.decodeList(
-            jsonPath + ".regions",
-            json["regions"],
+      List<Occurrences> occurrences;
+      if (json.containsKey("occurrences")) {
+        occurrences = jsonDecoder.decodeList(
+            jsonPath + ".occurrences",
+            json["occurrences"],
             (String jsonPath, Object json) =>
-                new HighlightRegion.fromJson(jsonDecoder, jsonPath, json));
+                new Occurrences.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "regions");
+        throw jsonDecoder.mismatch(jsonPath, "occurrences");
       }
-      return new AnalysisHighlightsParams(file, regions);
+      return new AnalysisOccurrencesParams(file, occurrences);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.highlights params", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.occurrences params", json);
     }
   }
 
-  factory AnalysisHighlightsParams.fromNotification(Notification notification) {
-    return new AnalysisHighlightsParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
+  factory AnalysisOccurrencesParams.fromNotification(
+      Notification notification) {
+    return new AnalysisOccurrencesParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["file"] = file;
-    result["regions"] =
-        regions.map((HighlightRegion value) => value.toJson()).toList();
+    result["occurrences"] =
+        occurrences.map((Occurrences value) => value.toJson()).toList();
     return result;
   }
 
   Notification toNotification() {
-    return new Notification("analysis.highlights", toJson());
+    return new Notification("analysis.occurrences", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisHighlightsParams) {
+    if (other is AnalysisOccurrencesParams) {
       return file == other.file &&
-          listEqual(regions, other.regions,
-              (HighlightRegion a, HighlightRegion b) => a == b);
+          listEqual(occurrences, other.occurrences,
+              (Occurrences a, Occurrences b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, regions.hashCode);
+    hash = JenkinsSmiHash.combine(hash, occurrences.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.implemented params
+ * AnalysisOptions
  *
  * {
- *   "file": FilePath
- *   "classes": List<ImplementedClass>
- *   "members": List<ImplementedMember>
+ *   "enableAsync": optional bool
+ *   "enableDeferredLoading": optional bool
+ *   "enableEnums": optional bool
+ *   "enableNullAwareOperators": optional bool
+ *   "enableSuperMixins": optional bool
+ *   "generateDart2jsHints": optional bool
+ *   "generateHints": optional bool
+ *   "generateLints": optional bool
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisImplementedParams implements HasToJson {
-  String _file;
-
-  List<ImplementedClass> _classes;
-
-  List<ImplementedMember> _members;
-
-  /**
-   * The file with which the implementations are associated.
-   */
-  String get file => _file;
-
-  /**
-   * The file with which the implementations are associated.
-   */
-  void set file(String value) {
-    assert(value != null);
-    this._file = value;
-  }
-
-  /**
-   * The classes defined in the file that are implemented or extended.
-   */
-  List<ImplementedClass> get classes => _classes;
-
-  /**
-   * The classes defined in the file that are implemented or extended.
-   */
-  void set classes(List<ImplementedClass> value) {
-    assert(value != null);
-    this._classes = value;
-  }
-
-  /**
-   * The member defined in the file that are implemented or overridden.
-   */
-  List<ImplementedMember> get members => _members;
-
-  /**
-   * The member defined in the file that are implemented or overridden.
-   */
-  void set members(List<ImplementedMember> value) {
-    assert(value != null);
-    this._members = value;
-  }
-
-  AnalysisImplementedParams(String file, List<ImplementedClass> classes,
-      List<ImplementedMember> members) {
-    this.file = file;
-    this.classes = classes;
-    this.members = members;
-  }
-
-  factory AnalysisImplementedParams.fromJson(
+class AnalysisOptions implements HasToJson {
+  bool _enableAsync;
+
+  bool _enableDeferredLoading;
+
+  bool _enableEnums;
+
+  bool _enableNullAwareOperators;
+
+  bool _enableSuperMixins;
+
+  bool _generateDart2jsHints;
+
+  bool _generateHints;
+
+  bool _generateLints;
+
+  /**
+   * Deprecated: this feature is always enabled.
+   *
+   * True if the client wants to enable support for the proposed async feature.
+   */
+  bool get enableAsync => _enableAsync;
+
+  /**
+   * Deprecated: this feature is always enabled.
+   *
+   * True if the client wants to enable support for the proposed async feature.
+   */
+  void set enableAsync(bool value) {
+    this._enableAsync = value;
+  }
+
+  /**
+   * Deprecated: this feature is always enabled.
+   *
+   * True if the client wants to enable support for the proposed deferred
+   * loading feature.
+   */
+  bool get enableDeferredLoading => _enableDeferredLoading;
+
+  /**
+   * Deprecated: this feature is always enabled.
+   *
+   * True if the client wants to enable support for the proposed deferred
+   * loading feature.
+   */
+  void set enableDeferredLoading(bool value) {
+    this._enableDeferredLoading = value;
+  }
+
+  /**
+   * Deprecated: this feature is always enabled.
+   *
+   * True if the client wants to enable support for the proposed enum feature.
+   */
+  bool get enableEnums => _enableEnums;
+
+  /**
+   * Deprecated: this feature is always enabled.
+   *
+   * True if the client wants to enable support for the proposed enum feature.
+   */
+  void set enableEnums(bool value) {
+    this._enableEnums = value;
+  }
+
+  /**
+   * Deprecated: this feature is always enabled.
+   *
+   * True if the client wants to enable support for the proposed "null aware
+   * operators" feature.
+   */
+  bool get enableNullAwareOperators => _enableNullAwareOperators;
+
+  /**
+   * Deprecated: this feature is always enabled.
+   *
+   * True if the client wants to enable support for the proposed "null aware
+   * operators" feature.
+   */
+  void set enableNullAwareOperators(bool value) {
+    this._enableNullAwareOperators = value;
+  }
+
+  /**
+   * True if the client wants to enable support for the proposed "less
+   * restricted mixins" proposal (DEP 34).
+   */
+  bool get enableSuperMixins => _enableSuperMixins;
+
+  /**
+   * True if the client wants to enable support for the proposed "less
+   * restricted mixins" proposal (DEP 34).
+   */
+  void set enableSuperMixins(bool value) {
+    this._enableSuperMixins = value;
+  }
+
+  /**
+   * True if hints that are specific to dart2js should be generated. This
+   * option is ignored if generateHints is false.
+   */
+  bool get generateDart2jsHints => _generateDart2jsHints;
+
+  /**
+   * True if hints that are specific to dart2js should be generated. This
+   * option is ignored if generateHints is false.
+   */
+  void set generateDart2jsHints(bool value) {
+    this._generateDart2jsHints = value;
+  }
+
+  /**
+   * True if hints should be generated as part of generating errors and
+   * warnings.
+   */
+  bool get generateHints => _generateHints;
+
+  /**
+   * True if hints should be generated as part of generating errors and
+   * warnings.
+   */
+  void set generateHints(bool value) {
+    this._generateHints = value;
+  }
+
+  /**
+   * True if lints should be generated as part of generating errors and
+   * warnings.
+   */
+  bool get generateLints => _generateLints;
+
+  /**
+   * True if lints should be generated as part of generating errors and
+   * warnings.
+   */
+  void set generateLints(bool value) {
+    this._generateLints = value;
+  }
+
+  AnalysisOptions(
+      {bool enableAsync,
+      bool enableDeferredLoading,
+      bool enableEnums,
+      bool enableNullAwareOperators,
+      bool enableSuperMixins,
+      bool generateDart2jsHints,
+      bool generateHints,
+      bool generateLints}) {
+    this.enableAsync = enableAsync;
+    this.enableDeferredLoading = enableDeferredLoading;
+    this.enableEnums = enableEnums;
+    this.enableNullAwareOperators = enableNullAwareOperators;
+    this.enableSuperMixins = enableSuperMixins;
+    this.generateDart2jsHints = generateDart2jsHints;
+    this.generateHints = generateHints;
+    this.generateLints = generateLints;
+  }
+
+  factory AnalysisOptions.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
-      }
-      List<ImplementedClass> classes;
-      if (json.containsKey("classes")) {
-        classes = jsonDecoder.decodeList(
-            jsonPath + ".classes",
-            json["classes"],
-            (String jsonPath, Object json) =>
-                new ImplementedClass.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "classes");
-      }
-      List<ImplementedMember> members;
-      if (json.containsKey("members")) {
-        members = jsonDecoder.decodeList(
-            jsonPath + ".members",
-            json["members"],
-            (String jsonPath, Object json) =>
-                new ImplementedMember.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "members");
-      }
-      return new AnalysisImplementedParams(file, classes, members);
+      bool enableAsync;
+      if (json.containsKey("enableAsync")) {
+        enableAsync = jsonDecoder.decodeBool(
+            jsonPath + ".enableAsync", json["enableAsync"]);
+      }
+      bool enableDeferredLoading;
+      if (json.containsKey("enableDeferredLoading")) {
+        enableDeferredLoading = jsonDecoder.decodeBool(
+            jsonPath + ".enableDeferredLoading", json["enableDeferredLoading"]);
+      }
+      bool enableEnums;
+      if (json.containsKey("enableEnums")) {
+        enableEnums = jsonDecoder.decodeBool(
+            jsonPath + ".enableEnums", json["enableEnums"]);
+      }
+      bool enableNullAwareOperators;
+      if (json.containsKey("enableNullAwareOperators")) {
+        enableNullAwareOperators = jsonDecoder.decodeBool(
+            jsonPath + ".enableNullAwareOperators",
+            json["enableNullAwareOperators"]);
+      }
+      bool enableSuperMixins;
+      if (json.containsKey("enableSuperMixins")) {
+        enableSuperMixins = jsonDecoder.decodeBool(
+            jsonPath + ".enableSuperMixins", json["enableSuperMixins"]);
+      }
+      bool generateDart2jsHints;
+      if (json.containsKey("generateDart2jsHints")) {
+        generateDart2jsHints = jsonDecoder.decodeBool(
+            jsonPath + ".generateDart2jsHints", json["generateDart2jsHints"]);
+      }
+      bool generateHints;
+      if (json.containsKey("generateHints")) {
+        generateHints = jsonDecoder.decodeBool(
+            jsonPath + ".generateHints", json["generateHints"]);
+      }
+      bool generateLints;
+      if (json.containsKey("generateLints")) {
+        generateLints = jsonDecoder.decodeBool(
+            jsonPath + ".generateLints", json["generateLints"]);
+      }
+      return new AnalysisOptions(
+          enableAsync: enableAsync,
+          enableDeferredLoading: enableDeferredLoading,
+          enableEnums: enableEnums,
+          enableNullAwareOperators: enableNullAwareOperators,
+          enableSuperMixins: enableSuperMixins,
+          generateDart2jsHints: generateDart2jsHints,
+          generateHints: generateHints,
+          generateLints: generateLints);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.implemented params", json);
-    }
-  }
-
-  factory AnalysisImplementedParams.fromNotification(
-      Notification notification) {
-    return new AnalysisImplementedParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "AnalysisOptions", json);
+    }
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["file"] = file;
-    result["classes"] =
-        classes.map((ImplementedClass value) => value.toJson()).toList();
-    result["members"] =
-        members.map((ImplementedMember value) => value.toJson()).toList();
+    if (enableAsync != null) {
+      result["enableAsync"] = enableAsync;
+    }
+    if (enableDeferredLoading != null) {
+      result["enableDeferredLoading"] = enableDeferredLoading;
+    }
+    if (enableEnums != null) {
+      result["enableEnums"] = enableEnums;
+    }
+    if (enableNullAwareOperators != null) {
+      result["enableNullAwareOperators"] = enableNullAwareOperators;
+    }
+    if (enableSuperMixins != null) {
+      result["enableSuperMixins"] = enableSuperMixins;
+    }
+    if (generateDart2jsHints != null) {
+      result["generateDart2jsHints"] = generateDart2jsHints;
+    }
+    if (generateHints != null) {
+      result["generateHints"] = generateHints;
+    }
+    if (generateLints != null) {
+      result["generateLints"] = generateLints;
+    }
     return result;
   }
 
-  Notification toNotification() {
-    return new Notification("analysis.implemented", toJson());
-  }
-
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisImplementedParams) {
-      return file == other.file &&
-          listEqual(classes, other.classes,
-              (ImplementedClass a, ImplementedClass b) => a == b) &&
-          listEqual(members, other.members,
-              (ImplementedMember a, ImplementedMember b) => a == b);
+    if (other is AnalysisOptions) {
+      return enableAsync == other.enableAsync &&
+          enableDeferredLoading == other.enableDeferredLoading &&
+          enableEnums == other.enableEnums &&
+          enableNullAwareOperators == other.enableNullAwareOperators &&
+          enableSuperMixins == other.enableSuperMixins &&
+          generateDart2jsHints == other.generateDart2jsHints &&
+          generateHints == other.generateHints &&
+          generateLints == other.generateLints;
     }
     return false;
   }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, classes.hashCode);
-    hash = JenkinsSmiHash.combine(hash, members.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * analysis.invalidate params
- *
- * {
- *   "file": FilePath
- *   "offset": int
- *   "length": int
- *   "delta": int
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisInvalidateParams implements HasToJson {
-  String _file;
-
-  int _offset;
-
-  int _length;
-
-  int _delta;
-
-  /**
-   * The file whose information has been invalidated.
-   */
-  String get file => _file;
-
-  /**
-   * The file whose information has been invalidated.
-   */
-  void set file(String value) {
-    assert(value != null);
-    this._file = value;
-  }
-
-  /**
-   * The offset of the invalidated region.
-   */
-  int get offset => _offset;
-
-  /**
-   * The offset of the invalidated region.
-   */
-  void set offset(int value) {
-    assert(value != null);
-    this._offset = value;
-  }
-
-  /**
-   * The length of the invalidated region.
-   */
-  int get length => _length;
-
-  /**
-   * The length of the invalidated region.
-   */
-  void set length(int value) {
-    assert(value != null);
-    this._length = value;
-  }
-
-  /**
-   * The delta to be applied to the offsets in information that follows the
-   * invalidated region in order to update it so that it doesn't need to be
-   * re-requested.
-   */
-  int get delta => _delta;
-
-  /**
-   * The delta to be applied to the offsets in information that follows the
-   * invalidated region in order to update it so that it doesn't need to be
-   * re-requested.
-   */
-  void set delta(int value) {
-    assert(value != null);
-    this._delta = value;
-  }
-
-  AnalysisInvalidateParams(String file, int offset, int length, int delta) {
-    this.file = file;
-    this.offset = offset;
-    this.length = length;
-    this.delta = delta;
-  }
-
-  factory AnalysisInvalidateParams.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
-      }
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
-      }
-      int length;
-      if (json.containsKey("length")) {
-        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
-      }
-      int delta;
-      if (json.containsKey("delta")) {
-        delta = jsonDecoder.decodeInt(jsonPath + ".delta", json["delta"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "delta");
-      }
-      return new AnalysisInvalidateParams(file, offset, length, delta);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.invalidate params", json);
-    }
-  }
-
-  factory AnalysisInvalidateParams.fromNotification(Notification notification) {
-    return new AnalysisInvalidateParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["file"] = file;
-    result["offset"] = offset;
-    result["length"] = length;
-    result["delta"] = delta;
-    return result;
-  }
-
-  Notification toNotification() {
-    return new Notification("analysis.invalidate", toJson());
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is AnalysisInvalidateParams) {
-      return file == other.file &&
-          offset == other.offset &&
-          length == other.length &&
-          delta == other.delta;
-    }
-    return false;
-  }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    hash = JenkinsSmiHash.combine(hash, delta.hashCode);
+    hash = JenkinsSmiHash.combine(hash, enableAsync.hashCode);
+    hash = JenkinsSmiHash.combine(hash, enableDeferredLoading.hashCode);
+    hash = JenkinsSmiHash.combine(hash, enableEnums.hashCode);
+    hash = JenkinsSmiHash.combine(hash, enableNullAwareOperators.hashCode);
+    hash = JenkinsSmiHash.combine(hash, enableSuperMixins.hashCode);
+    hash = JenkinsSmiHash.combine(hash, generateDart2jsHints.hashCode);
+    hash = JenkinsSmiHash.combine(hash, generateHints.hashCode);
+    hash = JenkinsSmiHash.combine(hash, generateLints.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.navigation params
+ * analysis.outline params
  *
  * {
  *   "file": FilePath
- *   "regions": List<NavigationRegion>
- *   "targets": List<NavigationTarget>
- *   "files": List<FilePath>
+ *   "kind": FileKind
+ *   "libraryName": optional String
+ *   "outline": Outline
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisNavigationParams implements HasToJson {
+class AnalysisOutlineParams implements HasToJson {
   String _file;
 
-  List<NavigationRegion> _regions;
+  FileKind _kind;
 
-  List<NavigationTarget> _targets;
+  String _libraryName;
 
-  List<String> _files;
+  Outline _outline;
 
   /**
-   * The file containing the navigation regions.
+   * The file with which the outline is associated.
    */
   String get file => _file;
 
   /**
-   * The file containing the navigation regions.
+   * The file with which the outline is associated.
    */
   void set file(String value) {
     assert(value != null);
     this._file = value;
   }
 
   /**
-   * The navigation regions contained in the file. The regions are sorted by
-   * their offsets. Each navigation region represents a list of targets
-   * associated with some range. The lists will usually contain a single
-   * target, but can contain more in the case of a part that is included in
-   * multiple libraries or in Dart code that is compiled against multiple
-   * versions of a package. Note that the navigation regions that are returned
-   * do not overlap other navigation regions.
+   * The kind of the file.
    */
-  List<NavigationRegion> get regions => _regions;
+  FileKind get kind => _kind;
 
   /**
-   * The navigation regions contained in the file. The regions are sorted by
-   * their offsets. Each navigation region represents a list of targets
-   * associated with some range. The lists will usually contain a single
-   * target, but can contain more in the case of a part that is included in
-   * multiple libraries or in Dart code that is compiled against multiple
-   * versions of a package. Note that the navigation regions that are returned
-   * do not overlap other navigation regions.
+   * The kind of the file.
    */
-  void set regions(List<NavigationRegion> value) {
+  void set kind(FileKind value) {
     assert(value != null);
-    this._regions = value;
+    this._kind = value;
   }
 
   /**
-   * The navigation targets referenced in the file. They are referenced by
-   * NavigationRegions by their index in this array.
+   * The name of the library defined by the file using a "library" directive,
+   * or referenced by a "part of" directive. If both "library" and "part of"
+   * directives are present, then the "library" directive takes precedence.
+   * This field will be omitted if the file has neither "library" nor "part of"
+   * directives.
    */
-  List<NavigationTarget> get targets => _targets;
+  String get libraryName => _libraryName;
 
   /**
-   * The navigation targets referenced in the file. They are referenced by
-   * NavigationRegions by their index in this array.
+   * The name of the library defined by the file using a "library" directive,
+   * or referenced by a "part of" directive. If both "library" and "part of"
+   * directives are present, then the "library" directive takes precedence.
+   * This field will be omitted if the file has neither "library" nor "part of"
+   * directives.
    */
-  void set targets(List<NavigationTarget> value) {
-    assert(value != null);
-    this._targets = value;
+  void set libraryName(String value) {
+    this._libraryName = value;
   }
 
   /**
-   * The files containing navigation targets referenced in the file. They are
-   * referenced by NavigationTargets by their index in this array.
+   * The outline associated with the file.
    */
-  List<String> get files => _files;
+  Outline get outline => _outline;
 
   /**
-   * The files containing navigation targets referenced in the file. They are
-   * referenced by NavigationTargets by their index in this array.
+   * The outline associated with the file.
    */
-  void set files(List<String> value) {
+  void set outline(Outline value) {
     assert(value != null);
-    this._files = value;
+    this._outline = value;
   }
 
-  AnalysisNavigationParams(String file, List<NavigationRegion> regions,
-      List<NavigationTarget> targets, List<String> files) {
+  AnalysisOutlineParams(String file, FileKind kind, Outline outline,
+      {String libraryName}) {
     this.file = file;
-    this.regions = regions;
-    this.targets = targets;
-    this.files = files;
+    this.kind = kind;
+    this.libraryName = libraryName;
+    this.outline = outline;
   }
 
-  factory AnalysisNavigationParams.fromJson(
+  factory AnalysisOutlineParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      List<NavigationRegion> regions;
-      if (json.containsKey("regions")) {
-        regions = jsonDecoder.decodeList(
-            jsonPath + ".regions",
-            json["regions"],
-            (String jsonPath, Object json) =>
-                new NavigationRegion.fromJson(jsonDecoder, jsonPath, json));
+      FileKind kind;
+      if (json.containsKey("kind")) {
+        kind = new FileKind.fromJson(
+            jsonDecoder, jsonPath + ".kind", json["kind"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "regions");
+        throw jsonDecoder.mismatch(jsonPath, "kind");
       }
-      List<NavigationTarget> targets;
-      if (json.containsKey("targets")) {
-        targets = jsonDecoder.decodeList(
-            jsonPath + ".targets",
-            json["targets"],
-            (String jsonPath, Object json) =>
-                new NavigationTarget.fromJson(jsonDecoder, jsonPath, json));
+      String libraryName;
+      if (json.containsKey("libraryName")) {
+        libraryName = jsonDecoder.decodeString(
+            jsonPath + ".libraryName", json["libraryName"]);
+      }
+      Outline outline;
+      if (json.containsKey("outline")) {
+        outline = new Outline.fromJson(
+            jsonDecoder, jsonPath + ".outline", json["outline"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "targets");
+        throw jsonDecoder.mismatch(jsonPath, "outline");
       }
-      List<String> files;
-      if (json.containsKey("files")) {
-        files = jsonDecoder.decodeList(
-            jsonPath + ".files", json["files"], jsonDecoder.decodeString);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "files");
-      }
-      return new AnalysisNavigationParams(file, regions, targets, files);
+      return new AnalysisOutlineParams(file, kind, outline,
+          libraryName: libraryName);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.navigation params", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.outline params", json);
     }
   }
 
-  factory AnalysisNavigationParams.fromNotification(Notification notification) {
-    return new AnalysisNavigationParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
+  factory AnalysisOutlineParams.fromNotification(Notification notification) {
+    return new AnalysisOutlineParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["file"] = file;
-    result["regions"] =
-        regions.map((NavigationRegion value) => value.toJson()).toList();
-    result["targets"] =
-        targets.map((NavigationTarget value) => value.toJson()).toList();
-    result["files"] = files;
+    result["kind"] = kind.toJson();
+    if (libraryName != null) {
+      result["libraryName"] = libraryName;
+    }
+    result["outline"] = outline.toJson();
     return result;
   }
 
   Notification toNotification() {
-    return new Notification("analysis.navigation", toJson());
+    return new Notification("analysis.outline", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisNavigationParams) {
+    if (other is AnalysisOutlineParams) {
       return file == other.file &&
-          listEqual(regions, other.regions,
-              (NavigationRegion a, NavigationRegion b) => a == b) &&
-          listEqual(targets, other.targets,
-              (NavigationTarget a, NavigationTarget b) => a == b) &&
-          listEqual(files, other.files, (String a, String b) => a == b);
+          kind == other.kind &&
+          libraryName == other.libraryName &&
+          outline == other.outline;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, regions.hashCode);
-    hash = JenkinsSmiHash.combine(hash, targets.hashCode);
-    hash = JenkinsSmiHash.combine(hash, files.hashCode);
+    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
+    hash = JenkinsSmiHash.combine(hash, libraryName.hashCode);
+    hash = JenkinsSmiHash.combine(hash, outline.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.occurrences params
+ * analysis.overrides params
  *
  * {
  *   "file": FilePath
- *   "occurrences": List<Occurrences>
+ *   "overrides": List<Override>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisOccurrencesParams implements HasToJson {
+class AnalysisOverridesParams implements HasToJson {
   String _file;
 
-  List<Occurrences> _occurrences;
+  List<Override> _overrides;
 
   /**
-   * The file in which the references occur.
+   * The file with which the overrides are associated.
    */
   String get file => _file;
 
   /**
-   * The file in which the references occur.
+   * The file with which the overrides are associated.
    */
   void set file(String value) {
     assert(value != null);
     this._file = value;
   }
 
   /**
-   * The occurrences of references to elements within the file.
+   * The overrides associated with the file.
    */
-  List<Occurrences> get occurrences => _occurrences;
+  List<Override> get overrides => _overrides;
 
   /**
-   * The occurrences of references to elements within the file.
+   * The overrides associated with the file.
    */
-  void set occurrences(List<Occurrences> value) {
+  void set overrides(List<Override> value) {
     assert(value != null);
-    this._occurrences = value;
+    this._overrides = value;
   }
 
-  AnalysisOccurrencesParams(String file, List<Occurrences> occurrences) {
+  AnalysisOverridesParams(String file, List<Override> overrides) {
     this.file = file;
-    this.occurrences = occurrences;
+    this.overrides = overrides;
   }
 
-  factory AnalysisOccurrencesParams.fromJson(
+  factory AnalysisOverridesParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      List<Occurrences> occurrences;
-      if (json.containsKey("occurrences")) {
-        occurrences = jsonDecoder.decodeList(
-            jsonPath + ".occurrences",
-            json["occurrences"],
+      List<Override> overrides;
+      if (json.containsKey("overrides")) {
+        overrides = jsonDecoder.decodeList(
+            jsonPath + ".overrides",
+            json["overrides"],
             (String jsonPath, Object json) =>
-                new Occurrences.fromJson(jsonDecoder, jsonPath, json));
+                new Override.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "occurrences");
+        throw jsonDecoder.mismatch(jsonPath, "overrides");
       }
-      return new AnalysisOccurrencesParams(file, occurrences);
+      return new AnalysisOverridesParams(file, overrides);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.occurrences params", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.overrides params", json);
     }
   }
 
-  factory AnalysisOccurrencesParams.fromNotification(
-      Notification notification) {
-    return new AnalysisOccurrencesParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
+  factory AnalysisOverridesParams.fromNotification(Notification notification) {
+    return new AnalysisOverridesParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["file"] = file;
-    result["occurrences"] =
-        occurrences.map((Occurrences value) => value.toJson()).toList();
+    result["overrides"] =
+        overrides.map((Override value) => value.toJson()).toList();
     return result;
   }
 
   Notification toNotification() {
-    return new Notification("analysis.occurrences", toJson());
+    return new Notification("analysis.overrides", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisOccurrencesParams) {
+    if (other is AnalysisOverridesParams) {
       return file == other.file &&
-          listEqual(occurrences, other.occurrences,
-              (Occurrences a, Occurrences b) => a == b);
+          listEqual(
+              overrides, other.overrides, (Override a, Override b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, occurrences.hashCode);
+    hash = JenkinsSmiHash.combine(hash, overrides.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.outline params
+ * analysis.reanalyze params
  *
  * {
- *   "file": FilePath
- *   "kind": FileKind
- *   "libraryName": optional String
- *   "outline": Outline
+ *   "roots": optional List<FilePath>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisOutlineParams implements HasToJson {
-  String _file;
-
-  FileKind _kind;
-
-  String _libraryName;
-
-  Outline _outline;
+class AnalysisReanalyzeParams implements RequestParams {
+  List<String> _roots;
 
   /**
-   * The file with which the outline is associated.
+   * A list of the analysis roots that are to be re-analyzed.
    */
-  String get file => _file;
+  List<String> get roots => _roots;
 
   /**
-   * The file with which the outline is associated.
+   * A list of the analysis roots that are to be re-analyzed.
    */
-  void set file(String value) {
-    assert(value != null);
-    this._file = value;
+  void set roots(List<String> value) {
+    this._roots = value;
   }
 
-  /**
-   * The kind of the file.
-   */
-  FileKind get kind => _kind;
-
-  /**
-   * The kind of the file.
-   */
-  void set kind(FileKind value) {
-    assert(value != null);
-    this._kind = value;
+  AnalysisReanalyzeParams({List<String> roots}) {
+    this.roots = roots;
   }
 
-  /**
-   * The name of the library defined by the file using a "library" directive,
-   * or referenced by a "part of" directive. If both "library" and "part of"
-   * directives are present, then the "library" directive takes precedence.
-   * This field will be omitted if the file has neither "library" nor "part of"
-   * directives.
-   */
-  String get libraryName => _libraryName;
-
-  /**
-   * The name of the library defined by the file using a "library" directive,
-   * or referenced by a "part of" directive. If both "library" and "part of"
-   * directives are present, then the "library" directive takes precedence.
-   * This field will be omitted if the file has neither "library" nor "part of"
-   * directives.
-   */
-  void set libraryName(String value) {
-    this._libraryName = value;
-  }
-
-  /**
-   * The outline associated with the file.
-   */
-  Outline get outline => _outline;
-
-  /**
-   * The outline associated with the file.
-   */
-  void set outline(Outline value) {
-    assert(value != null);
-    this._outline = value;
-  }
-
-  AnalysisOutlineParams(String file, FileKind kind, Outline outline,
-      {String libraryName}) {
-    this.file = file;
-    this.kind = kind;
-    this.libraryName = libraryName;
-    this.outline = outline;
-  }
-
-  factory AnalysisOutlineParams.fromJson(
+  factory AnalysisReanalyzeParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+      List<String> roots;
+      if (json.containsKey("roots")) {
+        roots = jsonDecoder.decodeList(
+            jsonPath + ".roots", json["roots"], jsonDecoder.decodeString);
       }
-      FileKind kind;
-      if (json.containsKey("kind")) {
-        kind = new FileKind.fromJson(
-            jsonDecoder, jsonPath + ".kind", json["kind"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "kind");
-      }
-      String libraryName;
-      if (json.containsKey("libraryName")) {
-        libraryName = jsonDecoder.decodeString(
-            jsonPath + ".libraryName", json["libraryName"]);
-      }
-      Outline outline;
-      if (json.containsKey("outline")) {
-        outline = new Outline.fromJson(
-            jsonDecoder, jsonPath + ".outline", json["outline"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "outline");
-      }
-      return new AnalysisOutlineParams(file, kind, outline,
-          libraryName: libraryName);
+      return new AnalysisReanalyzeParams(roots: roots);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.outline params", json);
+      throw jsonDecoder.mismatch(jsonPath, "analysis.reanalyze params", json);
     }
   }
 
-  factory AnalysisOutlineParams.fromNotification(Notification notification) {
-    return new AnalysisOutlineParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
+  factory AnalysisReanalyzeParams.fromRequest(Request request) {
+    return new AnalysisReanalyzeParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["file"] = file;
-    result["kind"] = kind.toJson();
-    if (libraryName != null) {
-      result["libraryName"] = libraryName;
+    if (roots != null) {
+      result["roots"] = roots;
     }
-    result["outline"] = outline.toJson();
     return result;
   }
 
-  Notification toNotification() {
-    return new Notification("analysis.outline", toJson());
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "analysis.reanalyze", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisOutlineParams) {
-      return file == other.file &&
-          kind == other.kind &&
-          libraryName == other.libraryName &&
-          outline == other.outline;
+    if (other is AnalysisReanalyzeParams) {
+      return listEqual(roots, other.roots, (String a, String b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
-    hash = JenkinsSmiHash.combine(hash, libraryName.hashCode);
-    hash = JenkinsSmiHash.combine(hash, outline.hashCode);
+    hash = JenkinsSmiHash.combine(hash, roots.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * analysis.overrides params
- *
- * {
- *   "file": FilePath
- *   "overrides": List<Override>
- * }
+ * analysis.reanalyze result
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisOverridesParams implements HasToJson {
-  String _file;
-
-  List<Override> _overrides;
-
-  /**
-   * The file with which the overrides are associated.
-   */
-  String get file => _file;
-
-  /**
-   * The file with which the overrides are associated.
-   */
-  void set file(String value) {
+class AnalysisReanalyzeResult implements ResponseResult {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is AnalysisReanalyzeResult) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 846803925;
+  }
+}
+
+/**
+ * AnalysisService
+ *
+ * enum {
+ *   FOLDING
+ *   HIGHLIGHTS
+ *   IMPLEMENTED
+ *   INVALIDATE
+ *   NAVIGATION
+ *   OCCURRENCES
+ *   OUTLINE
+ *   OVERRIDES
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class AnalysisService implements Enum {
+  static const AnalysisService FOLDING = const AnalysisService._("FOLDING");
+
+  static const AnalysisService HIGHLIGHTS =
+      const AnalysisService._("HIGHLIGHTS");
+
+  static const AnalysisService IMPLEMENTED =
+      const AnalysisService._("IMPLEMENTED");
+
+  /**
+   * This service is not currently implemented and will become a
+   * GeneralAnalysisService in a future release.
+   */
+  static const AnalysisService INVALIDATE =
+      const AnalysisService._("INVALIDATE");
+
+  static const AnalysisService NAVIGATION =
+      const AnalysisService._("NAVIGATION");
+
+  static const AnalysisService OCCURRENCES =
+      const AnalysisService._("OCCURRENCES");
+
+  static const AnalysisService OUTLINE = const AnalysisService._("OUTLINE");
+
+  static const AnalysisService OVERRIDES = const AnalysisService._("OVERRIDES");
+
+  /**
+   * A list containing all of the enum values that are defined.
+   */
+  static const List<AnalysisService> VALUES = const <AnalysisService>[
+    FOLDING,
+    HIGHLIGHTS,
+    IMPLEMENTED,
+    INVALIDATE,
+    NAVIGATION,
+    OCCURRENCES,
+    OUTLINE,
+    OVERRIDES
+  ];
+
+  @override
+  final String name;
+
+  const AnalysisService._(this.name);
+
+  factory AnalysisService(String name) {
+    switch (name) {
+      case "FOLDING":
+        return FOLDING;
+      case "HIGHLIGHTS":
+        return HIGHLIGHTS;
+      case "IMPLEMENTED":
+        return IMPLEMENTED;
+      case "INVALIDATE":
+        return INVALIDATE;
+      case "NAVIGATION":
+        return NAVIGATION;
+      case "OCCURRENCES":
+        return OCCURRENCES;
+      case "OUTLINE":
+        return OUTLINE;
+      case "OVERRIDES":
+        return OVERRIDES;
+    }
+    throw new Exception('Illegal enum value: $name');
+  }
+
+  factory AnalysisService.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json is String) {
+      try {
+        return new AnalysisService(json);
+      } catch (_) {
+        // Fall through
+      }
+    }
+    throw jsonDecoder.mismatch(jsonPath, "AnalysisService", json);
+  }
+
+  @override
+  String toString() => "AnalysisService.$name";
+
+  String toJson() => name;
+}
+
+/**
+ * analysis.setAnalysisRoots params
+ *
+ * {
+ *   "included": List<FilePath>
+ *   "excluded": List<FilePath>
+ *   "packageRoots": optional Map<FilePath, FilePath>
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class AnalysisSetAnalysisRootsParams implements RequestParams {
+  List<String> _included;
+
+  List<String> _excluded;
+
+  Map<String, String> _packageRoots;
+
+  /**
+   * A list of the files and directories that should be analyzed.
+   */
+  List<String> get included => _included;
+
+  /**
+   * A list of the files and directories that should be analyzed.
+   */
+  void set included(List<String> value) {
     assert(value != null);
-    this._file = value;
-  }
-
-  /**
-   * The overrides associated with the file.
-   */
-  List<Override> get overrides => _overrides;
-
-  /**
-   * The overrides associated with the file.
-   */
-  void set overrides(List<Override> value) {
+    this._included = value;
+  }
+
+  /**
+   * A list of the files and directories within the included directories that
+   * should not be analyzed.
+   */
+  List<String> get excluded => _excluded;
+
+  /**
+   * A list of the files and directories within the included directories that
+   * should not be analyzed.
+   */
+  void set excluded(List<String> value) {
     assert(value != null);
-    this._overrides = value;
-  }
-
-  AnalysisOverridesParams(String file, List<Override> overrides) {
-    this.file = file;
-    this.overrides = overrides;
-  }
-
-  factory AnalysisOverridesParams.fromJson(
+    this._excluded = value;
+  }
+
+  /**
+   * A mapping from source directories to package roots that should override
+   * the normal package: URI resolution mechanism.
+   *
+   * If a package root is a directory, then the analyzer will behave as though
+   * the associated source directory in the map contains a special pubspec.yaml
+   * file which resolves any package: URI to the corresponding path within that
+   * package root directory. The effect is the same as specifying the package
+   * root directory as a "--package_root" parameter to the Dart VM when
+   * executing any Dart file inside the source directory.
+   *
+   * If a package root is a file, then the analyzer will behave as though that
+   * file is a ".packages" file in the source directory. The effect is the same
+   * as specifying the file as a "--packages" parameter to the Dart VM when
+   * executing any Dart file inside the source directory.
+   *
+   * Files in any directories that are not overridden by this mapping have
+   * their package: URI's resolved using the normal pubspec.yaml mechanism. If
+   * this field is absent, or the empty map is specified, that indicates that
+   * the normal pubspec.yaml mechanism should always be used.
+   */
+  Map<String, String> get packageRoots => _packageRoots;
+
+  /**
+   * A mapping from source directories to package roots that should override
+   * the normal package: URI resolution mechanism.
+   *
+   * If a package root is a directory, then the analyzer will behave as though
+   * the associated source directory in the map contains a special pubspec.yaml
+   * file which resolves any package: URI to the corresponding path within that
+   * package root directory. The effect is the same as specifying the package
+   * root directory as a "--package_root" parameter to the Dart VM when
+   * executing any Dart file inside the source directory.
+   *
+   * If a package root is a file, then the analyzer will behave as though that
+   * file is a ".packages" file in the source directory. The effect is the same
+   * as specifying the file as a "--packages" parameter to the Dart VM when
+   * executing any Dart file inside the source directory.
+   *
+   * Files in any directories that are not overridden by this mapping have
+   * their package: URI's resolved using the normal pubspec.yaml mechanism. If
+   * this field is absent, or the empty map is specified, that indicates that
+   * the normal pubspec.yaml mechanism should always be used.
+   */
+  void set packageRoots(Map<String, String> value) {
+    this._packageRoots = value;
+  }
+
+  AnalysisSetAnalysisRootsParams(List<String> included, List<String> excluded,
+      {Map<String, String> packageRoots}) {
+    this.included = included;
+    this.excluded = excluded;
+    this.packageRoots = packageRoots;
+  }
+
+  factory AnalysisSetAnalysisRootsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
+      List<String> included;
+      if (json.containsKey("included")) {
+        included = jsonDecoder.decodeList(
+            jsonPath + ".included", json["included"], jsonDecoder.decodeString);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
-      }
-      List<Override> overrides;
-      if (json.containsKey("overrides")) {
-        overrides = jsonDecoder.decodeList(
-            jsonPath + ".overrides",
-            json["overrides"],
-            (String jsonPath, Object json) =>
-                new Override.fromJson(jsonDecoder, jsonPath, json));
+        throw jsonDecoder.mismatch(jsonPath, "included");
+      }
+      List<String> excluded;
+      if (json.containsKey("excluded")) {
+        excluded = jsonDecoder.decodeList(
+            jsonPath + ".excluded", json["excluded"], jsonDecoder.decodeString);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "overrides");
-      }
-      return new AnalysisOverridesParams(file, overrides);
+        throw jsonDecoder.mismatch(jsonPath, "excluded");
+      }
+      Map<String, String> packageRoots;
+      if (json.containsKey("packageRoots")) {
+        packageRoots = jsonDecoder.decodeMap(
+            jsonPath + ".packageRoots", json["packageRoots"],
+            valueDecoder: jsonDecoder.decodeString);
+      }
+      return new AnalysisSetAnalysisRootsParams(included, excluded,
+          packageRoots: packageRoots);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.overrides params", json);
-    }
-  }
-
-  factory AnalysisOverridesParams.fromNotification(Notification notification) {
-    return new AnalysisOverridesParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
-  }
-
+      throw jsonDecoder.mismatch(
+          jsonPath, "analysis.setAnalysisRoots params", json);
+    }
+  }
+
+  factory AnalysisSetAnalysisRootsParams.fromRequest(Request request) {
+    return new AnalysisSetAnalysisRootsParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["file"] = file;
-    result["overrides"] =
-        overrides.map((Override value) => value.toJson()).toList();
+    result["included"] = included;
+    result["excluded"] = excluded;
+    if (packageRoots != null) {
+      result["packageRoots"] = packageRoots;
+    }
     return result;
   }
 
-  Notification toNotification() {
-    return new Notification("analysis.overrides", toJson());
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is AnalysisOverridesParams) {
-      return file == other.file &&
-          listEqual(
-              overrides, other.overrides, (Override a, Override b) => a == b);
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, overrides.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * completion.getSuggestions params
- *
- * {
- *   "file": FilePath
- *   "offset": int
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class CompletionGetSuggestionsParams implements HasToJson {
-  String _file;
-
-  int _offset;
-
-  /**
-   * The file containing the point at which suggestions are to be made.
-   */
-  String get file => _file;
-
-  /**
-   * The file containing the point at which suggestions are to be made.
-   */
-  void set file(String value) {
-    assert(value != null);
-    this._file = value;
-  }
-
-  /**
-   * The offset within the file at which suggestions are to be made.
-   */
-  int get offset => _offset;
-
-  /**
-   * The offset within the file at which suggestions are to be made.
-   */
-  void set offset(int value) {
-    assert(value != null);
-    this._offset = value;
-  }
-
-  CompletionGetSuggestionsParams(String file, int offset) {
-    this.file = file;
-    this.offset = offset;
-  }
-
-  factory CompletionGetSuggestionsParams.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
-      }
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
-      }
-      return new CompletionGetSuggestionsParams(file, offset);
-    } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "completion.getSuggestions params", json);
-    }
-  }
-
-  factory CompletionGetSuggestionsParams.fromRequest(Request request) {
-    return new CompletionGetSuggestionsParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["file"] = file;
-    result["offset"] = offset;
-    return result;
-  }
-
+  @override
   Request toRequest(String id) {
-    return new Request(id, "completion.getSuggestions", toJson());
-  }
-
-  @override
+    return new Request(id, "analysis.setAnalysisRoots", toJson());
+  }
+
+  @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is CompletionGetSuggestionsParams) {
-      return file == other.file && offset == other.offset;
+    if (other is AnalysisSetAnalysisRootsParams) {
+      return listEqual(
+              included, other.included, (String a, String b) => a == b) &&
+          listEqual(excluded, other.excluded, (String a, String b) => a == b) &&
+          mapEqual(
+              packageRoots, other.packageRoots, (String a, String b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, included.hashCode);
+    hash = JenkinsSmiHash.combine(hash, excluded.hashCode);
+    hash = JenkinsSmiHash.combine(hash, packageRoots.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * completion.getSuggestions result
+ * analysis.setAnalysisRoots result
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class AnalysisSetAnalysisRootsResult implements ResponseResult {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is AnalysisSetAnalysisRootsResult) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 866004753;
+  }
+}
+
+/**
+ * analysis.setGeneralSubscriptions params
  *
  * {
- *   "id": CompletionId
+ *   "subscriptions": List<GeneralAnalysisService>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class CompletionGetSuggestionsResult implements HasToJson {
-  String _id;
+class AnalysisSetGeneralSubscriptionsParams implements RequestParams {
+  List<GeneralAnalysisService> _subscriptions;
 
   /**
-   * The identifier used to associate results with this completion request.
+   * A list of the services being subscribed to.
    */
-  String get id => _id;
+  List<GeneralAnalysisService> get subscriptions => _subscriptions;
 
   /**
-   * The identifier used to associate results with this completion request.
+   * A list of the services being subscribed to.
    */
-  void set id(String value) {
+  void set subscriptions(List<GeneralAnalysisService> value) {
     assert(value != null);
-    this._id = value;
+    this._subscriptions = value;
   }
 
-  CompletionGetSuggestionsResult(String id) {
-    this.id = id;
+  AnalysisSetGeneralSubscriptionsParams(
+      List<GeneralAnalysisService> subscriptions) {
+    this.subscriptions = subscriptions;
   }
 
-  factory CompletionGetSuggestionsResult.fromJson(
+  factory AnalysisSetGeneralSubscriptionsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String id;
-      if (json.containsKey("id")) {
-        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      List<GeneralAnalysisService> subscriptions;
+      if (json.containsKey("subscriptions")) {
+        subscriptions = jsonDecoder.decodeList(
+            jsonPath + ".subscriptions",
+            json["subscriptions"],
+            (String jsonPath, Object json) =>
+                new GeneralAnalysisService.fromJson(
+                    jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "id");
+        throw jsonDecoder.mismatch(jsonPath, "subscriptions");
       }
-      return new CompletionGetSuggestionsResult(id);
+      return new AnalysisSetGeneralSubscriptionsParams(subscriptions);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "completion.getSuggestions result", json);
+          jsonPath, "analysis.setGeneralSubscriptions params", json);
     }
   }
 
-  factory CompletionGetSuggestionsResult.fromResponse(Response response) {
-    return new CompletionGetSuggestionsResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
+  factory AnalysisSetGeneralSubscriptionsParams.fromRequest(Request request) {
+    return new AnalysisSetGeneralSubscriptionsParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["id"] = id;
+    result["subscriptions"] = subscriptions
+        .map((GeneralAnalysisService value) => value.toJson())
+        .toList();
     return result;
   }
 
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "analysis.setGeneralSubscriptions", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is CompletionGetSuggestionsResult) {
-      return id == other.id;
+    if (other is AnalysisSetGeneralSubscriptionsParams) {
+      return listEqual(subscriptions, other.subscriptions,
+          (GeneralAnalysisService a, GeneralAnalysisService b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, id.hashCode);
+    hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * completion.results params
+ * analysis.setGeneralSubscriptions result
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class AnalysisSetGeneralSubscriptionsResult implements ResponseResult {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is AnalysisSetGeneralSubscriptionsResult) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 386759562;
+  }
+}
+
+/**
+ * analysis.setPriorityFiles params
  *
  * {
- *   "id": CompletionId
- *   "replacementOffset": int
- *   "replacementLength": int
- *   "results": List<CompletionSuggestion>
- *   "isLast": bool
+ *   "files": List<FilePath>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class CompletionResultsParams implements HasToJson {
-  String _id;
-
-  int _replacementOffset;
-
-  int _replacementLength;
-
-  List<CompletionSuggestion> _results;
-
-  bool _isLast;
+class AnalysisSetPriorityFilesParams implements RequestParams {
+  List<String> _files;
 
   /**
-   * The id associated with the completion.
+   * The files that are to be a priority for analysis.
    */
-  String get id => _id;
+  List<String> get files => _files;
 
   /**
-   * The id associated with the completion.
+   * The files that are to be a priority for analysis.
    */
-  void set id(String value) {
+  void set files(List<String> value) {
     assert(value != null);
-    this._id = value;
+    this._files = value;
   }
 
-  /**
-   * The offset of the start of the text to be replaced. This will be different
-   * than the offset used to request the completion suggestions if there was a
-   * portion of an identifier before the original offset. In particular, the
-   * replacementOffset will be the offset of the beginning of said identifier.
-   */
-  int get replacementOffset => _replacementOffset;
-
-  /**
-   * The offset of the start of the text to be replaced. This will be different
-   * than the offset used to request the completion suggestions if there was a
-   * portion of an identifier before the original offset. In particular, the
-   * replacementOffset will be the offset of the beginning of said identifier.
-   */
-  void set replacementOffset(int value) {
-    assert(value != null);
-    this._replacementOffset = value;
+  AnalysisSetPriorityFilesParams(List<String> files) {
+    this.files = files;
   }
 
-  /**
-   * The length of the text to be replaced if the remainder of the identifier
-   * containing the cursor is to be replaced when the suggestion is applied
-   * (that is, the number of characters in the existing identifier).
-   */
-  int get replacementLength => _replacementLength;
-
-  /**
-   * The length of the text to be replaced if the remainder of the identifier
-   * containing the cursor is to be replaced when the suggestion is applied
-   * (that is, the number of characters in the existing identifier).
-   */
-  void set replacementLength(int value) {
-    assert(value != null);
-    this._replacementLength = value;
-  }
-
-  /**
-   * The completion suggestions being reported. The notification contains all
-   * possible completions at the requested cursor position, even those that do
-   * not match the characters the user has already typed. This allows the
-   * client to respond to further keystrokes from the user without having to
-   * make additional requests.
-   */
-  List<CompletionSuggestion> get results => _results;
-
-  /**
-   * The completion suggestions being reported. The notification contains all
-   * possible completions at the requested cursor position, even those that do
-   * not match the characters the user has already typed. This allows the
-   * client to respond to further keystrokes from the user without having to
-   * make additional requests.
-   */
-  void set results(List<CompletionSuggestion> value) {
-    assert(value != null);
-    this._results = value;
-  }
-
-  /**
-   * True if this is that last set of results that will be returned for the
-   * indicated completion.
-   */
-  bool get isLast => _isLast;
-
-  /**
-   * True if this is that last set of results that will be returned for the
-   * indicated completion.
-   */
-  void set isLast(bool value) {
-    assert(value != null);
-    this._isLast = value;
-  }
-
-  CompletionResultsParams(String id, int replacementOffset,
-      int replacementLength, List<CompletionSuggestion> results, bool isLast) {
-    this.id = id;
-    this.replacementOffset = replacementOffset;
-    this.replacementLength = replacementLength;
-    this.results = results;
-    this.isLast = isLast;
-  }
-
-  factory CompletionResultsParams.fromJson(
+  factory AnalysisSetPriorityFilesParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String id;
-      if (json.containsKey("id")) {
-        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      List<String> files;
+      if (json.containsKey("files")) {
+        files = jsonDecoder.decodeList(
+            jsonPath + ".files", json["files"], jsonDecoder.decodeString);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "id");
+        throw jsonDecoder.mismatch(jsonPath, "files");
       }
-      int replacementOffset;
-      if (json.containsKey("replacementOffset")) {
-        replacementOffset = jsonDecoder.decodeInt(
-            jsonPath + ".replacementOffset", json["replacementOffset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "replacementOffset");
-      }
-      int replacementLength;
-      if (json.containsKey("replacementLength")) {
-        replacementLength = jsonDecoder.decodeInt(
-            jsonPath + ".replacementLength", json["replacementLength"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "replacementLength");
-      }
-      List<CompletionSuggestion> results;
-      if (json.containsKey("results")) {
-        results = jsonDecoder.decodeList(
-            jsonPath + ".results",
-            json["results"],
-            (String jsonPath, Object json) =>
-                new CompletionSuggestion.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "results");
-      }
-      bool isLast;
-      if (json.containsKey("isLast")) {
-        isLast = jsonDecoder.decodeBool(jsonPath + ".isLast", json["isLast"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "isLast");
-      }
-      return new CompletionResultsParams(
-          id, replacementOffset, replacementLength, results, isLast);
+      return new AnalysisSetPriorityFilesParams(files);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "completion.results params", json);
+      throw jsonDecoder.mismatch(
+          jsonPath, "analysis.setPriorityFiles params", json);
     }
   }
 
-  factory CompletionResultsParams.fromNotification(Notification notification) {
-    return new CompletionResultsParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
+  factory AnalysisSetPriorityFilesParams.fromRequest(Request request) {
+    return new AnalysisSetPriorityFilesParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["id"] = id;
-    result["replacementOffset"] = replacementOffset;
-    result["replacementLength"] = replacementLength;
-    result["results"] =
-        results.map((CompletionSuggestion value) => value.toJson()).toList();
-    result["isLast"] = isLast;
+    result["files"] = files;
     return result;
   }
 
-  Notification toNotification() {
-    return new Notification("completion.results", toJson());
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "analysis.setPriorityFiles", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is CompletionResultsParams) {
-      return id == other.id &&
-          replacementOffset == other.replacementOffset &&
-          replacementLength == other.replacementLength &&
-          listEqual(results, other.results,
-              (CompletionSuggestion a, CompletionSuggestion b) => a == b) &&
-          isLast == other.isLast;
+    if (other is AnalysisSetPriorityFilesParams) {
+      return listEqual(files, other.files, (String a, String b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, id.hashCode);
-    hash = JenkinsSmiHash.combine(hash, replacementOffset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, replacementLength.hashCode);
-    hash = JenkinsSmiHash.combine(hash, results.hashCode);
-    hash = JenkinsSmiHash.combine(hash, isLast.hashCode);
+    hash = JenkinsSmiHash.combine(hash, files.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * search.findElementReferences params
+ * analysis.setPriorityFiles result
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class AnalysisSetPriorityFilesResult implements ResponseResult {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is AnalysisSetPriorityFilesResult) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 330050055;
+  }
+}
+
+/**
+ * analysis.setSubscriptions params
  *
  * {
- *   "file": FilePath
- *   "offset": int
- *   "includePotential": bool
+ *   "subscriptions": Map<AnalysisService, List<FilePath>>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class SearchFindElementReferencesParams implements HasToJson {
-  String _file;
-
-  int _offset;
-
-  bool _includePotential;
+class AnalysisSetSubscriptionsParams implements RequestParams {
+  Map<AnalysisService, List<String>> _subscriptions;
 
   /**
-   * The file containing the declaration of or reference to the element used to
-   * define the search.
+   * A table mapping services to a list of the files being subscribed to the
+   * service.
    */
-  String get file => _file;
+  Map<AnalysisService, List<String>> get subscriptions => _subscriptions;
 
   /**
-   * The file containing the declaration of or reference to the element used to
-   * define the search.
+   * A table mapping services to a list of the files being subscribed to the
+   * service.
    */
-  void set file(String value) {
+  void set subscriptions(Map<AnalysisService, List<String>> value) {
     assert(value != null);
-    this._file = value;
+    this._subscriptions = value;
   }
 
-  /**
-   * The offset within the file of the declaration of or reference to the
-   * element.
-   */
-  int get offset => _offset;
-
-  /**
-   * The offset within the file of the declaration of or reference to the
-   * element.
-   */
-  void set offset(int value) {
-    assert(value != null);
-    this._offset = value;
+  AnalysisSetSubscriptionsParams(
+      Map<AnalysisService, List<String>> subscriptions) {
+    this.subscriptions = subscriptions;
   }
 
-  /**
-   * True if potential matches are to be included in the results.
-   */
-  bool get includePotential => _includePotential;
-
-  /**
-   * True if potential matches are to be included in the results.
-   */
-  void set includePotential(bool value) {
-    assert(value != null);
-    this._includePotential = value;
-  }
-
-  SearchFindElementReferencesParams(
-      String file, int offset, bool includePotential) {
-    this.file = file;
-    this.offset = offset;
-    this.includePotential = includePotential;
-  }
-
-  factory SearchFindElementReferencesParams.fromJson(
+  factory AnalysisSetSubscriptionsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
+      Map<AnalysisService, List<String>> subscriptions;
+      if (json.containsKey("subscriptions")) {
+        subscriptions = jsonDecoder.decodeMap(
+            jsonPath + ".subscriptions", json["subscriptions"],
+            keyDecoder: (String jsonPath, Object json) =>
+                new AnalysisService.fromJson(jsonDecoder, jsonPath, json),
+            valueDecoder: (String jsonPath, Object json) => jsonDecoder
+                .decodeList(jsonPath, json, jsonDecoder.decodeString));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "subscriptions");
       }
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
-      }
-      bool includePotential;
-      if (json.containsKey("includePotential")) {
-        includePotential = jsonDecoder.decodeBool(
-            jsonPath + ".includePotential", json["includePotential"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "includePotential");
-      }
-      return new SearchFindElementReferencesParams(
-          file, offset, includePotential);
+      return new AnalysisSetSubscriptionsParams(subscriptions);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "search.findElementReferences params", json);
+          jsonPath, "analysis.setSubscriptions params", json);
     }
   }
 
-  factory SearchFindElementReferencesParams.fromRequest(Request request) {
-    return new SearchFindElementReferencesParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory AnalysisSetSubscriptionsParams.fromRequest(Request request) {
+    return new AnalysisSetSubscriptionsParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["file"] = file;
-    result["offset"] = offset;
-    result["includePotential"] = includePotential;
+    result["subscriptions"] = mapMap(subscriptions,
+        keyCallback: (AnalysisService value) => value.toJson());
     return result;
   }
 
+  @override
   Request toRequest(String id) {
-    return new Request(id, "search.findElementReferences", toJson());
+    return new Request(id, "analysis.setSubscriptions", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is SearchFindElementReferencesParams) {
-      return file == other.file &&
-          offset == other.offset &&
-          includePotential == other.includePotential;
+    if (other is AnalysisSetSubscriptionsParams) {
+      return mapEqual(
+          subscriptions,
+          other.subscriptions,
+          (List<String> a, List<String> b) =>
+              listEqual(a, b, (String a, String b) => a == b));
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, includePotential.hashCode);
+    hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * search.findElementReferences result
+ * analysis.setSubscriptions result
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class AnalysisSetSubscriptionsResult implements ResponseResult {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is AnalysisSetSubscriptionsResult) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 218088493;
+  }
+}
+
+/**
+ * AnalysisStatus
  *
  * {
- *   "id": optional SearchId
- *   "element": optional Element
+ *   "isAnalyzing": bool
+ *   "analysisTarget": optional String
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class SearchFindElementReferencesResult implements HasToJson {
-  String _id;
+class AnalysisStatus implements HasToJson {
+  bool _isAnalyzing;
 
-  Element _element;
+  String _analysisTarget;
 
   /**
-   * The identifier used to associate results with this search request.
-   *
-   * If no element was found at the given location, this field will be absent,
-   * and no results will be reported via the search.results notification.
+   * True if analysis is currently being performed.
    */
-  String get id => _id;
+  bool get isAnalyzing => _isAnalyzing;
 
   /**
-   * The identifier used to associate results with this search request.
-   *
-   * If no element was found at the given location, this field will be absent,
-   * and no results will be reported via the search.results notification.
+   * True if analysis is currently being performed.
    */
-  void set id(String value) {
-    this._id = value;
+  void set isAnalyzing(bool value) {
+    assert(value != null);
+    this._isAnalyzing = value;
   }
 
   /**
-   * The element referenced or defined at the given offset and whose references
-   * will be returned in the search results.
-   *
-   * If no element was found at the given location, this field will be absent.
+   * The name of the current target of analysis. This field is omitted if
+   * analyzing is false.
    */
-  Element get element => _element;
+  String get analysisTarget => _analysisTarget;
 
   /**
-   * The element referenced or defined at the given offset and whose references
-   * will be returned in the search results.
-   *
-   * If no element was found at the given location, this field will be absent.
+   * The name of the current target of analysis. This field is omitted if
+   * analyzing is false.
    */
-  void set element(Element value) {
-    this._element = value;
+  void set analysisTarget(String value) {
+    this._analysisTarget = value;
   }
 
-  SearchFindElementReferencesResult({String id, Element element}) {
-    this.id = id;
-    this.element = element;
+  AnalysisStatus(bool isAnalyzing, {String analysisTarget}) {
+    this.isAnalyzing = isAnalyzing;
+    this.analysisTarget = analysisTarget;
   }
 
-  factory SearchFindElementReferencesResult.fromJson(
+  factory AnalysisStatus.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String id;
-      if (json.containsKey("id")) {
-        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      bool isAnalyzing;
+      if (json.containsKey("isAnalyzing")) {
+        isAnalyzing = jsonDecoder.decodeBool(
+            jsonPath + ".isAnalyzing", json["isAnalyzing"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "isAnalyzing");
       }
-      Element element;
-      if (json.containsKey("element")) {
-        element = new Element.fromJson(
-            jsonDecoder, jsonPath + ".element", json["element"]);
+      String analysisTarget;
+      if (json.containsKey("analysisTarget")) {
+        analysisTarget = jsonDecoder.decodeString(
+            jsonPath + ".analysisTarget", json["analysisTarget"]);
       }
-      return new SearchFindElementReferencesResult(id: id, element: element);
+      return new AnalysisStatus(isAnalyzing, analysisTarget: analysisTarget);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "search.findElementReferences result", json);
+      throw jsonDecoder.mismatch(jsonPath, "AnalysisStatus", json);
     }
   }
 
-  factory SearchFindElementReferencesResult.fromResponse(Response response) {
-    return new SearchFindElementReferencesResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
-  }
-
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    if (id != null) {
-      result["id"] = id;
-    }
-    if (element != null) {
-      result["element"] = element.toJson();
+    result["isAnalyzing"] = isAnalyzing;
+    if (analysisTarget != null) {
+      result["analysisTarget"] = analysisTarget;
     }
     return result;
   }
 
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
-  }
-
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is SearchFindElementReferencesResult) {
-      return id == other.id && element == other.element;
+    if (other is AnalysisStatus) {
+      return isAnalyzing == other.isAnalyzing &&
+          analysisTarget == other.analysisTarget;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, id.hashCode);
-    hash = JenkinsSmiHash.combine(hash, element.hashCode);
+    hash = JenkinsSmiHash.combine(hash, isAnalyzing.hashCode);
+    hash = JenkinsSmiHash.combine(hash, analysisTarget.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * search.findMemberDeclarations params
+ * analysis.updateContent params
  *
  * {
- *   "name": String
+ *   "files": Map<FilePath, AddContentOverlay | ChangeContentOverlay | RemoveContentOverlay>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class SearchFindMemberDeclarationsParams implements HasToJson {
-  String _name;
+class AnalysisUpdateContentParams implements RequestParams {
+  Map<String, dynamic> _files;
 
   /**
-   * The name of the declarations to be found.
+   * A table mapping the files whose content has changed to a description of
+   * the content change.
    */
-  String get name => _name;
+  Map<String, dynamic> get files => _files;
 
   /**
-   * The name of the declarations to be found.
+   * A table mapping the files whose content has changed to a description of
+   * the content change.
    */
-  void set name(String value) {
+  void set files(Map<String, dynamic> value) {
     assert(value != null);
-    this._name = value;
+    this._files = value;
   }
 
-  SearchFindMemberDeclarationsParams(String name) {
-    this.name = name;
+  AnalysisUpdateContentParams(Map<String, dynamic> files) {
+    this.files = files;
   }
 
-  factory SearchFindMemberDeclarationsParams.fromJson(
+  factory AnalysisUpdateContentParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String name;
-      if (json.containsKey("name")) {
-        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
+      Map<String, dynamic> files;
+      if (json.containsKey("files")) {
+        files = jsonDecoder.decodeMap(jsonPath + ".files", json["files"],
+            valueDecoder: (String jsonPath, Object json) =>
+                jsonDecoder.decodeUnion(jsonPath, json, "type", {
+                  "add": (String jsonPath, Object json) =>
+                      new AddContentOverlay.fromJson(
+                          jsonDecoder, jsonPath, json),
+                  "change": (String jsonPath, Object json) =>
+                      new ChangeContentOverlay.fromJson(
+                          jsonDecoder, jsonPath, json),
+                  "remove": (String jsonPath, Object json) =>
+                      new RemoveContentOverlay.fromJson(
+                          jsonDecoder, jsonPath, json)
+                }));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "name");
+        throw jsonDecoder.mismatch(jsonPath, "files");
       }
-      return new SearchFindMemberDeclarationsParams(name);
+      return new AnalysisUpdateContentParams(files);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "search.findMemberDeclarations params", json);
+          jsonPath, "analysis.updateContent params", json);
     }
   }
 
-  factory SearchFindMemberDeclarationsParams.fromRequest(Request request) {
-    return new SearchFindMemberDeclarationsParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory AnalysisUpdateContentParams.fromRequest(Request request) {
+    return new AnalysisUpdateContentParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["name"] = name;
+    result["files"] =
+        mapMap(files, valueCallback: (dynamic value) => value.toJson());
     return result;
   }
 
+  @override
   Request toRequest(String id) {
-    return new Request(id, "search.findMemberDeclarations", toJson());
+    return new Request(id, "analysis.updateContent", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is SearchFindMemberDeclarationsParams) {
-      return name == other.name;
+    if (other is AnalysisUpdateContentParams) {
+      return mapEqual(files, other.files, (dynamic a, dynamic b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, name.hashCode);
+    hash = JenkinsSmiHash.combine(hash, files.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * search.findMemberDeclarations result
+ * analysis.updateContent result
  *
  * {
- *   "id": SearchId
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class SearchFindMemberDeclarationsResult implements HasToJson {
-  String _id;
+class AnalysisUpdateContentResult implements ResponseResult {
+  AnalysisUpdateContentResult();
 
-  /**
-   * The identifier used to associate results with this search request.
-   */
-  String get id => _id;
-
-  /**
-   * The identifier used to associate results with this search request.
-   */
-  void set id(String value) {
-    assert(value != null);
-    this._id = value;
-  }
-
-  SearchFindMemberDeclarationsResult(String id) {
-    this.id = id;
-  }
-
-  factory SearchFindMemberDeclarationsResult.fromJson(
+  factory AnalysisUpdateContentResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String id;
-      if (json.containsKey("id")) {
-        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "id");
-      }
-      return new SearchFindMemberDeclarationsResult(id);
+      return new AnalysisUpdateContentResult();
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "search.findMemberDeclarations result", json);
+          jsonPath, "analysis.updateContent result", json);
     }
   }
 
-  factory SearchFindMemberDeclarationsResult.fromResponse(Response response) {
-    return new SearchFindMemberDeclarationsResult.fromJson(
+  factory AnalysisUpdateContentResult.fromResponse(Response response) {
+    return new AnalysisUpdateContentResult.fromJson(
         new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
         "result",
-        response._result);
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["id"] = id;
     return result;
   }
 
+  @override
   Response toResponse(String id) {
     return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is SearchFindMemberDeclarationsResult) {
-      return id == other.id;
+    if (other is AnalysisUpdateContentResult) {
+      return true;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, id.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * search.findMemberReferences params
+ * analysis.updateOptions params
  *
  * {
- *   "name": String
+ *   "options": AnalysisOptions
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class SearchFindMemberReferencesParams implements HasToJson {
-  String _name;
+class AnalysisUpdateOptionsParams implements RequestParams {
+  AnalysisOptions _options;
 
   /**
-   * The name of the references to be found.
+   * The options that are to be used to control analysis.
    */
-  String get name => _name;
+  AnalysisOptions get options => _options;
 
   /**
-   * The name of the references to be found.
+   * The options that are to be used to control analysis.
    */
-  void set name(String value) {
+  void set options(AnalysisOptions value) {
     assert(value != null);
-    this._name = value;
+    this._options = value;
   }
 
-  SearchFindMemberReferencesParams(String name) {
-    this.name = name;
+  AnalysisUpdateOptionsParams(AnalysisOptions options) {
+    this.options = options;
   }
 
-  factory SearchFindMemberReferencesParams.fromJson(
+  factory AnalysisUpdateOptionsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String name;
-      if (json.containsKey("name")) {
-        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
+      AnalysisOptions options;
+      if (json.containsKey("options")) {
+        options = new AnalysisOptions.fromJson(
+            jsonDecoder, jsonPath + ".options", json["options"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "name");
+        throw jsonDecoder.mismatch(jsonPath, "options");
       }
-      return new SearchFindMemberReferencesParams(name);
+      return new AnalysisUpdateOptionsParams(options);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "search.findMemberReferences params", json);
+          jsonPath, "analysis.updateOptions params", json);
     }
   }
 
-  factory SearchFindMemberReferencesParams.fromRequest(Request request) {
-    return new SearchFindMemberReferencesParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory AnalysisUpdateOptionsParams.fromRequest(Request request) {
+    return new AnalysisUpdateOptionsParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["name"] = name;
+    result["options"] = options.toJson();
     return result;
   }
 
+  @override
   Request toRequest(String id) {
-    return new Request(id, "search.findMemberReferences", toJson());
+    return new Request(id, "analysis.updateOptions", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is SearchFindMemberReferencesParams) {
-      return name == other.name;
+    if (other is AnalysisUpdateOptionsParams) {
+      return options == other.options;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, name.hashCode);
+    hash = JenkinsSmiHash.combine(hash, options.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * search.findMemberReferences result
+ * analysis.updateOptions result
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class AnalysisUpdateOptionsResult implements ResponseResult {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is AnalysisUpdateOptionsResult) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 179689467;
+  }
+}
+
+/**
+ * ChangeContentOverlay
  *
  * {
- *   "id": SearchId
+ *   "type": "change"
+ *   "edits": List<SourceEdit>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class SearchFindMemberReferencesResult implements HasToJson {
-  String _id;
+class ChangeContentOverlay implements HasToJson {
+  List<SourceEdit> _edits;
 
   /**
-   * The identifier used to associate results with this search request.
+   * The edits to be applied to the file.
    */
-  String get id => _id;
+  List<SourceEdit> get edits => _edits;
 
   /**
-   * The identifier used to associate results with this search request.
+   * The edits to be applied to the file.
    */
-  void set id(String value) {
+  void set edits(List<SourceEdit> value) {
     assert(value != null);
-    this._id = value;
+    this._edits = value;
   }
 
-  SearchFindMemberReferencesResult(String id) {
-    this.id = id;
+  ChangeContentOverlay(List<SourceEdit> edits) {
+    this.edits = edits;
   }
 
-  factory SearchFindMemberReferencesResult.fromJson(
+  factory ChangeContentOverlay.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String id;
-      if (json.containsKey("id")) {
-        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      if (json["type"] != "change") {
+        throw jsonDecoder.mismatch(jsonPath, "equal " + "change", json);
+      }
+      List<SourceEdit> edits;
+      if (json.containsKey("edits")) {
+        edits = jsonDecoder.decodeList(
+            jsonPath + ".edits",
+            json["edits"],
+            (String jsonPath, Object json) =>
+                new SourceEdit.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "id");
+        throw jsonDecoder.mismatch(jsonPath, "edits");
       }
-      return new SearchFindMemberReferencesResult(id);
+      return new ChangeContentOverlay(edits);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "search.findMemberReferences result", json);
+      throw jsonDecoder.mismatch(jsonPath, "ChangeContentOverlay", json);
     }
   }
 
-  factory SearchFindMemberReferencesResult.fromResponse(Response response) {
-    return new SearchFindMemberReferencesResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
-  }
-
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["id"] = id;
+    result["type"] = "change";
+    result["edits"] = edits.map((SourceEdit value) => value.toJson()).toList();
     return result;
   }
 
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
-  }
-
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is SearchFindMemberReferencesResult) {
-      return id == other.id;
+    if (other is ChangeContentOverlay) {
+      return listEqual(
+          edits, other.edits, (SourceEdit a, SourceEdit b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, id.hashCode);
+    hash = JenkinsSmiHash.combine(hash, 873118866);
+    hash = JenkinsSmiHash.combine(hash, edits.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * search.findTopLevelDeclarations params
+ * completion.getSuggestions params
  *
  * {
- *   "pattern": String
+ *   "file": FilePath
+ *   "offset": int
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class SearchFindTopLevelDeclarationsParams implements HasToJson {
-  String _pattern;
+class CompletionGetSuggestionsParams implements RequestParams {
+  String _file;
+
+  int _offset;
 
   /**
-   * The regular expression used to match the names of the declarations to be
-   * found.
+   * The file containing the point at which suggestions are to be made.
    */
-  String get pattern => _pattern;
+  String get file => _file;
 
   /**
-   * The regular expression used to match the names of the declarations to be
-   * found.
+   * The file containing the point at which suggestions are to be made.
    */
-  void set pattern(String value) {
+  void set file(String value) {
     assert(value != null);
-    this._pattern = value;
+    this._file = value;
   }
 
-  SearchFindTopLevelDeclarationsParams(String pattern) {
-    this.pattern = pattern;
+  /**
+   * The offset within the file at which suggestions are to be made.
+   */
+  int get offset => _offset;
+
+  /**
+   * The offset within the file at which suggestions are to be made.
+   */
+  void set offset(int value) {
+    assert(value != null);
+    this._offset = value;
   }
 
-  factory SearchFindTopLevelDeclarationsParams.fromJson(
+  CompletionGetSuggestionsParams(String file, int offset) {
+    this.file = file;
+    this.offset = offset;
+  }
+
+  factory CompletionGetSuggestionsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String pattern;
-      if (json.containsKey("pattern")) {
-        pattern =
-            jsonDecoder.decodeString(jsonPath + ".pattern", json["pattern"]);
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "pattern");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      return new SearchFindTopLevelDeclarationsParams(pattern);
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offset");
+      }
+      return new CompletionGetSuggestionsParams(file, offset);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "search.findTopLevelDeclarations params", json);
+          jsonPath, "completion.getSuggestions params", json);
     }
   }
 
-  factory SearchFindTopLevelDeclarationsParams.fromRequest(Request request) {
-    return new SearchFindTopLevelDeclarationsParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory CompletionGetSuggestionsParams.fromRequest(Request request) {
+    return new CompletionGetSuggestionsParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["pattern"] = pattern;
+    result["file"] = file;
+    result["offset"] = offset;
     return result;
   }
 
+  @override
   Request toRequest(String id) {
-    return new Request(id, "search.findTopLevelDeclarations", toJson());
+    return new Request(id, "completion.getSuggestions", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is SearchFindTopLevelDeclarationsParams) {
-      return pattern == other.pattern;
+    if (other is CompletionGetSuggestionsParams) {
+      return file == other.file && offset == other.offset;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, pattern.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * search.findTopLevelDeclarations result
+ * completion.getSuggestions result
  *
  * {
- *   "id": SearchId
+ *   "id": CompletionId
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class SearchFindTopLevelDeclarationsResult implements HasToJson {
+class CompletionGetSuggestionsResult implements ResponseResult {
   String _id;
 
   /**
-   * The identifier used to associate results with this search request.
+   * The identifier used to associate results with this completion request.
    */
   String get id => _id;
 
   /**
-   * The identifier used to associate results with this search request.
+   * The identifier used to associate results with this completion request.
    */
   void set id(String value) {
     assert(value != null);
     this._id = value;
   }
 
-  SearchFindTopLevelDeclarationsResult(String id) {
+  CompletionGetSuggestionsResult(String id) {
     this.id = id;
   }
 
-  factory SearchFindTopLevelDeclarationsResult.fromJson(
+  factory CompletionGetSuggestionsResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       String id;
       if (json.containsKey("id")) {
         id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "id");
+        throw jsonDecoder.mismatch(jsonPath, "id");
       }
-      return new SearchFindTopLevelDeclarationsResult(id);
+      return new CompletionGetSuggestionsResult(id);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "search.findTopLevelDeclarations result", json);
+          jsonPath, "completion.getSuggestions result", json);
     }
   }
 
-  factory SearchFindTopLevelDeclarationsResult.fromResponse(Response response) {
-    return new SearchFindTopLevelDeclarationsResult.fromJson(
+  factory CompletionGetSuggestionsResult.fromResponse(Response response) {
+    return new CompletionGetSuggestionsResult.fromJson(
         new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
         "result",
-        response._result);
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["id"] = id;
     return result;
   }
 
+  @override
   Response toResponse(String id) {
     return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is SearchFindTopLevelDeclarationsResult) {
+    if (other is CompletionGetSuggestionsResult) {
       return id == other.id;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, id.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * search.getTypeHierarchy params
+ * completion.results params
  *
  * {
- *   "file": FilePath
- *   "offset": int
- *   "superOnly": optional bool
+ *   "id": CompletionId
+ *   "replacementOffset": int
+ *   "replacementLength": int
+ *   "results": List<CompletionSuggestion>
+ *   "isLast": bool
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class SearchGetTypeHierarchyParams implements HasToJson {
-  String _file;
+class CompletionResultsParams implements HasToJson {
+  String _id;
 
-  int _offset;
+  int _replacementOffset;
 
-  bool _superOnly;
+  int _replacementLength;
+
+  List<CompletionSuggestion> _results;
+
+  bool _isLast;
 
   /**
-   * The file containing the declaration or reference to the type for which a
-   * hierarchy is being requested.
+   * The id associated with the completion.
    */
-  String get file => _file;
+  String get id => _id;
 
   /**
-   * The file containing the declaration or reference to the type for which a
-   * hierarchy is being requested.
+   * The id associated with the completion.
    */
-  void set file(String value) {
+  void set id(String value) {
     assert(value != null);
-    this._file = value;
+    this._id = value;
   }
 
   /**
-   * The offset of the name of the type within the file.
+   * The offset of the start of the text to be replaced. This will be different
+   * than the offset used to request the completion suggestions if there was a
+   * portion of an identifier before the original offset. In particular, the
+   * replacementOffset will be the offset of the beginning of said identifier.
    */
-  int get offset => _offset;
+  int get replacementOffset => _replacementOffset;
 
   /**
-   * The offset of the name of the type within the file.
+   * The offset of the start of the text to be replaced. This will be different
+   * than the offset used to request the completion suggestions if there was a
+   * portion of an identifier before the original offset. In particular, the
+   * replacementOffset will be the offset of the beginning of said identifier.
    */
-  void set offset(int value) {
+  void set replacementOffset(int value) {
     assert(value != null);
-    this._offset = value;
+    this._replacementOffset = value;
   }
 
   /**
-   * True if the client is only requesting superclasses and interfaces
-   * hierarchy.
+   * The length of the text to be replaced if the remainder of the identifier
+   * containing the cursor is to be replaced when the suggestion is applied
+   * (that is, the number of characters in the existing identifier).
    */
-  bool get superOnly => _superOnly;
+  int get replacementLength => _replacementLength;
 
   /**
-   * True if the client is only requesting superclasses and interfaces
-   * hierarchy.
+   * The length of the text to be replaced if the remainder of the identifier
+   * containing the cursor is to be replaced when the suggestion is applied
+   * (that is, the number of characters in the existing identifier).
    */
-  void set superOnly(bool value) {
-    this._superOnly = value;
+  void set replacementLength(int value) {
+    assert(value != null);
+    this._replacementLength = value;
   }
 
-  SearchGetTypeHierarchyParams(String file, int offset, {bool superOnly}) {
-    this.file = file;
-    this.offset = offset;
-    this.superOnly = superOnly;
+  /**
+   * The completion suggestions being reported. The notification contains all
+   * possible completions at the requested cursor position, even those that do
+   * not match the characters the user has already typed. This allows the
+   * client to respond to further keystrokes from the user without having to
+   * make additional requests.
+   */
+  List<CompletionSuggestion> get results => _results;
+
+  /**
+   * The completion suggestions being reported. The notification contains all
+   * possible completions at the requested cursor position, even those that do
+   * not match the characters the user has already typed. This allows the
+   * client to respond to further keystrokes from the user without having to
+   * make additional requests.
+   */
+  void set results(List<CompletionSuggestion> value) {
+    assert(value != null);
+    this._results = value;
   }
 
-  factory SearchGetTypeHierarchyParams.fromJson(
+  /**
+   * True if this is that last set of results that will be returned for the
+   * indicated completion.
+   */
+  bool get isLast => _isLast;
+
+  /**
+   * True if this is that last set of results that will be returned for the
+   * indicated completion.
+   */
+  void set isLast(bool value) {
+    assert(value != null);
+    this._isLast = value;
+  }
+
+  CompletionResultsParams(String id, int replacementOffset,
+      int replacementLength, List<CompletionSuggestion> results, bool isLast) {
+    this.id = id;
+    this.replacementOffset = replacementOffset;
+    this.replacementLength = replacementLength;
+    this.results = results;
+    this.isLast = isLast;
+  }
+
+  factory CompletionResultsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
+      String id;
+      if (json.containsKey("id")) {
+        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "id");
       }
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      int replacementOffset;
+      if (json.containsKey("replacementOffset")) {
+        replacementOffset = jsonDecoder.decodeInt(
+            jsonPath + ".replacementOffset", json["replacementOffset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
+        throw jsonDecoder.mismatch(jsonPath, "replacementOffset");
       }
-      bool superOnly;
-      if (json.containsKey("superOnly")) {
-        superOnly =
-            jsonDecoder.decodeBool(jsonPath + ".superOnly", json["superOnly"]);
+      int replacementLength;
+      if (json.containsKey("replacementLength")) {
+        replacementLength = jsonDecoder.decodeInt(
+            jsonPath + ".replacementLength", json["replacementLength"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "replacementLength");
       }
-      return new SearchGetTypeHierarchyParams(file, offset,
-          superOnly: superOnly);
+      List<CompletionSuggestion> results;
+      if (json.containsKey("results")) {
+        results = jsonDecoder.decodeList(
+            jsonPath + ".results",
+            json["results"],
+            (String jsonPath, Object json) =>
+                new CompletionSuggestion.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "results");
+      }
+      bool isLast;
+      if (json.containsKey("isLast")) {
+        isLast = jsonDecoder.decodeBool(jsonPath + ".isLast", json["isLast"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "isLast");
+      }
+      return new CompletionResultsParams(
+          id, replacementOffset, replacementLength, results, isLast);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "search.getTypeHierarchy params", json);
+      throw jsonDecoder.mismatch(jsonPath, "completion.results params", json);
     }
   }
 
-  factory SearchGetTypeHierarchyParams.fromRequest(Request request) {
-    return new SearchGetTypeHierarchyParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory CompletionResultsParams.fromNotification(Notification notification) {
+    return new CompletionResultsParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["file"] = file;
-    result["offset"] = offset;
-    if (superOnly != null) {
-      result["superOnly"] = superOnly;
-    }
+    result["id"] = id;
+    result["replacementOffset"] = replacementOffset;
+    result["replacementLength"] = replacementLength;
+    result["results"] =
+        results.map((CompletionSuggestion value) => value.toJson()).toList();
+    result["isLast"] = isLast;
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "search.getTypeHierarchy", toJson());
+  Notification toNotification() {
+    return new Notification("completion.results", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is SearchGetTypeHierarchyParams) {
-      return file == other.file &&
-          offset == other.offset &&
-          superOnly == other.superOnly;
+    if (other is CompletionResultsParams) {
+      return id == other.id &&
+          replacementOffset == other.replacementOffset &&
+          replacementLength == other.replacementLength &&
+          listEqual(results, other.results,
+              (CompletionSuggestion a, CompletionSuggestion b) => a == b) &&
+          isLast == other.isLast;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, superOnly.hashCode);
+    hash = JenkinsSmiHash.combine(hash, id.hashCode);
+    hash = JenkinsSmiHash.combine(hash, replacementOffset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, replacementLength.hashCode);
+    hash = JenkinsSmiHash.combine(hash, results.hashCode);
+    hash = JenkinsSmiHash.combine(hash, isLast.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * search.getTypeHierarchy result
+ * CompletionSuggestion
  *
  * {
- *   "hierarchyItems": optional List<TypeHierarchyItem>
+ *   "kind": CompletionSuggestionKind
+ *   "relevance": int
+ *   "completion": String
+ *   "selectionOffset": int
+ *   "selectionLength": int
+ *   "isDeprecated": bool
+ *   "isPotential": bool
+ *   "docSummary": optional String
+ *   "docComplete": optional String
+ *   "declaringType": optional String
+ *   "defaultArgumentListString": optional String
+ *   "defaultArgumentListTextRanges": optional List<int>
+ *   "element": optional Element
+ *   "returnType": optional String
+ *   "parameterNames": optional List<String>
+ *   "parameterTypes": optional List<String>
+ *   "requiredParameterCount": optional int
+ *   "hasNamedParameters": optional bool
+ *   "parameterName": optional String
+ *   "parameterType": optional String
+ *   "importUri": optional String
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class SearchGetTypeHierarchyResult implements HasToJson {
-  List<TypeHierarchyItem> _hierarchyItems;
-
-  /**
-   * A list of the types in the requested hierarchy. The first element of the
-   * list is the item representing the type for which the hierarchy was
-   * requested. The index of other elements of the list is unspecified, but
-   * correspond to the integers used to reference supertype and subtype items
-   * within the items.
-   *
-   * This field will be absent if the code at the given file and offset does
-   * not represent a type, or if the file has not been sufficiently analyzed to
-   * allow a type hierarchy to be produced.
-   */
-  List<TypeHierarchyItem> get hierarchyItems => _hierarchyItems;
-
-  /**
-   * A list of the types in the requested hierarchy. The first element of the
-   * list is the item representing the type for which the hierarchy was
-   * requested. The index of other elements of the list is unspecified, but
-   * correspond to the integers used to reference supertype and subtype items
-   * within the items.
-   *
-   * This field will be absent if the code at the given file and offset does
-   * not represent a type, or if the file has not been sufficiently analyzed to
-   * allow a type hierarchy to be produced.
-   */
-  void set hierarchyItems(List<TypeHierarchyItem> value) {
-    this._hierarchyItems = value;
-  }
-
-  SearchGetTypeHierarchyResult({List<TypeHierarchyItem> hierarchyItems}) {
-    this.hierarchyItems = hierarchyItems;
-  }
-
-  factory SearchGetTypeHierarchyResult.fromJson(
+class CompletionSuggestion implements HasToJson {
+  CompletionSuggestionKind _kind;
+
+  int _relevance;
+
+  String _completion;
+
+  int _selectionOffset;
+
+  int _selectionLength;
+
+  bool _isDeprecated;
+
+  bool _isPotential;
+
+  String _docSummary;
+
+  String _docComplete;
+
+  String _declaringType;
+
+  String _defaultArgumentListString;
+
+  List<int> _defaultArgumentListTextRanges;
+
+  Element _element;
+
+  String _returnType;
+
+  List<String> _parameterNames;
+
+  List<String> _parameterTypes;
+
+  int _requiredParameterCount;
+
+  bool _hasNamedParameters;
+
+  String _parameterName;
+
+  String _parameterType;
+
+  String _importUri;
+
+  /**
+   * The kind of element being suggested.
+   */
+  CompletionSuggestionKind get kind => _kind;
+
+  /**
+   * The kind of element being suggested.
+   */
+  void set kind(CompletionSuggestionKind value) {
+    assert(value != null);
+    this._kind = value;
+  }
+
+  /**
+   * The relevance of this completion suggestion where a higher number
+   * indicates a higher relevance.
+   */
+  int get relevance => _relevance;
+
+  /**
+   * The relevance of this completion suggestion where a higher number
+   * indicates a higher relevance.
+   */
+  void set relevance(int value) {
+    assert(value != null);
+    this._relevance = value;
+  }
+
+  /**
+   * The identifier to be inserted if the suggestion is selected. If the
+   * suggestion is for a method or function, the client might want to
+   * additionally insert a template for the parameters. The information
+   * required in order to do so is contained in other fields.
+   */
+  String get completion => _completion;
+
+  /**
+   * The identifier to be inserted if the suggestion is selected. If the
+   * suggestion is for a method or function, the client might want to
+   * additionally insert a template for the parameters. The information
+   * required in order to do so is contained in other fields.
+   */
+  void set completion(String value) {
+    assert(value != null);
+    this._completion = value;
+  }
+
+  /**
+   * The offset, relative to the beginning of the completion, of where the
+   * selection should be placed after insertion.
+   */
+  int get selectionOffset => _selectionOffset;
+
+  /**
+   * The offset, relative to the beginning of the completion, of where the
+   * selection should be placed after insertion.
+   */
+  void set selectionOffset(int value) {
+    assert(value != null);
+    this._selectionOffset = value;
+  }
+
+  /**
+   * The number of characters that should be selected after insertion.
+   */
+  int get selectionLength => _selectionLength;
+
+  /**
+   * The number of characters that should be selected after insertion.
+   */
+  void set selectionLength(int value) {
+    assert(value != null);
+    this._selectionLength = value;
+  }
+
+  /**
+   * True if the suggested element is deprecated.
+   */
+  bool get isDeprecated => _isDeprecated;
+
+  /**
+   * True if the suggested element is deprecated.
+   */
+  void set isDeprecated(bool value) {
+    assert(value != null);
+    this._isDeprecated = value;
+  }
+
+  /**
+   * True if the element is not known to be valid for the target. This happens
+   * if the type of the target is dynamic.
+   */
+  bool get isPotential => _isPotential;
+
+  /**
+   * True if the element is not known to be valid for the target. This happens
+   * if the type of the target is dynamic.
+   */
+  void set isPotential(bool value) {
+    assert(value != null);
+    this._isPotential = value;
+  }
+
+  /**
+   * An abbreviated version of the Dartdoc associated with the element being
+   * suggested, This field is omitted if there is no Dartdoc associated with
+   * the element.
+   */
+  String get docSummary => _docSummary;
+
+  /**
+   * An abbreviated version of the Dartdoc associated with the element being
+   * suggested, This field is omitted if there is no Dartdoc associated with
+   * the element.
+   */
+  void set docSummary(String value) {
+    this._docSummary = value;
+  }
+
+  /**
+   * The Dartdoc associated with the element being suggested, This field is
+   * omitted if there is no Dartdoc associated with the element.
+   */
+  String get docComplete => _docComplete;
+
+  /**
+   * The Dartdoc associated with the element being suggested, This field is
+   * omitted if there is no Dartdoc associated with the element.
+   */
+  void set docComplete(String value) {
+    this._docComplete = value;
+  }
+
+  /**
+   * The class that declares the element being suggested. This field is omitted
+   * if the suggested element is not a member of a class.
+   */
+  String get declaringType => _declaringType;
+
+  /**
+   * The class that declares the element being suggested. This field is omitted
+   * if the suggested element is not a member of a class.
+   */
+  void set declaringType(String value) {
+    this._declaringType = value;
+  }
+
+  /**
+   * A default String for use in generating argument list source contents on
+   * the client side.
+   */
+  String get defaultArgumentListString => _defaultArgumentListString;
+
+  /**
+   * A default String for use in generating argument list source contents on
+   * the client side.
+   */
+  void set defaultArgumentListString(String value) {
+    this._defaultArgumentListString = value;
+  }
+
+  /**
+   * Pairs of offsets and lengths describing 'defaultArgumentListString' text
+   * ranges suitable for use by clients to set up linked edits of default
+   * argument source contents. For example, given an argument list string 'x,
+   * y', the corresponding text range [0, 1, 3, 1], indicates two text ranges
+   * of length 1, starting at offsets 0 and 3. Clients can use these ranges to
+   * treat the 'x' and 'y' values specially for linked edits.
+   */
+  List<int> get defaultArgumentListTextRanges => _defaultArgumentListTextRanges;
+
+  /**
+   * Pairs of offsets and lengths describing 'defaultArgumentListString' text
+   * ranges suitable for use by clients to set up linked edits of default
+   * argument source contents. For example, given an argument list string 'x,
+   * y', the corresponding text range [0, 1, 3, 1], indicates two text ranges
+   * of length 1, starting at offsets 0 and 3. Clients can use these ranges to
+   * treat the 'x' and 'y' values specially for linked edits.
+   */
+  void set defaultArgumentListTextRanges(List<int> value) {
+    this._defaultArgumentListTextRanges = value;
+  }
+
+  /**
+   * Information about the element reference being suggested.
+   */
+  Element get element => _element;
+
+  /**
+   * Information about the element reference being suggested.
+   */
+  void set element(Element value) {
+    this._element = value;
+  }
+
+  /**
+   * The return type of the getter, function or method or the type of the field
+   * being suggested. This field is omitted if the suggested element is not a
+   * getter, function or method.
+   */
+  String get returnType => _returnType;
+
+  /**
+   * The return type of the getter, function or method or the type of the field
+   * being suggested. This field is omitted if the suggested element is not a
+   * getter, function or method.
+   */
+  void set returnType(String value) {
+    this._returnType = value;
+  }
+
+  /**
+   * The names of the parameters of the function or method being suggested.
+   * This field is omitted if the suggested element is not a setter, function
+   * or method.
+   */
+  List<String> get parameterNames => _parameterNames;
+
+  /**
+   * The names of the parameters of the function or method being suggested.
+   * This field is omitted if the suggested element is not a setter, function
+   * or method.
+   */
+  void set parameterNames(List<String> value) {
+    this._parameterNames = value;
+  }
+
+  /**
+   * The types of the parameters of the function or method being suggested.
+   * This field is omitted if the parameterNames field is omitted.
+   */
+  List<String> get parameterTypes => _parameterTypes;
+
+  /**
+   * The types of the parameters of the function or method being suggested.
+   * This field is omitted if the parameterNames field is omitted.
+   */
+  void set parameterTypes(List<String> value) {
+    this._parameterTypes = value;
+  }
+
+  /**
+   * The number of required parameters for the function or method being
+   * suggested. This field is omitted if the parameterNames field is omitted.
+   */
+  int get requiredParameterCount => _requiredParameterCount;
+
+  /**
+   * The number of required parameters for the function or method being
+   * suggested. This field is omitted if the parameterNames field is omitted.
+   */
+  void set requiredParameterCount(int value) {
+    this._requiredParameterCount = value;
+  }
+
+  /**
+   * True if the function or method being suggested has at least one named
+   * parameter. This field is omitted if the parameterNames field is omitted.
+   */
+  bool get hasNamedParameters => _hasNamedParameters;
+
+  /**
+   * True if the function or method being suggested has at least one named
+   * parameter. This field is omitted if the parameterNames field is omitted.
+   */
+  void set hasNamedParameters(bool value) {
+    this._hasNamedParameters = value;
+  }
+
+  /**
+   * The name of the optional parameter being suggested. This field is omitted
+   * if the suggestion is not the addition of an optional argument within an
+   * argument list.
+   */
+  String get parameterName => _parameterName;
+
+  /**
+   * The name of the optional parameter being suggested. This field is omitted
+   * if the suggestion is not the addition of an optional argument within an
+   * argument list.
+   */
+  void set parameterName(String value) {
+    this._parameterName = value;
+  }
+
+  /**
+   * The type of the options parameter being suggested. This field is omitted
+   * if the parameterName field is omitted.
+   */
+  String get parameterType => _parameterType;
+
+  /**
+   * The type of the options parameter being suggested. This field is omitted
+   * if the parameterName field is omitted.
+   */
+  void set parameterType(String value) {
+    this._parameterType = value;
+  }
+
+  /**
+   * The import to be added if the suggestion is out of scope and needs an
+   * import to be added to be in scope.
+   */
+  String get importUri => _importUri;
+
+  /**
+   * The import to be added if the suggestion is out of scope and needs an
+   * import to be added to be in scope.
+   */
+  void set importUri(String value) {
+    this._importUri = value;
+  }
+
+  CompletionSuggestion(
+      CompletionSuggestionKind kind,
+      int relevance,
+      String completion,
+      int selectionOffset,
+      int selectionLength,
+      bool isDeprecated,
+      bool isPotential,
+      {String docSummary,
+      String docComplete,
+      String declaringType,
+      String defaultArgumentListString,
+      List<int> defaultArgumentListTextRanges,
+      Element element,
+      String returnType,
+      List<String> parameterNames,
+      List<String> parameterTypes,
+      int requiredParameterCount,
+      bool hasNamedParameters,
+      String parameterName,
+      String parameterType,
+      String importUri}) {
+    this.kind = kind;
+    this.relevance = relevance;
+    this.completion = completion;
+    this.selectionOffset = selectionOffset;
+    this.selectionLength = selectionLength;
+    this.isDeprecated = isDeprecated;
+    this.isPotential = isPotential;
+    this.docSummary = docSummary;
+    this.docComplete = docComplete;
+    this.declaringType = declaringType;
+    this.defaultArgumentListString = defaultArgumentListString;
+    this.defaultArgumentListTextRanges = defaultArgumentListTextRanges;
+    this.element = element;
+    this.returnType = returnType;
+    this.parameterNames = parameterNames;
+    this.parameterTypes = parameterTypes;
+    this.requiredParameterCount = requiredParameterCount;
+    this.hasNamedParameters = hasNamedParameters;
+    this.parameterName = parameterName;
+    this.parameterType = parameterType;
+    this.importUri = importUri;
+  }
+
+  factory CompletionSuggestion.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<TypeHierarchyItem> hierarchyItems;
-      if (json.containsKey("hierarchyItems")) {
-        hierarchyItems = jsonDecoder.decodeList(
-            jsonPath + ".hierarchyItems",
-            json["hierarchyItems"],
-            (String jsonPath, Object json) =>
-                new TypeHierarchyItem.fromJson(jsonDecoder, jsonPath, json));
-      }
-      return new SearchGetTypeHierarchyResult(hierarchyItems: hierarchyItems);
-    } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "search.getTypeHierarchy result", json);
-    }
-  }
-
-  factory SearchGetTypeHierarchyResult.fromResponse(Response response) {
-    return new SearchGetTypeHierarchyResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    if (hierarchyItems != null) {
-      result["hierarchyItems"] = hierarchyItems
-          .map((TypeHierarchyItem value) => value.toJson())
-          .toList();
-    }
-    return result;
-  }
-
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is SearchGetTypeHierarchyResult) {
-      return listEqual(hierarchyItems, other.hierarchyItems,
-          (TypeHierarchyItem a, TypeHierarchyItem b) => a == b);
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, hierarchyItems.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * search.results params
- *
- * {
- *   "id": SearchId
- *   "results": List<SearchResult>
- *   "isLast": bool
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class SearchResultsParams implements HasToJson {
-  String _id;
-
-  List<SearchResult> _results;
-
-  bool _isLast;
-
-  /**
-   * The id associated with the search.
-   */
-  String get id => _id;
-
-  /**
-   * The id associated with the search.
-   */
-  void set id(String value) {
-    assert(value != null);
-    this._id = value;
-  }
-
-  /**
-   * The search results being reported.
-   */
-  List<SearchResult> get results => _results;
-
-  /**
-   * The search results being reported.
-   */
-  void set results(List<SearchResult> value) {
-    assert(value != null);
-    this._results = value;
-  }
-
-  /**
-   * True if this is that last set of results that will be returned for the
-   * indicated search.
-   */
-  bool get isLast => _isLast;
-
-  /**
-   * True if this is that last set of results that will be returned for the
-   * indicated search.
-   */
-  void set isLast(bool value) {
-    assert(value != null);
-    this._isLast = value;
-  }
-
-  SearchResultsParams(String id, List<SearchResult> results, bool isLast) {
-    this.id = id;
-    this.results = results;
-    this.isLast = isLast;
-  }
-
-  factory SearchResultsParams.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      String id;
-      if (json.containsKey("id")) {
-        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      CompletionSuggestionKind kind;
+      if (json.containsKey("kind")) {
+        kind = new CompletionSuggestionKind.fromJson(
+            jsonDecoder, jsonPath + ".kind", json["kind"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "id");
-      }
-      List<SearchResult> results;
-      if (json.containsKey("results")) {
-        results = jsonDecoder.decodeList(
-            jsonPath + ".results",
-            json["results"],
-            (String jsonPath, Object json) =>
-                new SearchResult.fromJson(jsonDecoder, jsonPath, json));
+        throw jsonDecoder.mismatch(jsonPath, "kind");
+      }
+      int relevance;
+      if (json.containsKey("relevance")) {
+        relevance =
+            jsonDecoder.decodeInt(jsonPath + ".relevance", json["relevance"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "results");
-      }
-      bool isLast;
-      if (json.containsKey("isLast")) {
-        isLast = jsonDecoder.decodeBool(jsonPath + ".isLast", json["isLast"]);
+        throw jsonDecoder.mismatch(jsonPath, "relevance");
+      }
+      String completion;
+      if (json.containsKey("completion")) {
+        completion = jsonDecoder.decodeString(
+            jsonPath + ".completion", json["completion"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "isLast");
-      }
-      return new SearchResultsParams(id, results, isLast);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "search.results params", json);
-    }
-  }
-
-  factory SearchResultsParams.fromNotification(Notification notification) {
-    return new SearchResultsParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["id"] = id;
-    result["results"] =
-        results.map((SearchResult value) => value.toJson()).toList();
-    result["isLast"] = isLast;
-    return result;
-  }
-
-  Notification toNotification() {
-    return new Notification("search.results", toJson());
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is SearchResultsParams) {
-      return id == other.id &&
-          listEqual(results, other.results,
-              (SearchResult a, SearchResult b) => a == b) &&
-          isLast == other.isLast;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, id.hashCode);
-    hash = JenkinsSmiHash.combine(hash, results.hashCode);
-    hash = JenkinsSmiHash.combine(hash, isLast.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * edit.format params
- *
- * {
- *   "file": FilePath
- *   "selectionOffset": int
- *   "selectionLength": int
- *   "lineLength": optional int
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class EditFormatParams implements HasToJson {
-  String _file;
-
-  int _selectionOffset;
-
-  int _selectionLength;
-
-  int _lineLength;
-
-  /**
-   * The file containing the code to be formatted.
-   */
-  String get file => _file;
-
-  /**
-   * The file containing the code to be formatted.
-   */
-  void set file(String value) {
-    assert(value != null);
-    this._file = value;
-  }
-
-  /**
-   * The offset of the current selection in the file.
-   */
-  int get selectionOffset => _selectionOffset;
-
-  /**
-   * The offset of the current selection in the file.
-   */
-  void set selectionOffset(int value) {
-    assert(value != null);
-    this._selectionOffset = value;
-  }
-
-  /**
-   * The length of the current selection in the file.
-   */
-  int get selectionLength => _selectionLength;
-
-  /**
-   * The length of the current selection in the file.
-   */
-  void set selectionLength(int value) {
-    assert(value != null);
-    this._selectionLength = value;
-  }
-
-  /**
-   * The line length to be used by the formatter.
-   */
-  int get lineLength => _lineLength;
-
-  /**
-   * The line length to be used by the formatter.
-   */
-  void set lineLength(int value) {
-    this._lineLength = value;
-  }
-
-  EditFormatParams(String file, int selectionOffset, int selectionLength,
-      {int lineLength}) {
-    this.file = file;
-    this.selectionOffset = selectionOffset;
-    this.selectionLength = selectionLength;
-    this.lineLength = lineLength;
-  }
-
-  factory EditFormatParams.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "completion");
       }
       int selectionOffset;
       if (json.containsKey("selectionOffset")) {
         selectionOffset = jsonDecoder.decodeInt(
             jsonPath + ".selectionOffset", json["selectionOffset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "selectionOffset");
+        throw jsonDecoder.mismatch(jsonPath, "selectionOffset");
       }
       int selectionLength;
       if (json.containsKey("selectionLength")) {
         selectionLength = jsonDecoder.decodeInt(
             jsonPath + ".selectionLength", json["selectionLength"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "selectionLength");
-      }
-      int lineLength;
-      if (json.containsKey("lineLength")) {
-        lineLength =
-            jsonDecoder.decodeInt(jsonPath + ".lineLength", json["lineLength"]);
-      }
-      return new EditFormatParams(file, selectionOffset, selectionLength,
-          lineLength: lineLength);
+        throw jsonDecoder.mismatch(jsonPath, "selectionLength");
+      }
+      bool isDeprecated;
+      if (json.containsKey("isDeprecated")) {
+        isDeprecated = jsonDecoder.decodeBool(
+            jsonPath + ".isDeprecated", json["isDeprecated"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "isDeprecated");
+      }
+      bool isPotential;
+      if (json.containsKey("isPotential")) {
+        isPotential = jsonDecoder.decodeBool(
+            jsonPath + ".isPotential", json["isPotential"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "isPotential");
+      }
+      String docSummary;
+      if (json.containsKey("docSummary")) {
+        docSummary = jsonDecoder.decodeString(
+            jsonPath + ".docSummary", json["docSummary"]);
+      }
+      String docComplete;
+      if (json.containsKey("docComplete")) {
+        docComplete = jsonDecoder.decodeString(
+            jsonPath + ".docComplete", json["docComplete"]);
+      }
+      String declaringType;
+      if (json.containsKey("declaringType")) {
+        declaringType = jsonDecoder.decodeString(
+            jsonPath + ".declaringType", json["declaringType"]);
+      }
+      String defaultArgumentListString;
+      if (json.containsKey("defaultArgumentListString")) {
+        defaultArgumentListString = jsonDecoder.decodeString(
+            jsonPath + ".defaultArgumentListString",
+            json["defaultArgumentListString"]);
+      }
+      List<int> defaultArgumentListTextRanges;
+      if (json.containsKey("defaultArgumentListTextRanges")) {
+        defaultArgumentListTextRanges = jsonDecoder.decodeList(
+            jsonPath + ".defaultArgumentListTextRanges",
+            json["defaultArgumentListTextRanges"],
+            jsonDecoder.decodeInt);
+      }
+      Element element;
+      if (json.containsKey("element")) {
+        element = new Element.fromJson(
+            jsonDecoder, jsonPath + ".element", json["element"]);
+      }
+      String returnType;
+      if (json.containsKey("returnType")) {
+        returnType = jsonDecoder.decodeString(
+            jsonPath + ".returnType", json["returnType"]);
+      }
+      List<String> parameterNames;
+      if (json.containsKey("parameterNames")) {
+        parameterNames = jsonDecoder.decodeList(jsonPath + ".parameterNames",
+            json["parameterNames"], jsonDecoder.decodeString);
+      }
+      List<String> parameterTypes;
+      if (json.containsKey("parameterTypes")) {
+        parameterTypes = jsonDecoder.decodeList(jsonPath + ".parameterTypes",
+            json["parameterTypes"], jsonDecoder.decodeString);
+      }
+      int requiredParameterCount;
+      if (json.containsKey("requiredParameterCount")) {
+        requiredParameterCount = jsonDecoder.decodeInt(
+            jsonPath + ".requiredParameterCount",
+            json["requiredParameterCount"]);
+      }
+      bool hasNamedParameters;
+      if (json.containsKey("hasNamedParameters")) {
+        hasNamedParameters = jsonDecoder.decodeBool(
+            jsonPath + ".hasNamedParameters", json["hasNamedParameters"]);
+      }
+      String parameterName;
+      if (json.containsKey("parameterName")) {
+        parameterName = jsonDecoder.decodeString(
+            jsonPath + ".parameterName", json["parameterName"]);
+      }
+      String parameterType;
+      if (json.containsKey("parameterType")) {
+        parameterType = jsonDecoder.decodeString(
+            jsonPath + ".parameterType", json["parameterType"]);
+      }
+      String importUri;
+      if (json.containsKey("importUri")) {
+        importUri = jsonDecoder.decodeString(
+            jsonPath + ".importUri", json["importUri"]);
+      }
+      return new CompletionSuggestion(kind, relevance, completion,
+          selectionOffset, selectionLength, isDeprecated, isPotential,
+          docSummary: docSummary,
+          docComplete: docComplete,
+          declaringType: declaringType,
+          defaultArgumentListString: defaultArgumentListString,
+          defaultArgumentListTextRanges: defaultArgumentListTextRanges,
+          element: element,
+          returnType: returnType,
+          parameterNames: parameterNames,
+          parameterTypes: parameterTypes,
+          requiredParameterCount: requiredParameterCount,
+          hasNamedParameters: hasNamedParameters,
+          parameterName: parameterName,
+          parameterType: parameterType,
+          importUri: importUri);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.format params", json);
-    }
-  }
-
-  factory EditFormatParams.fromRequest(Request request) {
-    return new EditFormatParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "CompletionSuggestion", json);
+    }
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["file"] = file;
+    result["kind"] = kind.toJson();
+    result["relevance"] = relevance;
+    result["completion"] = completion;
     result["selectionOffset"] = selectionOffset;
     result["selectionLength"] = selectionLength;
-    if (lineLength != null) {
-      result["lineLength"] = lineLength;
+    result["isDeprecated"] = isDeprecated;
+    result["isPotential"] = isPotential;
+    if (docSummary != null) {
+      result["docSummary"] = docSummary;
+    }
+    if (docComplete != null) {
+      result["docComplete"] = docComplete;
+    }
+    if (declaringType != null) {
+      result["declaringType"] = declaringType;
+    }
+    if (defaultArgumentListString != null) {
+      result["defaultArgumentListString"] = defaultArgumentListString;
+    }
+    if (defaultArgumentListTextRanges != null) {
+      result["defaultArgumentListTextRanges"] = defaultArgumentListTextRanges;
+    }
+    if (element != null) {
+      result["element"] = element.toJson();
+    }
+    if (returnType != null) {
+      result["returnType"] = returnType;
+    }
+    if (parameterNames != null) {
+      result["parameterNames"] = parameterNames;
+    }
+    if (parameterTypes != null) {
+      result["parameterTypes"] = parameterTypes;
+    }
+    if (requiredParameterCount != null) {
+      result["requiredParameterCount"] = requiredParameterCount;
+    }
+    if (hasNamedParameters != null) {
+      result["hasNamedParameters"] = hasNamedParameters;
+    }
+    if (parameterName != null) {
+      result["parameterName"] = parameterName;
+    }
+    if (parameterType != null) {
+      result["parameterType"] = parameterType;
+    }
+    if (importUri != null) {
+      result["importUri"] = importUri;
     }
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "edit.format", toJson());
-  }
-
   @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is EditFormatParams) {
-      return file == other.file &&
-          selectionOffset == other.selectionOffset &&
-          selectionLength == other.selectionLength &&
-          lineLength == other.lineLength;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, selectionOffset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, selectionLength.hashCode);
-    hash = JenkinsSmiHash.combine(hash, lineLength.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * edit.format result
- *
- * {
- *   "edits": List<SourceEdit>
- *   "selectionOffset": int
- *   "selectionLength": int
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class EditFormatResult implements HasToJson {
-  List<SourceEdit> _edits;
-
-  int _selectionOffset;
-
-  int _selectionLength;
-
-  /**
-   * The edit(s) to be applied in order to format the code. The list will be
-   * empty if the code was already formatted (there are no changes).
-   */
-  List<SourceEdit> get edits => _edits;
-
-  /**
-   * The edit(s) to be applied in order to format the code. The list will be
-   * empty if the code was already formatted (there are no changes).
-   */
-  void set edits(List<SourceEdit> value) {
-    assert(value != null);
-    this._edits = value;
-  }
-
-  /**
-   * The offset of the selection after formatting the code.
-   */
-  int get selectionOffset => _selectionOffset;
-
-  /**
-   * The offset of the selection after formatting the code.
-   */
-  void set selectionOffset(int value) {
-    assert(value != null);
-    this._selectionOffset = value;
-  }
-
-  /**
-   * The length of the selection after formatting the code.
-   */
-  int get selectionLength => _selectionLength;
-
-  /**
-   * The length of the selection after formatting the code.
-   */
-  void set selectionLength(int value) {
-    assert(value != null);
-    this._selectionLength = value;
-  }
-
-  EditFormatResult(
-      List<SourceEdit> edits, int selectionOffset, int selectionLength) {
-    this.edits = edits;
-    this.selectionOffset = selectionOffset;
-    this.selectionLength = selectionLength;
-  }
-
-  factory EditFormatResult.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      List<SourceEdit> edits;
-      if (json.containsKey("edits")) {
-        edits = jsonDecoder.decodeList(
-            jsonPath + ".edits",
-            json["edits"],
-            (String jsonPath, Object json) =>
-                new SourceEdit.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "edits");
-      }
-      int selectionOffset;
-      if (json.containsKey("selectionOffset")) {
-        selectionOffset = jsonDecoder.decodeInt(
-            jsonPath + ".selectionOffset", json["selectionOffset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "selectionOffset");
-      }
-      int selectionLength;
-      if (json.containsKey("selectionLength")) {
-        selectionLength = jsonDecoder.decodeInt(
-            jsonPath + ".selectionLength", json["selectionLength"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "selectionLength");
-      }
-      return new EditFormatResult(edits, selectionOffset, selectionLength);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.format result", json);
-    }
-  }
-
-  factory EditFormatResult.fromResponse(Response response) {
-    return new EditFormatResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["edits"] = edits.map((SourceEdit value) => value.toJson()).toList();
-    result["selectionOffset"] = selectionOffset;
-    result["selectionLength"] = selectionLength;
-    return result;
-  }
-
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is EditFormatResult) {
-      return listEqual(
-              edits, other.edits, (SourceEdit a, SourceEdit b) => a == b) &&
-          selectionOffset == other.selectionOffset &&
-          selectionLength == other.selectionLength;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, edits.hashCode);
-    hash = JenkinsSmiHash.combine(hash, selectionOffset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, selectionLength.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * edit.getAssists params
- *
- * {
- *   "file": FilePath
- *   "offset": int
- *   "length": int
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class EditGetAssistsParams implements HasToJson {
-  String _file;
-
-  int _offset;
-
-  int _length;
-
-  /**
-   * The file containing the code for which assists are being requested.
-   */
-  String get file => _file;
-
-  /**
-   * The file containing the code for which assists are being requested.
-   */
-  void set file(String value) {
-    assert(value != null);
-    this._file = value;
-  }
-
-  /**
-   * The offset of the code for which assists are being requested.
-   */
-  int get offset => _offset;
-
-  /**
-   * The offset of the code for which assists are being requested.
-   */
-  void set offset(int value) {
-    assert(value != null);
-    this._offset = value;
-  }
-
-  /**
-   * The length of the code for which assists are being requested.
-   */
-  int get length => _length;
-
-  /**
-   * The length of the code for which assists are being requested.
-   */
-  void set length(int value) {
-    assert(value != null);
-    this._length = value;
-  }
-
-  EditGetAssistsParams(String file, int offset, int length) {
-    this.file = file;
-    this.offset = offset;
-    this.length = length;
-  }
-
-  factory EditGetAssistsParams.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
-      }
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
-      }
-      int length;
-      if (json.containsKey("length")) {
-        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
-      }
-      return new EditGetAssistsParams(file, offset, length);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getAssists params", json);
-    }
-  }
-
-  factory EditGetAssistsParams.fromRequest(Request request) {
-    return new EditGetAssistsParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["file"] = file;
-    result["offset"] = offset;
-    result["length"] = length;
-    return result;
-  }
-
-  Request toRequest(String id) {
-    return new Request(id, "edit.getAssists", toJson());
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is EditGetAssistsParams) {
-      return file == other.file &&
-          offset == other.offset &&
-          length == other.length;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * edit.getAssists result
- *
- * {
- *   "assists": List<SourceChange>
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class EditGetAssistsResult implements HasToJson {
-  List<SourceChange> _assists;
-
-  /**
-   * The assists that are available at the given location.
-   */
-  List<SourceChange> get assists => _assists;
-
-  /**
-   * The assists that are available at the given location.
-   */
-  void set assists(List<SourceChange> value) {
-    assert(value != null);
-    this._assists = value;
-  }
-
-  EditGetAssistsResult(List<SourceChange> assists) {
-    this.assists = assists;
-  }
-
-  factory EditGetAssistsResult.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      List<SourceChange> assists;
-      if (json.containsKey("assists")) {
-        assists = jsonDecoder.decodeList(
-            jsonPath + ".assists",
-            json["assists"],
-            (String jsonPath, Object json) =>
-                new SourceChange.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "assists");
-      }
-      return new EditGetAssistsResult(assists);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getAssists result", json);
-    }
-  }
-
-  factory EditGetAssistsResult.fromResponse(Response response) {
-    return new EditGetAssistsResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["assists"] =
-        assists.map((SourceChange value) => value.toJson()).toList();
-    return result;
-  }
-
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
-  }
-
-  @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is EditGetAssistsResult) {
-      return listEqual(
-          assists, other.assists, (SourceChange a, SourceChange b) => a == b);
+    if (other is CompletionSuggestion) {
+      return kind == other.kind &&
+          relevance == other.relevance &&
+          completion == other.completion &&
+          selectionOffset == other.selectionOffset &&
+          selectionLength == other.selectionLength &&
+          isDeprecated == other.isDeprecated &&
+          isPotential == other.isPotential &&
+          docSummary == other.docSummary &&
+          docComplete == other.docComplete &&
+          declaringType == other.declaringType &&
+          defaultArgumentListString == other.defaultArgumentListString &&
+          listEqual(defaultArgumentListTextRanges,
+              other.defaultArgumentListTextRanges, (int a, int b) => a == b) &&
+          element == other.element &&
+          returnType == other.returnType &&
+          listEqual(parameterNames, other.parameterNames,
+              (String a, String b) => a == b) &&
+          listEqual(parameterTypes, other.parameterTypes,
+              (String a, String b) => a == b) &&
+          requiredParameterCount == other.requiredParameterCount &&
+          hasNamedParameters == other.hasNamedParameters &&
+          parameterName == other.parameterName &&
+          parameterType == other.parameterType &&
+          importUri == other.importUri;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, assists.hashCode);
+    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
+    hash = JenkinsSmiHash.combine(hash, relevance.hashCode);
+    hash = JenkinsSmiHash.combine(hash, completion.hashCode);
+    hash = JenkinsSmiHash.combine(hash, selectionOffset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, selectionLength.hashCode);
+    hash = JenkinsSmiHash.combine(hash, isDeprecated.hashCode);
+    hash = JenkinsSmiHash.combine(hash, isPotential.hashCode);
+    hash = JenkinsSmiHash.combine(hash, docSummary.hashCode);
+    hash = JenkinsSmiHash.combine(hash, docComplete.hashCode);
+    hash = JenkinsSmiHash.combine(hash, declaringType.hashCode);
+    hash = JenkinsSmiHash.combine(hash, defaultArgumentListString.hashCode);
+    hash = JenkinsSmiHash.combine(hash, defaultArgumentListTextRanges.hashCode);
+    hash = JenkinsSmiHash.combine(hash, element.hashCode);
+    hash = JenkinsSmiHash.combine(hash, returnType.hashCode);
+    hash = JenkinsSmiHash.combine(hash, parameterNames.hashCode);
+    hash = JenkinsSmiHash.combine(hash, parameterTypes.hashCode);
+    hash = JenkinsSmiHash.combine(hash, requiredParameterCount.hashCode);
+    hash = JenkinsSmiHash.combine(hash, hasNamedParameters.hashCode);
+    hash = JenkinsSmiHash.combine(hash, parameterName.hashCode);
+    hash = JenkinsSmiHash.combine(hash, parameterType.hashCode);
+    hash = JenkinsSmiHash.combine(hash, importUri.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * edit.getAvailableRefactorings params
+ * CompletionSuggestionKind
  *
- * {
- *   "file": FilePath
- *   "offset": int
- *   "length": int
+ * enum {
+ *   ARGUMENT_LIST
+ *   IMPORT
+ *   IDENTIFIER
+ *   INVOCATION
+ *   KEYWORD
+ *   NAMED_ARGUMENT
+ *   OPTIONAL_ARGUMENT
+ *   PARAMETER
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class EditGetAvailableRefactoringsParams implements HasToJson {
-  String _file;
-
-  int _offset;
-
-  int _length;
-
-  /**
-   * The file containing the code on which the refactoring would be based.
-   */
-  String get file => _file;
-
-  /**
-   * The file containing the code on which the refactoring would be based.
-   */
-  void set file(String value) {
-    assert(value != null);
-    this._file = value;
-  }
-
-  /**
-   * The offset of the code on which the refactoring would be based.
-   */
-  int get offset => _offset;
-
-  /**
-   * The offset of the code on which the refactoring would be based.
-   */
-  void set offset(int value) {
-    assert(value != null);
-    this._offset = value;
-  }
-
-  /**
-   * The length of the code on which the refactoring would be based.
-   */
-  int get length => _length;
-
-  /**
-   * The length of the code on which the refactoring would be based.
-   */
-  void set length(int value) {
-    assert(value != null);
-    this._length = value;
-  }
-
-  EditGetAvailableRefactoringsParams(String file, int offset, int length) {
-    this.file = file;
-    this.offset = offset;
-    this.length = length;
-  }
-
-  factory EditGetAvailableRefactoringsParams.fromJson(
+class CompletionSuggestionKind implements Enum {
+  /**
+   * A list of arguments for the method or function that is being invoked. For
+   * this suggestion kind, the completion field is a textual representation of
+   * the invocation and the parameterNames, parameterTypes, and
+   * requiredParameterCount attributes are defined.
+   */
+  static const CompletionSuggestionKind ARGUMENT_LIST =
+      const CompletionSuggestionKind._("ARGUMENT_LIST");
+
+  static const CompletionSuggestionKind IMPORT =
+      const CompletionSuggestionKind._("IMPORT");
+
+  /**
+   * The element identifier should be inserted at the completion location. For
+   * example "someMethod" in import 'myLib.dart' show someMethod; . For
+   * suggestions of this kind, the element attribute is defined and the
+   * completion field is the element's identifier.
+   */
+  static const CompletionSuggestionKind IDENTIFIER =
+      const CompletionSuggestionKind._("IDENTIFIER");
+
+  /**
+   * The element is being invoked at the completion location. For example,
+   * "someMethod" in x.someMethod(); . For suggestions of this kind, the
+   * element attribute is defined and the completion field is the element's
+   * identifier.
+   */
+  static const CompletionSuggestionKind INVOCATION =
+      const CompletionSuggestionKind._("INVOCATION");
+
+  /**
+   * A keyword is being suggested. For suggestions of this kind, the completion
+   * is the keyword.
+   */
+  static const CompletionSuggestionKind KEYWORD =
+      const CompletionSuggestionKind._("KEYWORD");
+
+  /**
+   * A named argument for the current callsite is being suggested. For
+   * suggestions of this kind, the completion is the named argument identifier
+   * including a trailing ':' and space.
+   */
+  static const CompletionSuggestionKind NAMED_ARGUMENT =
+      const CompletionSuggestionKind._("NAMED_ARGUMENT");
+
+  static const CompletionSuggestionKind OPTIONAL_ARGUMENT =
+      const CompletionSuggestionKind._("OPTIONAL_ARGUMENT");
+
+  static const CompletionSuggestionKind PARAMETER =
+      const CompletionSuggestionKind._("PARAMETER");
+
+  /**
+   * A list containing all of the enum values that are defined.
+   */
+  static const List<CompletionSuggestionKind> VALUES =
+      const <CompletionSuggestionKind>[
+    ARGUMENT_LIST,
+    IMPORT,
+    IDENTIFIER,
+    INVOCATION,
+    KEYWORD,
+    NAMED_ARGUMENT,
+    OPTIONAL_ARGUMENT,
+    PARAMETER
+  ];
+
+  @override
+  final String name;
+
+  const CompletionSuggestionKind._(this.name);
+
+  factory CompletionSuggestionKind(String name) {
+    switch (name) {
+      case "ARGUMENT_LIST":
+        return ARGUMENT_LIST;
+      case "IMPORT":
+        return IMPORT;
+      case "IDENTIFIER":
+        return IDENTIFIER;
+      case "INVOCATION":
+        return INVOCATION;
+      case "KEYWORD":
+        return KEYWORD;
+      case "NAMED_ARGUMENT":
+        return NAMED_ARGUMENT;
+      case "OPTIONAL_ARGUMENT":
+        return OPTIONAL_ARGUMENT;
+      case "PARAMETER":
+        return PARAMETER;
+    }
+    throw new Exception('Illegal enum value: $name');
+  }
+
+  factory CompletionSuggestionKind.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json is String) {
+      try {
+        return new CompletionSuggestionKind(json);
+      } catch (_) {
+        // Fall through
+      }
+    }
+    throw jsonDecoder.mismatch(jsonPath, "CompletionSuggestionKind", json);
+  }
+
+  @override
+  String toString() => "CompletionSuggestionKind.$name";
+
+  String toJson() => name;
+}
+
+/**
+ * ContextData
+ *
+ * {
+ *   "name": String
+ *   "explicitFileCount": int
+ *   "implicitFileCount": int
+ *   "workItemQueueLength": int
+ *   "cacheEntryExceptions": List<String>
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ContextData implements HasToJson {
+  String _name;
+
+  int _explicitFileCount;
+
+  int _implicitFileCount;
+
+  int _workItemQueueLength;
+
+  List<String> _cacheEntryExceptions;
+
+  /**
+   * The name of the context.
+   */
+  String get name => _name;
+
+  /**
+   * The name of the context.
+   */
+  void set name(String value) {
+    assert(value != null);
+    this._name = value;
+  }
+
+  /**
+   * Explicitly analyzed files.
+   */
+  int get explicitFileCount => _explicitFileCount;
+
+  /**
+   * Explicitly analyzed files.
+   */
+  void set explicitFileCount(int value) {
+    assert(value != null);
+    this._explicitFileCount = value;
+  }
+
+  /**
+   * Implicitly analyzed files.
+   */
+  int get implicitFileCount => _implicitFileCount;
+
+  /**
+   * Implicitly analyzed files.
+   */
+  void set implicitFileCount(int value) {
+    assert(value != null);
+    this._implicitFileCount = value;
+  }
+
+  /**
+   * The number of work items in the queue.
+   */
+  int get workItemQueueLength => _workItemQueueLength;
+
+  /**
+   * The number of work items in the queue.
+   */
+  void set workItemQueueLength(int value) {
+    assert(value != null);
+    this._workItemQueueLength = value;
+  }
+
+  /**
+   * Exceptions associated with cache entries.
+   */
+  List<String> get cacheEntryExceptions => _cacheEntryExceptions;
+
+  /**
+   * Exceptions associated with cache entries.
+   */
+  void set cacheEntryExceptions(List<String> value) {
+    assert(value != null);
+    this._cacheEntryExceptions = value;
+  }
+
+  ContextData(String name, int explicitFileCount, int implicitFileCount,
+      int workItemQueueLength, List<String> cacheEntryExceptions) {
+    this.name = name;
+    this.explicitFileCount = explicitFileCount;
+    this.implicitFileCount = implicitFileCount;
+    this.workItemQueueLength = workItemQueueLength;
+    this.cacheEntryExceptions = cacheEntryExceptions;
+  }
+
+  factory ContextData.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
-      }
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
-      }
-      int length;
-      if (json.containsKey("length")) {
-        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
-      }
-      return new EditGetAvailableRefactoringsParams(file, offset, length);
+      String name;
+      if (json.containsKey("name")) {
+        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "name");
+      }
+      int explicitFileCount;
+      if (json.containsKey("explicitFileCount")) {
+        explicitFileCount = jsonDecoder.decodeInt(
+            jsonPath + ".explicitFileCount", json["explicitFileCount"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "explicitFileCount");
+      }
+      int implicitFileCount;
+      if (json.containsKey("implicitFileCount")) {
+        implicitFileCount = jsonDecoder.decodeInt(
+            jsonPath + ".implicitFileCount", json["implicitFileCount"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "implicitFileCount");
+      }
+      int workItemQueueLength;
+      if (json.containsKey("workItemQueueLength")) {
+        workItemQueueLength = jsonDecoder.decodeInt(
+            jsonPath + ".workItemQueueLength", json["workItemQueueLength"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "workItemQueueLength");
+      }
+      List<String> cacheEntryExceptions;
+      if (json.containsKey("cacheEntryExceptions")) {
+        cacheEntryExceptions = jsonDecoder.decodeList(
+            jsonPath + ".cacheEntryExceptions",
+            json["cacheEntryExceptions"],
+            jsonDecoder.decodeString);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "cacheEntryExceptions");
+      }
+      return new ContextData(name, explicitFileCount, implicitFileCount,
+          workItemQueueLength, cacheEntryExceptions);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "edit.getAvailableRefactorings params", json);
-    }
-  }
-
-  factory EditGetAvailableRefactoringsParams.fromRequest(Request request) {
-    return new EditGetAvailableRefactoringsParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "ContextData", json);
+    }
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["file"] = file;
-    result["offset"] = offset;
-    result["length"] = length;
+    result["name"] = name;
+    result["explicitFileCount"] = explicitFileCount;
+    result["implicitFileCount"] = implicitFileCount;
+    result["workItemQueueLength"] = workItemQueueLength;
+    result["cacheEntryExceptions"] = cacheEntryExceptions;
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "edit.getAvailableRefactorings", toJson());
-  }
-
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is EditGetAvailableRefactoringsParams) {
-      return file == other.file &&
-          offset == other.offset &&
-          length == other.length;
+    if (other is ContextData) {
+      return name == other.name &&
+          explicitFileCount == other.explicitFileCount &&
+          implicitFileCount == other.implicitFileCount &&
+          workItemQueueLength == other.workItemQueueLength &&
+          listEqual(cacheEntryExceptions, other.cacheEntryExceptions,
+              (String a, String b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, length.hashCode);
+    hash = JenkinsSmiHash.combine(hash, name.hashCode);
+    hash = JenkinsSmiHash.combine(hash, explicitFileCount.hashCode);
+    hash = JenkinsSmiHash.combine(hash, implicitFileCount.hashCode);
+    hash = JenkinsSmiHash.combine(hash, workItemQueueLength.hashCode);
+    hash = JenkinsSmiHash.combine(hash, cacheEntryExceptions.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * edit.getAvailableRefactorings result
+ * convertGetterToMethod feedback
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ConvertGetterToMethodFeedback extends RefactoringFeedback
+    implements HasToJson {
+  @override
+  bool operator ==(other) {
+    if (other is ConvertGetterToMethodFeedback) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 616032599;
+  }
+}
+
+/**
+ * convertGetterToMethod options
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ConvertGetterToMethodOptions extends RefactoringOptions
+    implements HasToJson {
+  @override
+  bool operator ==(other) {
+    if (other is ConvertGetterToMethodOptions) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 488848400;
+  }
+}
+
+/**
+ * convertMethodToGetter feedback
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ConvertMethodToGetterFeedback extends RefactoringFeedback
+    implements HasToJson {
+  @override
+  bool operator ==(other) {
+    if (other is ConvertMethodToGetterFeedback) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 165291526;
+  }
+}
+
+/**
+ * convertMethodToGetter options
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ConvertMethodToGetterOptions extends RefactoringOptions
+    implements HasToJson {
+  @override
+  bool operator ==(other) {
+    if (other is ConvertMethodToGetterOptions) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 27952290;
+  }
+}
+
+/**
+ * diagnostic.getDiagnostics params
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class DiagnosticGetDiagnosticsParams implements RequestParams {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "diagnostic.getDiagnostics", null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is DiagnosticGetDiagnosticsParams) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 587526202;
+  }
+}
+
+/**
+ * diagnostic.getDiagnostics result
  *
  * {
- *   "kinds": List<RefactoringKind>
+ *   "contexts": List<ContextData>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class EditGetAvailableRefactoringsResult implements HasToJson {
-  List<RefactoringKind> _kinds;
+class DiagnosticGetDiagnosticsResult implements ResponseResult {
+  List<ContextData> _contexts;
 
   /**
-   * The kinds of refactorings that are valid for the given selection.
+   * The list of analysis contexts.
    */
-  List<RefactoringKind> get kinds => _kinds;
+  List<ContextData> get contexts => _contexts;
 
   /**
-   * The kinds of refactorings that are valid for the given selection.
+   * The list of analysis contexts.
    */
-  void set kinds(List<RefactoringKind> value) {
+  void set contexts(List<ContextData> value) {
     assert(value != null);
-    this._kinds = value;
+    this._contexts = value;
   }
 
-  EditGetAvailableRefactoringsResult(List<RefactoringKind> kinds) {
-    this.kinds = kinds;
+  DiagnosticGetDiagnosticsResult(List<ContextData> contexts) {
+    this.contexts = contexts;
   }
 
-  factory EditGetAvailableRefactoringsResult.fromJson(
+  factory DiagnosticGetDiagnosticsResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<RefactoringKind> kinds;
-      if (json.containsKey("kinds")) {
-        kinds = jsonDecoder.decodeList(
-            jsonPath + ".kinds",
-            json["kinds"],
+      List<ContextData> contexts;
+      if (json.containsKey("contexts")) {
+        contexts = jsonDecoder.decodeList(
+            jsonPath + ".contexts",
+            json["contexts"],
             (String jsonPath, Object json) =>
-                new RefactoringKind.fromJson(jsonDecoder, jsonPath, json));
+                new ContextData.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "kinds");
+        throw jsonDecoder.mismatch(jsonPath, "contexts");
       }
-      return new EditGetAvailableRefactoringsResult(kinds);
+      return new DiagnosticGetDiagnosticsResult(contexts);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "edit.getAvailableRefactorings result", json);
+          jsonPath, "diagnostic.getDiagnostics result", json);
     }
   }
 
-  factory EditGetAvailableRefactoringsResult.fromResponse(Response response) {
-    return new EditGetAvailableRefactoringsResult.fromJson(
+  factory DiagnosticGetDiagnosticsResult.fromResponse(Response response) {
+    return new DiagnosticGetDiagnosticsResult.fromJson(
         new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
         "result",
-        response._result);
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["kinds"] =
-        kinds.map((RefactoringKind value) => value.toJson()).toList();
+    result["contexts"] =
+        contexts.map((ContextData value) => value.toJson()).toList();
     return result;
   }
 
+  @override
   Response toResponse(String id) {
     return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is EditGetAvailableRefactoringsResult) {
+    if (other is DiagnosticGetDiagnosticsResult) {
       return listEqual(
-          kinds, other.kinds, (RefactoringKind a, RefactoringKind b) => a == b);
+          contexts, other.contexts, (ContextData a, ContextData b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, kinds.hashCode);
+    hash = JenkinsSmiHash.combine(hash, contexts.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * edit.getFixes params
+ * diagnostic.getServerPort params
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class DiagnosticGetServerPortParams implements RequestParams {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "diagnostic.getServerPort", null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is DiagnosticGetServerPortParams) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 367508704;
+  }
+}
+
+/**
+ * diagnostic.getServerPort result
  *
  * {
- *   "file": FilePath
- *   "offset": int
+ *   "port": int
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class EditGetFixesParams implements HasToJson {
-  String _file;
-
-  int _offset;
+class DiagnosticGetServerPortResult implements ResponseResult {
+  int _port;
 
   /**
-   * The file containing the errors for which fixes are being requested.
+   * The diagnostic server port.
    */
-  String get file => _file;
+  int get port => _port;
 
   /**
-   * The file containing the errors for which fixes are being requested.
+   * The diagnostic server port.
    */
-  void set file(String value) {
+  void set port(int value) {
     assert(value != null);
-    this._file = value;
+    this._port = value;
   }
 
-  /**
-   * The offset used to select the errors for which fixes will be returned.
-   */
-  int get offset => _offset;
-
-  /**
-   * The offset used to select the errors for which fixes will be returned.
-   */
-  void set offset(int value) {
-    assert(value != null);
-    this._offset = value;
+  DiagnosticGetServerPortResult(int port) {
+    this.port = port;
   }
 
-  EditGetFixesParams(String file, int offset) {
-    this.file = file;
-    this.offset = offset;
-  }
-
-  factory EditGetFixesParams.fromJson(
+  factory DiagnosticGetServerPortResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
+      int port;
+      if (json.containsKey("port")) {
+        port = jsonDecoder.decodeInt(jsonPath + ".port", json["port"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "port");
       }
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
-      }
-      return new EditGetFixesParams(file, offset);
+      return new DiagnosticGetServerPortResult(port);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getFixes params", json);
+      throw jsonDecoder.mismatch(
+          jsonPath, "diagnostic.getServerPort result", json);
     }
   }
 
-  factory EditGetFixesParams.fromRequest(Request request) {
-    return new EditGetFixesParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory DiagnosticGetServerPortResult.fromResponse(Response response) {
+    return new DiagnosticGetServerPortResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["file"] = file;
-    result["offset"] = offset;
+    result["port"] = port;
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "edit.getFixes", toJson());
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is EditGetFixesParams) {
-      return file == other.file && offset == other.offset;
+    if (other is DiagnosticGetServerPortResult) {
+      return port == other.port;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, port.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * edit.getFixes result
+ * edit.format params
  *
  * {
- *   "fixes": List<AnalysisErrorFixes>
+ *   "file": FilePath
+ *   "selectionOffset": int
+ *   "selectionLength": int
+ *   "lineLength": optional int
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class EditGetFixesResult implements HasToJson {
-  List<AnalysisErrorFixes> _fixes;
+class EditFormatParams implements RequestParams {
+  String _file;
+
+  int _selectionOffset;
+
+  int _selectionLength;
+
+  int _lineLength;
 
   /**
-   * The fixes that are available for the errors at the given offset.
+   * The file containing the code to be formatted.
    */
-  List<AnalysisErrorFixes> get fixes => _fixes;
+  String get file => _file;
 
   /**
-   * The fixes that are available for the errors at the given offset.
+   * The file containing the code to be formatted.
    */
-  void set fixes(List<AnalysisErrorFixes> value) {
+  void set file(String value) {
     assert(value != null);
-    this._fixes = value;
+    this._file = value;
   }
 
-  EditGetFixesResult(List<AnalysisErrorFixes> fixes) {
-    this.fixes = fixes;
+  /**
+   * The offset of the current selection in the file.
+   */
+  int get selectionOffset => _selectionOffset;
+
+  /**
+   * The offset of the current selection in the file.
+   */
+  void set selectionOffset(int value) {
+    assert(value != null);
+    this._selectionOffset = value;
   }
 
-  factory EditGetFixesResult.fromJson(
+  /**
+   * The length of the current selection in the file.
+   */
+  int get selectionLength => _selectionLength;
+
+  /**
+   * The length of the current selection in the file.
+   */
+  void set selectionLength(int value) {
+    assert(value != null);
+    this._selectionLength = value;
+  }
+
+  /**
+   * The line length to be used by the formatter.
+   */
+  int get lineLength => _lineLength;
+
+  /**
+   * The line length to be used by the formatter.
+   */
+  void set lineLength(int value) {
+    this._lineLength = value;
+  }
+
+  EditFormatParams(String file, int selectionOffset, int selectionLength,
+      {int lineLength}) {
+    this.file = file;
+    this.selectionOffset = selectionOffset;
+    this.selectionLength = selectionLength;
+    this.lineLength = lineLength;
+  }
+
+  factory EditFormatParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<AnalysisErrorFixes> fixes;
-      if (json.containsKey("fixes")) {
-        fixes = jsonDecoder.decodeList(
-            jsonPath + ".fixes",
-            json["fixes"],
-            (String jsonPath, Object json) =>
-                new AnalysisErrorFixes.fromJson(jsonDecoder, jsonPath, json));
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "fixes");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      return new EditGetFixesResult(fixes);
+      int selectionOffset;
+      if (json.containsKey("selectionOffset")) {
+        selectionOffset = jsonDecoder.decodeInt(
+            jsonPath + ".selectionOffset", json["selectionOffset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "selectionOffset");
+      }
+      int selectionLength;
+      if (json.containsKey("selectionLength")) {
+        selectionLength = jsonDecoder.decodeInt(
+            jsonPath + ".selectionLength", json["selectionLength"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "selectionLength");
+      }
+      int lineLength;
+      if (json.containsKey("lineLength")) {
+        lineLength =
+            jsonDecoder.decodeInt(jsonPath + ".lineLength", json["lineLength"]);
+      }
+      return new EditFormatParams(file, selectionOffset, selectionLength,
+          lineLength: lineLength);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getFixes result", json);
+      throw jsonDecoder.mismatch(jsonPath, "edit.format params", json);
     }
   }
 
-  factory EditGetFixesResult.fromResponse(Response response) {
-    return new EditGetFixesResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
+  factory EditFormatParams.fromRequest(Request request) {
+    return new EditFormatParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["fixes"] =
-        fixes.map((AnalysisErrorFixes value) => value.toJson()).toList();
+    result["file"] = file;
+    result["selectionOffset"] = selectionOffset;
+    result["selectionLength"] = selectionLength;
+    if (lineLength != null) {
+      result["lineLength"] = lineLength;
+    }
     return result;
   }
 
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "edit.format", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is EditGetFixesResult) {
-      return listEqual(fixes, other.fixes,
-          (AnalysisErrorFixes a, AnalysisErrorFixes b) => a == b);
+    if (other is EditFormatParams) {
+      return file == other.file &&
+          selectionOffset == other.selectionOffset &&
+          selectionLength == other.selectionLength &&
+          lineLength == other.lineLength;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, fixes.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, selectionOffset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, selectionLength.hashCode);
+    hash = JenkinsSmiHash.combine(hash, lineLength.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * edit.getRefactoring params
+ * edit.format result
  *
  * {
- *   "kind": RefactoringKind
+ *   "edits": List<SourceEdit>
+ *   "selectionOffset": int
+ *   "selectionLength": int
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class EditFormatResult implements ResponseResult {
+  List<SourceEdit> _edits;
+
+  int _selectionOffset;
+
+  int _selectionLength;
+
+  /**
+   * The edit(s) to be applied in order to format the code. The list will be
+   * empty if the code was already formatted (there are no changes).
+   */
+  List<SourceEdit> get edits => _edits;
+
+  /**
+   * The edit(s) to be applied in order to format the code. The list will be
+   * empty if the code was already formatted (there are no changes).
+   */
+  void set edits(List<SourceEdit> value) {
+    assert(value != null);
+    this._edits = value;
+  }
+
+  /**
+   * The offset of the selection after formatting the code.
+   */
+  int get selectionOffset => _selectionOffset;
+
+  /**
+   * The offset of the selection after formatting the code.
+   */
+  void set selectionOffset(int value) {
+    assert(value != null);
+    this._selectionOffset = value;
+  }
+
+  /**
+   * The length of the selection after formatting the code.
+   */
+  int get selectionLength => _selectionLength;
+
+  /**
+   * The length of the selection after formatting the code.
+   */
+  void set selectionLength(int value) {
+    assert(value != null);
+    this._selectionLength = value;
+  }
+
+  EditFormatResult(
+      List<SourceEdit> edits, int selectionOffset, int selectionLength) {
+    this.edits = edits;
+    this.selectionOffset = selectionOffset;
+    this.selectionLength = selectionLength;
+  }
+
+  factory EditFormatResult.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      List<SourceEdit> edits;
+      if (json.containsKey("edits")) {
+        edits = jsonDecoder.decodeList(
+            jsonPath + ".edits",
+            json["edits"],
+            (String jsonPath, Object json) =>
+                new SourceEdit.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "edits");
+      }
+      int selectionOffset;
+      if (json.containsKey("selectionOffset")) {
+        selectionOffset = jsonDecoder.decodeInt(
+            jsonPath + ".selectionOffset", json["selectionOffset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "selectionOffset");
+      }
+      int selectionLength;
+      if (json.containsKey("selectionLength")) {
+        selectionLength = jsonDecoder.decodeInt(
+            jsonPath + ".selectionLength", json["selectionLength"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "selectionLength");
+      }
+      return new EditFormatResult(edits, selectionOffset, selectionLength);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "edit.format result", json);
+    }
+  }
+
+  factory EditFormatResult.fromResponse(Response response) {
+    return new EditFormatResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["edits"] = edits.map((SourceEdit value) => value.toJson()).toList();
+    result["selectionOffset"] = selectionOffset;
+    result["selectionLength"] = selectionLength;
+    return result;
+  }
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is EditFormatResult) {
+      return listEqual(
+              edits, other.edits, (SourceEdit a, SourceEdit b) => a == b) &&
+          selectionOffset == other.selectionOffset &&
+          selectionLength == other.selectionLength;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, edits.hashCode);
+    hash = JenkinsSmiHash.combine(hash, selectionOffset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, selectionLength.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * edit.getAssists params
+ *
+ * {
  *   "file": FilePath
  *   "offset": int
  *   "length": int
- *   "validateOnly": bool
- *   "options": optional RefactoringOptions
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class EditGetRefactoringParams implements HasToJson {
-  RefactoringKind _kind;
-
+class EditGetAssistsParams implements RequestParams {
   String _file;
 
   int _offset;
 
   int _length;
 
-  bool _validateOnly;
-
-  RefactoringOptions _options;
-
-  /**
-   * The kind of refactoring to be performed.
-   */
-  RefactoringKind get kind => _kind;
-
-  /**
-   * The kind of refactoring to be performed.
-   */
-  void set kind(RefactoringKind value) {
-    assert(value != null);
-    this._kind = value;
-  }
-
-  /**
-   * The file containing the code involved in the refactoring.
+  /**
+   * The file containing the code for which assists are being requested.
    */
   String get file => _file;
 
   /**
-   * The file containing the code involved in the refactoring.
+   * The file containing the code for which assists are being requested.
    */
   void set file(String value) {
     assert(value != null);
     this._file = value;
   }
 
   /**
-   * The offset of the region involved in the refactoring.
+   * The offset of the code for which assists are being requested.
    */
   int get offset => _offset;
 
   /**
-   * The offset of the region involved in the refactoring.
+   * The offset of the code for which assists are being requested.
    */
   void set offset(int value) {
     assert(value != null);
     this._offset = value;
   }
 
   /**
-   * The length of the region involved in the refactoring.
+   * The length of the code for which assists are being requested.
    */
   int get length => _length;
 
   /**
-   * The length of the region involved in the refactoring.
+   * The length of the code for which assists are being requested.
    */
   void set length(int value) {
     assert(value != null);
     this._length = value;
   }
 
-  /**
-   * True if the client is only requesting that the values of the options be
-   * validated and no change be generated.
-   */
-  bool get validateOnly => _validateOnly;
-
-  /**
-   * True if the client is only requesting that the values of the options be
-   * validated and no change be generated.
-   */
-  void set validateOnly(bool value) {
-    assert(value != null);
-    this._validateOnly = value;
-  }
-
-  /**
-   * Data used to provide values provided by the user. The structure of the
-   * data is dependent on the kind of refactoring being performed. The data
-   * that is expected is documented in the section titled Refactorings, labeled
-   * as "Options". This field can be omitted if the refactoring does not
-   * require any options or if the values of those options are not known.
-   */
-  RefactoringOptions get options => _options;
-
-  /**
-   * Data used to provide values provided by the user. The structure of the
-   * data is dependent on the kind of refactoring being performed. The data
-   * that is expected is documented in the section titled Refactorings, labeled
-   * as "Options". This field can be omitted if the refactoring does not
-   * require any options or if the values of those options are not known.
-   */
-  void set options(RefactoringOptions value) {
-    this._options = value;
-  }
-
-  EditGetRefactoringParams(RefactoringKind kind, String file, int offset,
-      int length, bool validateOnly,
-      {RefactoringOptions options}) {
-    this.kind = kind;
+  EditGetAssistsParams(String file, int offset, int length) {
     this.file = file;
     this.offset = offset;
     this.length = length;
-    this.validateOnly = validateOnly;
-    this.options = options;
-  }
-
-  factory EditGetRefactoringParams.fromJson(
+  }
+
+  factory EditGetAssistsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      RefactoringKind kind;
-      if (json.containsKey("kind")) {
-        kind = new RefactoringKind.fromJson(
-            jsonDecoder, jsonPath + ".kind", json["kind"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "kind");
-      }
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
       int offset;
       if (json.containsKey("offset")) {
         offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
+        throw jsonDecoder.mismatch(jsonPath, "offset");
       }
       int length;
       if (json.containsKey("length")) {
         length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
-      }
-      bool validateOnly;
-      if (json.containsKey("validateOnly")) {
-        validateOnly = jsonDecoder.decodeBool(
-            jsonPath + ".validateOnly", json["validateOnly"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "validateOnly");
-      }
-      RefactoringOptions options;
-      if (json.containsKey("options")) {
-        options = new RefactoringOptions.fromJson(
-            jsonDecoder, jsonPath + ".options", json["options"], kind);
-      }
-      return new EditGetRefactoringParams(
-          kind, file, offset, length, validateOnly,
-          options: options);
+        throw jsonDecoder.mismatch(jsonPath, "length");
+      }
+      return new EditGetAssistsParams(file, offset, length);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getRefactoring params", json);
-    }
-  }
-
-  factory EditGetRefactoringParams.fromRequest(Request request) {
-    var params = new EditGetRefactoringParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
-    REQUEST_ID_REFACTORING_KINDS[request.id] = params.kind;
-    return params;
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "edit.getAssists params", json);
+    }
+  }
+
+  factory EditGetAssistsParams.fromRequest(Request request) {
+    return new EditGetAssistsParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["kind"] = kind.toJson();
     result["file"] = file;
     result["offset"] = offset;
     result["length"] = length;
-    result["validateOnly"] = validateOnly;
-    if (options != null) {
-      result["options"] = options.toJson();
-    }
     return result;
   }
 
+  @override
   Request toRequest(String id) {
-    return new Request(id, "edit.getRefactoring", toJson());
-  }
-
-  @override
+    return new Request(id, "edit.getAssists", toJson());
+  }
+
+  @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is EditGetRefactoringParams) {
-      return kind == other.kind &&
-          file == other.file &&
+    if (other is EditGetAssistsParams) {
+      return file == other.file &&
           offset == other.offset &&
-          length == other.length &&
-          validateOnly == other.validateOnly &&
-          options == other.options;
+          length == other.length;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
     hash = JenkinsSmiHash.combine(hash, file.hashCode);
     hash = JenkinsSmiHash.combine(hash, offset.hashCode);
     hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    hash = JenkinsSmiHash.combine(hash, validateOnly.hashCode);
-    hash = JenkinsSmiHash.combine(hash, options.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * edit.getRefactoring result
+ * edit.getAssists result
  *
  * {
- *   "initialProblems": List<RefactoringProblem>
- *   "optionsProblems": List<RefactoringProblem>
- *   "finalProblems": List<RefactoringProblem>
- *   "feedback": optional RefactoringFeedback
- *   "change": optional SourceChange
- *   "potentialEdits": optional List<String>
+ *   "assists": List<SourceChange>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class EditGetRefactoringResult implements HasToJson {
-  List<RefactoringProblem> _initialProblems;
-
-  List<RefactoringProblem> _optionsProblems;
-
-  List<RefactoringProblem> _finalProblems;
-
-  RefactoringFeedback _feedback;
-
-  SourceChange _change;
-
-  List<String> _potentialEdits;
+class EditGetAssistsResult implements ResponseResult {
+  List<SourceChange> _assists;
 
   /**
-   * The initial status of the refactoring, i.e. problems related to the
-   * context in which the refactoring is requested. The array will be empty if
-   * there are no known problems.
+   * The assists that are available at the given location.
    */
-  List<RefactoringProblem> get initialProblems => _initialProblems;
+  List<SourceChange> get assists => _assists;
 
   /**
-   * The initial status of the refactoring, i.e. problems related to the
-   * context in which the refactoring is requested. The array will be empty if
-   * there are no known problems.
+   * The assists that are available at the given location.
    */
-  void set initialProblems(List<RefactoringProblem> value) {
+  void set assists(List<SourceChange> value) {
     assert(value != null);
-    this._initialProblems = value;
+    this._assists = value;
   }
 
-  /**
-   * The options validation status, i.e. problems in the given options, such as
-   * light-weight validation of a new name, flags compatibility, etc. The array
-   * will be empty if there are no known problems.
-   */
-  List<RefactoringProblem> get optionsProblems => _optionsProblems;
-
-  /**
-   * The options validation status, i.e. problems in the given options, such as
-   * light-weight validation of a new name, flags compatibility, etc. The array
-   * will be empty if there are no known problems.
-   */
-  void set optionsProblems(List<RefactoringProblem> value) {
-    assert(value != null);
-    this._optionsProblems = value;
+  EditGetAssistsResult(List<SourceChange> assists) {
+    this.assists = assists;
   }
 
-  /**
-   * The final status of the refactoring, i.e. problems identified in the
-   * result of a full, potentially expensive validation and / or change
-   * creation. The array will be empty if there are no known problems.
-   */
-  List<RefactoringProblem> get finalProblems => _finalProblems;
-
-  /**
-   * The final status of the refactoring, i.e. problems identified in the
-   * result of a full, potentially expensive validation and / or change
-   * creation. The array will be empty if there are no known problems.
-   */
-  void set finalProblems(List<RefactoringProblem> value) {
-    assert(value != null);
-    this._finalProblems = value;
-  }
-
-  /**
-   * Data used to provide feedback to the user. The structure of the data is
-   * dependent on the kind of refactoring being created. The data that is
-   * returned is documented in the section titled Refactorings, labeled as
-   * "Feedback".
-   */
-  RefactoringFeedback get feedback => _feedback;
-
-  /**
-   * Data used to provide feedback to the user. The structure of the data is
-   * dependent on the kind of refactoring being created. The data that is
-   * returned is documented in the section titled Refactorings, labeled as
-   * "Feedback".
-   */
-  void set feedback(RefactoringFeedback value) {
-    this._feedback = value;
-  }
-
-  /**
-   * The changes that are to be applied to affect the refactoring. This field
-   * will be omitted if there are problems that prevent a set of changes from
-   * being computed, such as having no options specified for a refactoring that
-   * requires them, or if only validation was requested.
-   */
-  SourceChange get change => _change;
-
-  /**
-   * The changes that are to be applied to affect the refactoring. This field
-   * will be omitted if there are problems that prevent a set of changes from
-   * being computed, such as having no options specified for a refactoring that
-   * requires them, or if only validation was requested.
-   */
-  void set change(SourceChange value) {
-    this._change = value;
-  }
-
-  /**
-   * The ids of source edits that are not known to be valid. An edit is not
-   * known to be valid if there was insufficient type information for the
-   * server to be able to determine whether or not the code needs to be
-   * modified, such as when a member is being renamed and there is a reference
-   * to a member from an unknown type. This field will be omitted if the change
-   * field is omitted or if there are no potential edits for the refactoring.
-   */
-  List<String> get potentialEdits => _potentialEdits;
-
-  /**
-   * The ids of source edits that are not known to be valid. An edit is not
-   * known to be valid if there was insufficient type information for the
-   * server to be able to determine whether or not the code needs to be
-   * modified, such as when a member is being renamed and there is a reference
-   * to a member from an unknown type. This field will be omitted if the change
-   * field is omitted or if there are no potential edits for the refactoring.
-   */
-  void set potentialEdits(List<String> value) {
-    this._potentialEdits = value;
-  }
-
-  EditGetRefactoringResult(
-      List<RefactoringProblem> initialProblems,
-      List<RefactoringProblem> optionsProblems,
-      List<RefactoringProblem> finalProblems,
-      {RefactoringFeedback feedback,
-      SourceChange change,
-      List<String> potentialEdits}) {
-    this.initialProblems = initialProblems;
-    this.optionsProblems = optionsProblems;
-    this.finalProblems = finalProblems;
-    this.feedback = feedback;
-    this.change = change;
-    this.potentialEdits = potentialEdits;
-  }
-
-  factory EditGetRefactoringResult.fromJson(
+  factory EditGetAssistsResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<RefactoringProblem> initialProblems;
-      if (json.containsKey("initialProblems")) {
-        initialProblems = jsonDecoder.decodeList(
-            jsonPath + ".initialProblems",
-            json["initialProblems"],
+      List<SourceChange> assists;
+      if (json.containsKey("assists")) {
+        assists = jsonDecoder.decodeList(
+            jsonPath + ".assists",
+            json["assists"],
             (String jsonPath, Object json) =>
-                new RefactoringProblem.fromJson(jsonDecoder, jsonPath, json));
+                new SourceChange.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "initialProblems");
+        throw jsonDecoder.mismatch(jsonPath, "assists");
       }
-      List<RefactoringProblem> optionsProblems;
-      if (json.containsKey("optionsProblems")) {
-        optionsProblems = jsonDecoder.decodeList(
-            jsonPath + ".optionsProblems",
-            json["optionsProblems"],
-            (String jsonPath, Object json) =>
-                new RefactoringProblem.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "optionsProblems");
-      }
-      List<RefactoringProblem> finalProblems;
-      if (json.containsKey("finalProblems")) {
-        finalProblems = jsonDecoder.decodeList(
-            jsonPath + ".finalProblems",
-            json["finalProblems"],
-            (String jsonPath, Object json) =>
-                new RefactoringProblem.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "finalProblems");
-      }
-      RefactoringFeedback feedback;
-      if (json.containsKey("feedback")) {
-        feedback = new RefactoringFeedback.fromJson(
-            jsonDecoder, jsonPath + ".feedback", json["feedback"], json);
-      }
-      SourceChange change;
-      if (json.containsKey("change")) {
-        change = new SourceChange.fromJson(
-            jsonDecoder, jsonPath + ".change", json["change"]);
-      }
-      List<String> potentialEdits;
-      if (json.containsKey("potentialEdits")) {
-        potentialEdits = jsonDecoder.decodeList(jsonPath + ".potentialEdits",
-            json["potentialEdits"], jsonDecoder.decodeString);
-      }
-      return new EditGetRefactoringResult(
-          initialProblems, optionsProblems, finalProblems,
-          feedback: feedback, change: change, potentialEdits: potentialEdits);
+      return new EditGetAssistsResult(assists);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getRefactoring result", json);
+      throw jsonDecoder.mismatch(jsonPath, "edit.getAssists result", json);
     }
   }
 
-  factory EditGetRefactoringResult.fromResponse(Response response) {
-    return new EditGetRefactoringResult.fromJson(
+  factory EditGetAssistsResult.fromResponse(Response response) {
+    return new EditGetAssistsResult.fromJson(
         new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
         "result",
-        response._result);
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["initialProblems"] = initialProblems
-        .map((RefactoringProblem value) => value.toJson())
-        .toList();
-    result["optionsProblems"] = optionsProblems
-        .map((RefactoringProblem value) => value.toJson())
-        .toList();
-    result["finalProblems"] = finalProblems
-        .map((RefactoringProblem value) => value.toJson())
-        .toList();
-    if (feedback != null) {
-      result["feedback"] = feedback.toJson();
-    }
-    if (change != null) {
-      result["change"] = change.toJson();
-    }
-    if (potentialEdits != null) {
-      result["potentialEdits"] = potentialEdits;
-    }
+    result["assists"] =
+        assists.map((SourceChange value) => value.toJson()).toList();
     return result;
   }
 
+  @override
   Response toResponse(String id) {
     return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is EditGetRefactoringResult) {
-      return listEqual(initialProblems, other.initialProblems,
-              (RefactoringProblem a, RefactoringProblem b) => a == b) &&
-          listEqual(optionsProblems, other.optionsProblems,
-              (RefactoringProblem a, RefactoringProblem b) => a == b) &&
-          listEqual(finalProblems, other.finalProblems,
-              (RefactoringProblem a, RefactoringProblem b) => a == b) &&
-          feedback == other.feedback &&
-          change == other.change &&
-          listEqual(potentialEdits, other.potentialEdits,
-              (String a, String b) => a == b);
+    if (other is EditGetAssistsResult) {
+      return listEqual(
+          assists, other.assists, (SourceChange a, SourceChange b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, initialProblems.hashCode);
-    hash = JenkinsSmiHash.combine(hash, optionsProblems.hashCode);
-    hash = JenkinsSmiHash.combine(hash, finalProblems.hashCode);
-    hash = JenkinsSmiHash.combine(hash, feedback.hashCode);
-    hash = JenkinsSmiHash.combine(hash, change.hashCode);
-    hash = JenkinsSmiHash.combine(hash, potentialEdits.hashCode);
+    hash = JenkinsSmiHash.combine(hash, assists.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * edit.getStatementCompletion params
+ * edit.getAvailableRefactorings params
  *
  * {
  *   "file": FilePath
  *   "offset": int
+ *   "length": int
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class EditGetStatementCompletionParams implements HasToJson {
+class EditGetAvailableRefactoringsParams implements RequestParams {
   String _file;
 
   int _offset;
 
+  int _length;
+
   /**
-   * The file containing the statement to be completed.
+   * The file containing the code on which the refactoring would be based.
    */
   String get file => _file;
 
   /**
-   * The file containing the statement to be completed.
+   * The file containing the code on which the refactoring would be based.
    */
   void set file(String value) {
     assert(value != null);
     this._file = value;
   }
 
   /**
-   * The offset used to identify the statement to be completed.
+   * The offset of the code on which the refactoring would be based.
    */
   int get offset => _offset;
 
   /**
-   * The offset used to identify the statement to be completed.
+   * The offset of the code on which the refactoring would be based.
    */
   void set offset(int value) {
     assert(value != null);
     this._offset = value;
   }
 
-  EditGetStatementCompletionParams(String file, int offset) {
+  /**
+   * The length of the code on which the refactoring would be based.
+   */
+  int get length => _length;
+
+  /**
+   * The length of the code on which the refactoring would be based.
+   */
+  void set length(int value) {
+    assert(value != null);
+    this._length = value;
+  }
+
+  EditGetAvailableRefactoringsParams(String file, int offset, int length) {
     this.file = file;
     this.offset = offset;
+    this.length = length;
   }
 
-  factory EditGetStatementCompletionParams.fromJson(
+  factory EditGetAvailableRefactoringsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
       int offset;
       if (json.containsKey("offset")) {
         offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
+        throw jsonDecoder.mismatch(jsonPath, "offset");
       }
-      return new EditGetStatementCompletionParams(file, offset);
+      int length;
+      if (json.containsKey("length")) {
+        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "length");
+      }
+      return new EditGetAvailableRefactoringsParams(file, offset, length);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "edit.getStatementCompletion params", json);
+          jsonPath, "edit.getAvailableRefactorings params", json);
     }
   }
 
-  factory EditGetStatementCompletionParams.fromRequest(Request request) {
-    return new EditGetStatementCompletionParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory EditGetAvailableRefactoringsParams.fromRequest(Request request) {
+    return new EditGetAvailableRefactoringsParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["file"] = file;
     result["offset"] = offset;
+    result["length"] = length;
     return result;
   }
 
+  @override
   Request toRequest(String id) {
-    return new Request(id, "edit.getStatementCompletion", toJson());
+    return new Request(id, "edit.getAvailableRefactorings", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is EditGetStatementCompletionParams) {
-      return file == other.file && offset == other.offset;
+    if (other is EditGetAvailableRefactoringsParams) {
+      return file == other.file &&
+          offset == other.offset &&
+          length == other.length;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, file.hashCode);
     hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, length.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * edit.getStatementCompletion result
+ * edit.getAvailableRefactorings result
  *
  * {
- *   "change": SourceChange
- *   "whitespaceOnly": bool
+ *   "kinds": List<RefactoringKind>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class EditGetStatementCompletionResult implements HasToJson {
-  SourceChange _change;
-
-  bool _whitespaceOnly;
+class EditGetAvailableRefactoringsResult implements ResponseResult {
+  List<RefactoringKind> _kinds;
 
   /**
-   * The change to be applied in order to complete the statement.
+   * The kinds of refactorings that are valid for the given selection.
    */
-  SourceChange get change => _change;
+  List<RefactoringKind> get kinds => _kinds;
 
   /**
-   * The change to be applied in order to complete the statement.
+   * The kinds of refactorings that are valid for the given selection.
    */
-  void set change(SourceChange value) {
+  void set kinds(List<RefactoringKind> value) {
     assert(value != null);
-    this._change = value;
+    this._kinds = value;
   }
 
-  /**
-   * Will be true if the change contains nothing but whitespace characters, or
-   * is empty.
-   */
-  bool get whitespaceOnly => _whitespaceOnly;
-
-  /**
-   * Will be true if the change contains nothing but whitespace characters, or
-   * is empty.
-   */
-  void set whitespaceOnly(bool value) {
-    assert(value != null);
-    this._whitespaceOnly = value;
+  EditGetAvailableRefactoringsResult(List<RefactoringKind> kinds) {
+    this.kinds = kinds;
   }
 
-  EditGetStatementCompletionResult(SourceChange change, bool whitespaceOnly) {
-    this.change = change;
-    this.whitespaceOnly = whitespaceOnly;
-  }
-
-  factory EditGetStatementCompletionResult.fromJson(
+  factory EditGetAvailableRefactoringsResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      SourceChange change;
-      if (json.containsKey("change")) {
-        change = new SourceChange.fromJson(
-            jsonDecoder, jsonPath + ".change", json["change"]);
+      List<RefactoringKind> kinds;
+      if (json.containsKey("kinds")) {
+        kinds = jsonDecoder.decodeList(
+            jsonPath + ".kinds",
+            json["kinds"],
+            (String jsonPath, Object json) =>
+                new RefactoringKind.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "change");
+        throw jsonDecoder.mismatch(jsonPath, "kinds");
       }
-      bool whitespaceOnly;
-      if (json.containsKey("whitespaceOnly")) {
-        whitespaceOnly = jsonDecoder.decodeBool(
-            jsonPath + ".whitespaceOnly", json["whitespaceOnly"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "whitespaceOnly");
-      }
-      return new EditGetStatementCompletionResult(change, whitespaceOnly);
+      return new EditGetAvailableRefactoringsResult(kinds);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "edit.getStatementCompletion result", json);
+          jsonPath, "edit.getAvailableRefactorings result", json);
     }
   }
 
-  factory EditGetStatementCompletionResult.fromResponse(Response response) {
-    return new EditGetStatementCompletionResult.fromJson(
+  factory EditGetAvailableRefactoringsResult.fromResponse(Response response) {
+    return new EditGetAvailableRefactoringsResult.fromJson(
         new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
         "result",
-        response._result);
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["change"] = change.toJson();
-    result["whitespaceOnly"] = whitespaceOnly;
+    result["kinds"] =
+        kinds.map((RefactoringKind value) => value.toJson()).toList();
     return result;
   }
 
+  @override
   Response toResponse(String id) {
     return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is EditGetStatementCompletionResult) {
-      return change == other.change && whitespaceOnly == other.whitespaceOnly;
+    if (other is EditGetAvailableRefactoringsResult) {
+      return listEqual(
+          kinds, other.kinds, (RefactoringKind a, RefactoringKind b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, change.hashCode);
-    hash = JenkinsSmiHash.combine(hash, whitespaceOnly.hashCode);
+    hash = JenkinsSmiHash.combine(hash, kinds.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * edit.sortMembers params
+ * edit.getFixes params
  *
  * {
  *   "file": FilePath
+ *   "offset": int
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class EditSortMembersParams implements HasToJson {
+class EditGetFixesParams implements RequestParams {
   String _file;
 
+  int _offset;
+
   /**
-   * The Dart file to sort.
+   * The file containing the errors for which fixes are being requested.
    */
   String get file => _file;
 
   /**
-   * The Dart file to sort.
+   * The file containing the errors for which fixes are being requested.
    */
   void set file(String value) {
     assert(value != null);
     this._file = value;
   }
 
-  EditSortMembersParams(String file) {
-    this.file = file;
+  /**
+   * The offset used to select the errors for which fixes will be returned.
+   */
+  int get offset => _offset;
+
+  /**
+   * The offset used to select the errors for which fixes will be returned.
+   */
+  void set offset(int value) {
+    assert(value != null);
+    this._offset = value;
   }
 
-  factory EditSortMembersParams.fromJson(
+  EditGetFixesParams(String file, int offset) {
+    this.file = file;
+    this.offset = offset;
+  }
+
+  factory EditGetFixesParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      return new EditSortMembersParams(file);
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offset");
+      }
+      return new EditGetFixesParams(file, offset);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.sortMembers params", json);
+      throw jsonDecoder.mismatch(jsonPath, "edit.getFixes params", json);
     }
   }
 
-  factory EditSortMembersParams.fromRequest(Request request) {
-    return new EditSortMembersParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory EditGetFixesParams.fromRequest(Request request) {
+    return new EditGetFixesParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["file"] = file;
+    result["offset"] = offset;
     return result;
   }
 
+  @override
   Request toRequest(String id) {
-    return new Request(id, "edit.sortMembers", toJson());
+    return new Request(id, "edit.getFixes", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is EditSortMembersParams) {
-      return file == other.file;
+    if (other is EditGetFixesParams) {
+      return file == other.file && offset == other.offset;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * edit.sortMembers result
+ * edit.getFixes result
  *
  * {
- *   "edit": SourceFileEdit
+ *   "fixes": List<AnalysisErrorFixes>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class EditSortMembersResult implements HasToJson {
-  SourceFileEdit _edit;
+class EditGetFixesResult implements ResponseResult {
+  List<AnalysisErrorFixes> _fixes;
 
   /**
-   * The file edit that is to be applied to the given file to effect the
-   * sorting.
+   * The fixes that are available for the errors at the given offset.
    */
-  SourceFileEdit get edit => _edit;
+  List<AnalysisErrorFixes> get fixes => _fixes;
 
   /**
-   * The file edit that is to be applied to the given file to effect the
-   * sorting.
+   * The fixes that are available for the errors at the given offset.
    */
-  void set edit(SourceFileEdit value) {
+  void set fixes(List<AnalysisErrorFixes> value) {
     assert(value != null);
-    this._edit = value;
+    this._fixes = value;
   }
 
-  EditSortMembersResult(SourceFileEdit edit) {
-    this.edit = edit;
+  EditGetFixesResult(List<AnalysisErrorFixes> fixes) {
+    this.fixes = fixes;
   }
 
-  factory EditSortMembersResult.fromJson(
+  factory EditGetFixesResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      SourceFileEdit edit;
-      if (json.containsKey("edit")) {
-        edit = new SourceFileEdit.fromJson(
-            jsonDecoder, jsonPath + ".edit", json["edit"]);
+      List<AnalysisErrorFixes> fixes;
+      if (json.containsKey("fixes")) {
+        fixes = jsonDecoder.decodeList(
+            jsonPath + ".fixes",
+            json["fixes"],
+            (String jsonPath, Object json) =>
+                new AnalysisErrorFixes.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "edit");
+        throw jsonDecoder.mismatch(jsonPath, "fixes");
       }
-      return new EditSortMembersResult(edit);
+      return new EditGetFixesResult(fixes);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.sortMembers result", json);
+      throw jsonDecoder.mismatch(jsonPath, "edit.getFixes result", json);
     }
   }
 
-  factory EditSortMembersResult.fromResponse(Response response) {
-    return new EditSortMembersResult.fromJson(
+  factory EditGetFixesResult.fromResponse(Response response) {
+    return new EditGetFixesResult.fromJson(
         new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
         "result",
-        response._result);
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["edit"] = edit.toJson();
+    result["fixes"] =
+        fixes.map((AnalysisErrorFixes value) => value.toJson()).toList();
     return result;
   }
 
+  @override
   Response toResponse(String id) {
     return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is EditSortMembersResult) {
-      return edit == other.edit;
+    if (other is EditGetFixesResult) {
+      return listEqual(fixes, other.fixes,
+          (AnalysisErrorFixes a, AnalysisErrorFixes b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, edit.hashCode);
+    hash = JenkinsSmiHash.combine(hash, fixes.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * edit.organizeDirectives params
+ * edit.getRefactoring params
  *
  * {
+ *   "kind": RefactoringKind
  *   "file": FilePath
+ *   "offset": int
+ *   "length": int
+ *   "validateOnly": bool
+ *   "options": optional RefactoringOptions
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class EditOrganizeDirectivesParams implements HasToJson {
+class EditGetRefactoringParams implements RequestParams {
+  RefactoringKind _kind;
+
   String _file;
 
-  /**
-   * The Dart file to organize directives in.
+  int _offset;
+
+  int _length;
+
+  bool _validateOnly;
+
+  RefactoringOptions _options;
+
+  /**
+   * The kind of refactoring to be performed.
+   */
+  RefactoringKind get kind => _kind;
+
+  /**
+   * The kind of refactoring to be performed.
+   */
+  void set kind(RefactoringKind value) {
+    assert(value != null);
+    this._kind = value;
+  }
+
+  /**
+   * The file containing the code involved in the refactoring.
    */
   String get file => _file;
 
   /**
-   * The Dart file to organize directives in.
+   * The file containing the code involved in the refactoring.
    */
   void set file(String value) {
     assert(value != null);
     this._file = value;
   }
 
-  EditOrganizeDirectivesParams(String file) {
+  /**
+   * The offset of the region involved in the refactoring.
+   */
+  int get offset => _offset;
+
+  /**
+   * The offset of the region involved in the refactoring.
+   */
+  void set offset(int value) {
+    assert(value != null);
+    this._offset = value;
+  }
+
+  /**
+   * The length of the region involved in the refactoring.
+   */
+  int get length => _length;
+
+  /**
+   * The length of the region involved in the refactoring.
+   */
+  void set length(int value) {
+    assert(value != null);
+    this._length = value;
+  }
+
+  /**
+   * True if the client is only requesting that the values of the options be
+   * validated and no change be generated.
+   */
+  bool get validateOnly => _validateOnly;
+
+  /**
+   * True if the client is only requesting that the values of the options be
+   * validated and no change be generated.
+   */
+  void set validateOnly(bool value) {
+    assert(value != null);
+    this._validateOnly = value;
+  }
+
+  /**
+   * Data used to provide values provided by the user. The structure of the
+   * data is dependent on the kind of refactoring being performed. The data
+   * that is expected is documented in the section titled Refactorings, labeled
+   * as "Options". This field can be omitted if the refactoring does not
+   * require any options or if the values of those options are not known.
+   */
+  RefactoringOptions get options => _options;
+
+  /**
+   * Data used to provide values provided by the user. The structure of the
+   * data is dependent on the kind of refactoring being performed. The data
+   * that is expected is documented in the section titled Refactorings, labeled
+   * as "Options". This field can be omitted if the refactoring does not
+   * require any options or if the values of those options are not known.
+   */
+  void set options(RefactoringOptions value) {
+    this._options = value;
+  }
+
+  EditGetRefactoringParams(RefactoringKind kind, String file, int offset,
+      int length, bool validateOnly,
+      {RefactoringOptions options}) {
+    this.kind = kind;
     this.file = file;
-  }
-
-  factory EditOrganizeDirectivesParams.fromJson(
+    this.offset = offset;
+    this.length = length;
+    this.validateOnly = validateOnly;
+    this.options = options;
+  }
+
+  factory EditGetRefactoringParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
+      RefactoringKind kind;
+      if (json.containsKey("kind")) {
+        kind = new RefactoringKind.fromJson(
+            jsonDecoder, jsonPath + ".kind", json["kind"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "kind");
+      }
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
-      }
-      return new EditOrganizeDirectivesParams(file);
+        throw jsonDecoder.mismatch(jsonPath, "file");
+      }
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offset");
+      }
+      int length;
+      if (json.containsKey("length")) {
+        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "length");
+      }
+      bool validateOnly;
+      if (json.containsKey("validateOnly")) {
+        validateOnly = jsonDecoder.decodeBool(
+            jsonPath + ".validateOnly", json["validateOnly"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "validateOnly");
+      }
+      RefactoringOptions options;
+      if (json.containsKey("options")) {
+        options = new RefactoringOptions.fromJson(
+            jsonDecoder, jsonPath + ".options", json["options"], kind);
+      }
+      return new EditGetRefactoringParams(
+          kind, file, offset, length, validateOnly,
+          options: options);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "edit.organizeDirectives params", json);
+      throw jsonDecoder.mismatch(jsonPath, "edit.getRefactoring params", json);
     }
   }
 
-  factory EditOrganizeDirectivesParams.fromRequest(Request request) {
-    return new EditOrganizeDirectivesParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
-  }
-
+  factory EditGetRefactoringParams.fromRequest(Request request) {
+    var params = new EditGetRefactoringParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
+    REQUEST_ID_REFACTORING_KINDS[request.id] = params.kind;
+    return params;
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
+    result["kind"] = kind.toJson();
     result["file"] = file;
+    result["offset"] = offset;
+    result["length"] = length;
+    result["validateOnly"] = validateOnly;
+    if (options != null) {
+      result["options"] = options.toJson();
+    }
     return result;
   }
 
+  @override
   Request toRequest(String id) {
-    return new Request(id, "edit.organizeDirectives", toJson());
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is EditOrganizeDirectivesParams) {
-      return file == other.file;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * edit.organizeDirectives result
- *
- * {
- *   "edit": SourceFileEdit
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class EditOrganizeDirectivesResult implements HasToJson {
-  SourceFileEdit _edit;
-
-  /**
-   * The file edit that is to be applied to the given file to effect the
-   * organizing.
-   */
-  SourceFileEdit get edit => _edit;
-
-  /**
-   * The file edit that is to be applied to the given file to effect the
-   * organizing.
-   */
-  void set edit(SourceFileEdit value) {
-    assert(value != null);
-    this._edit = value;
-  }
-
-  EditOrganizeDirectivesResult(SourceFileEdit edit) {
-    this.edit = edit;
-  }
-
-  factory EditOrganizeDirectivesResult.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      SourceFileEdit edit;
-      if (json.containsKey("edit")) {
-        edit = new SourceFileEdit.fromJson(
-            jsonDecoder, jsonPath + ".edit", json["edit"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "edit");
-      }
-      return new EditOrganizeDirectivesResult(edit);
-    } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "edit.organizeDirectives result", json);
-    }
-  }
-
-  factory EditOrganizeDirectivesResult.fromResponse(Response response) {
-    return new EditOrganizeDirectivesResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["edit"] = edit.toJson();
-    return result;
-  }
-
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
-  }
-
-  @override
+    return new Request(id, "edit.getRefactoring", toJson());
+  }
+
+  @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is EditOrganizeDirectivesResult) {
-      return edit == other.edit;
+    if (other is EditGetRefactoringParams) {
+      return kind == other.kind &&
+          file == other.file &&
+          offset == other.offset &&
+          length == other.length &&
+          validateOnly == other.validateOnly &&
+          options == other.options;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, edit.hashCode);
+    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, length.hashCode);
+    hash = JenkinsSmiHash.combine(hash, validateOnly.hashCode);
+    hash = JenkinsSmiHash.combine(hash, options.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * execution.createContext params
+ * edit.getRefactoring result
  *
  * {
- *   "contextRoot": FilePath
+ *   "initialProblems": List<RefactoringProblem>
+ *   "optionsProblems": List<RefactoringProblem>
+ *   "finalProblems": List<RefactoringProblem>
+ *   "feedback": optional RefactoringFeedback
+ *   "change": optional SourceChange
+ *   "potentialEdits": optional List<String>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ExecutionCreateContextParams implements HasToJson {
-  String _contextRoot;
-
-  /**
-   * The path of the Dart or HTML file that will be launched, or the path of
-   * the directory containing the file.
-   */
-  String get contextRoot => _contextRoot;
-
-  /**
-   * The path of the Dart or HTML file that will be launched, or the path of
-   * the directory containing the file.
-   */
-  void set contextRoot(String value) {
+class EditGetRefactoringResult implements ResponseResult {
+  List<RefactoringProblem> _initialProblems;
+
+  List<RefactoringProblem> _optionsProblems;
+
+  List<RefactoringProblem> _finalProblems;
+
+  RefactoringFeedback _feedback;
+
+  SourceChange _change;
+
+  List<String> _potentialEdits;
+
+  /**
+   * The initial status of the refactoring, i.e. problems related to the
+   * context in which the refactoring is requested. The array will be empty if
+   * there are no known problems.
+   */
+  List<RefactoringProblem> get initialProblems => _initialProblems;
+
+  /**
+   * The initial status of the refactoring, i.e. problems related to the
+   * context in which the refactoring is requested. The array will be empty if
+   * there are no known problems.
+   */
+  void set initialProblems(List<RefactoringProblem> value) {
     assert(value != null);
-    this._contextRoot = value;
-  }
-
-  ExecutionCreateContextParams(String contextRoot) {
-    this.contextRoot = contextRoot;
-  }
-
-  factory ExecutionCreateContextParams.fromJson(
+    this._initialProblems = value;
+  }
+
+  /**
+   * The options validation status, i.e. problems in the given options, such as
+   * light-weight validation of a new name, flags compatibility, etc. The array
+   * will be empty if there are no known problems.
+   */
+  List<RefactoringProblem> get optionsProblems => _optionsProblems;
+
+  /**
+   * The options validation status, i.e. problems in the given options, such as
+   * light-weight validation of a new name, flags compatibility, etc. The array
+   * will be empty if there are no known problems.
+   */
+  void set optionsProblems(List<RefactoringProblem> value) {
+    assert(value != null);
+    this._optionsProblems = value;
+  }
+
+  /**
+   * The final status of the refactoring, i.e. problems identified in the
+   * result of a full, potentially expensive validation and / or change
+   * creation. The array will be empty if there are no known problems.
+   */
+  List<RefactoringProblem> get finalProblems => _finalProblems;
+
+  /**
+   * The final status of the refactoring, i.e. problems identified in the
+   * result of a full, potentially expensive validation and / or change
+   * creation. The array will be empty if there are no known problems.
+   */
+  void set finalProblems(List<RefactoringProblem> value) {
+    assert(value != null);
+    this._finalProblems = value;
+  }
+
+  /**
+   * Data used to provide feedback to the user. The structure of the data is
+   * dependent on the kind of refactoring being created. The data that is
+   * returned is documented in the section titled Refactorings, labeled as
+   * "Feedback".
+   */
+  RefactoringFeedback get feedback => _feedback;
+
+  /**
+   * Data used to provide feedback to the user. The structure of the data is
+   * dependent on the kind of refactoring being created. The data that is
+   * returned is documented in the section titled Refactorings, labeled as
+   * "Feedback".
+   */
+  void set feedback(RefactoringFeedback value) {
+    this._feedback = value;
+  }
+
+  /**
+   * The changes that are to be applied to affect the refactoring. This field
+   * will be omitted if there are problems that prevent a set of changes from
+   * being computed, such as having no options specified for a refactoring that
+   * requires them, or if only validation was requested.
+   */
+  SourceChange get change => _change;
+
+  /**
+   * The changes that are to be applied to affect the refactoring. This field
+   * will be omitted if there are problems that prevent a set of changes from
+   * being computed, such as having no options specified for a refactoring that
+   * requires them, or if only validation was requested.
+   */
+  void set change(SourceChange value) {
+    this._change = value;
+  }
+
+  /**
+   * The ids of source edits that are not known to be valid. An edit is not
+   * known to be valid if there was insufficient type information for the
+   * server to be able to determine whether or not the code needs to be
+   * modified, such as when a member is being renamed and there is a reference
+   * to a member from an unknown type. This field will be omitted if the change
+   * field is omitted or if there are no potential edits for the refactoring.
+   */
+  List<String> get potentialEdits => _potentialEdits;
+
+  /**
+   * The ids of source edits that are not known to be valid. An edit is not
+   * known to be valid if there was insufficient type information for the
+   * server to be able to determine whether or not the code needs to be
+   * modified, such as when a member is being renamed and there is a reference
+   * to a member from an unknown type. This field will be omitted if the change
+   * field is omitted or if there are no potential edits for the refactoring.
+   */
+  void set potentialEdits(List<String> value) {
+    this._potentialEdits = value;
+  }
+
+  EditGetRefactoringResult(
+      List<RefactoringProblem> initialProblems,
+      List<RefactoringProblem> optionsProblems,
+      List<RefactoringProblem> finalProblems,
+      {RefactoringFeedback feedback,
+      SourceChange change,
+      List<String> potentialEdits}) {
+    this.initialProblems = initialProblems;
+    this.optionsProblems = optionsProblems;
+    this.finalProblems = finalProblems;
+    this.feedback = feedback;
+    this.change = change;
+    this.potentialEdits = potentialEdits;
+  }
+
+  factory EditGetRefactoringResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String contextRoot;
-      if (json.containsKey("contextRoot")) {
-        contextRoot = jsonDecoder.decodeString(
-            jsonPath + ".contextRoot", json["contextRoot"]);
+      List<RefactoringProblem> initialProblems;
+      if (json.containsKey("initialProblems")) {
+        initialProblems = jsonDecoder.decodeList(
+            jsonPath + ".initialProblems",
+            json["initialProblems"],
+            (String jsonPath, Object json) =>
+                new RefactoringProblem.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "contextRoot");
-      }
-      return new ExecutionCreateContextParams(contextRoot);
+        throw jsonDecoder.mismatch(jsonPath, "initialProblems");
+      }
+      List<RefactoringProblem> optionsProblems;
+      if (json.containsKey("optionsProblems")) {
+        optionsProblems = jsonDecoder.decodeList(
+            jsonPath + ".optionsProblems",
+            json["optionsProblems"],
+            (String jsonPath, Object json) =>
+                new RefactoringProblem.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "optionsProblems");
+      }
+      List<RefactoringProblem> finalProblems;
+      if (json.containsKey("finalProblems")) {
+        finalProblems = jsonDecoder.decodeList(
+            jsonPath + ".finalProblems",
+            json["finalProblems"],
+            (String jsonPath, Object json) =>
+                new RefactoringProblem.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "finalProblems");
+      }
+      RefactoringFeedback feedback;
+      if (json.containsKey("feedback")) {
+        feedback = new RefactoringFeedback.fromJson(
+            jsonDecoder, jsonPath + ".feedback", json["feedback"], json);
+      }
+      SourceChange change;
+      if (json.containsKey("change")) {
+        change = new SourceChange.fromJson(
+            jsonDecoder, jsonPath + ".change", json["change"]);
+      }
+      List<String> potentialEdits;
+      if (json.containsKey("potentialEdits")) {
+        potentialEdits = jsonDecoder.decodeList(jsonPath + ".potentialEdits",
+            json["potentialEdits"], jsonDecoder.decodeString);
+      }
+      return new EditGetRefactoringResult(
+          initialProblems, optionsProblems, finalProblems,
+          feedback: feedback, change: change, potentialEdits: potentialEdits);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "execution.createContext params", json);
-    }
-  }
-
-  factory ExecutionCreateContextParams.fromRequest(Request request) {
-    return new ExecutionCreateContextParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "edit.getRefactoring result", json);
+    }
+  }
+
+  factory EditGetRefactoringResult.fromResponse(Response response) {
+    return new EditGetRefactoringResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["contextRoot"] = contextRoot;
+    result["initialProblems"] = initialProblems
+        .map((RefactoringProblem value) => value.toJson())
+        .toList();
+    result["optionsProblems"] = optionsProblems
+        .map((RefactoringProblem value) => value.toJson())
+        .toList();
+    result["finalProblems"] = finalProblems
+        .map((RefactoringProblem value) => value.toJson())
+        .toList();
+    if (feedback != null) {
+      result["feedback"] = feedback.toJson();
+    }
+    if (change != null) {
+      result["change"] = change.toJson();
+    }
+    if (potentialEdits != null) {
+      result["potentialEdits"] = potentialEdits;
+    }
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "execution.createContext", toJson());
-  }
-
   @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is ExecutionCreateContextParams) {
-      return contextRoot == other.contextRoot;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, contextRoot.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * execution.createContext result
- *
- * {
- *   "id": ExecutionContextId
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ExecutionCreateContextResult implements HasToJson {
-  String _id;
-
-  /**
-   * The identifier used to refer to the execution context that was created.
-   */
-  String get id => _id;
-
-  /**
-   * The identifier used to refer to the execution context that was created.
-   */
-  void set id(String value) {
-    assert(value != null);
-    this._id = value;
-  }
-
-  ExecutionCreateContextResult(String id) {
-    this.id = id;
-  }
-
-  factory ExecutionCreateContextResult.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      String id;
-      if (json.containsKey("id")) {
-        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "id");
-      }
-      return new ExecutionCreateContextResult(id);
-    } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "execution.createContext result", json);
-    }
-  }
-
-  factory ExecutionCreateContextResult.fromResponse(Response response) {
-    return new ExecutionCreateContextResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["id"] = id;
-    return result;
-  }
-
   Response toResponse(String id) {
     return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ExecutionCreateContextResult) {
-      return id == other.id;
+    if (other is EditGetRefactoringResult) {
+      return listEqual(initialProblems, other.initialProblems,
+              (RefactoringProblem a, RefactoringProblem b) => a == b) &&
+          listEqual(optionsProblems, other.optionsProblems,
+              (RefactoringProblem a, RefactoringProblem b) => a == b) &&
+          listEqual(finalProblems, other.finalProblems,
+              (RefactoringProblem a, RefactoringProblem b) => a == b) &&
+          feedback == other.feedback &&
+          change == other.change &&
+          listEqual(potentialEdits, other.potentialEdits,
+              (String a, String b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, id.hashCode);
+    hash = JenkinsSmiHash.combine(hash, initialProblems.hashCode);
+    hash = JenkinsSmiHash.combine(hash, optionsProblems.hashCode);
+    hash = JenkinsSmiHash.combine(hash, finalProblems.hashCode);
+    hash = JenkinsSmiHash.combine(hash, feedback.hashCode);
+    hash = JenkinsSmiHash.combine(hash, change.hashCode);
+    hash = JenkinsSmiHash.combine(hash, potentialEdits.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * execution.deleteContext params
+ * edit.getStatementCompletion params
  *
  * {
- *   "id": ExecutionContextId
+ *   "file": FilePath
+ *   "offset": int
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ExecutionDeleteContextParams implements HasToJson {
-  String _id;
+class EditGetStatementCompletionParams implements RequestParams {
+  String _file;
+
+  int _offset;
 
   /**
-   * The identifier of the execution context that is to be deleted.
+   * The file containing the statement to be completed.
    */
-  String get id => _id;
+  String get file => _file;
 
   /**
-   * The identifier of the execution context that is to be deleted.
+   * The file containing the statement to be completed.
    */
-  void set id(String value) {
+  void set file(String value) {
     assert(value != null);
-    this._id = value;
+    this._file = value;
   }
 
-  ExecutionDeleteContextParams(String id) {
-    this.id = id;
+  /**
+   * The offset used to identify the statement to be completed.
+   */
+  int get offset => _offset;
+
+  /**
+   * The offset used to identify the statement to be completed.
+   */
+  void set offset(int value) {
+    assert(value != null);
+    this._offset = value;
   }
 
-  factory ExecutionDeleteContextParams.fromJson(
+  EditGetStatementCompletionParams(String file, int offset) {
+    this.file = file;
+    this.offset = offset;
+  }
+
+  factory EditGetStatementCompletionParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String id;
-      if (json.containsKey("id")) {
-        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "id");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      return new ExecutionDeleteContextParams(id);
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offset");
+      }
+      return new EditGetStatementCompletionParams(file, offset);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "execution.deleteContext params", json);
+          jsonPath, "edit.getStatementCompletion params", json);
     }
   }
 
-  factory ExecutionDeleteContextParams.fromRequest(Request request) {
-    return new ExecutionDeleteContextParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory EditGetStatementCompletionParams.fromRequest(Request request) {
+    return new EditGetStatementCompletionParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["id"] = id;
+    result["file"] = file;
+    result["offset"] = offset;
     return result;
   }
 
+  @override
   Request toRequest(String id) {
-    return new Request(id, "execution.deleteContext", toJson());
+    return new Request(id, "edit.getStatementCompletion", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ExecutionDeleteContextParams) {
-      return id == other.id;
+    if (other is EditGetStatementCompletionParams) {
+      return file == other.file && offset == other.offset;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, id.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * execution.deleteContext result
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ExecutionDeleteContextResult {
-  Response toResponse(String id) {
-    return new Response(id, result: null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is ExecutionDeleteContextResult) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 479954425;
-  }
-}
-
-/**
- * execution.mapUri params
+ * edit.getStatementCompletion result
  *
  * {
- *   "id": ExecutionContextId
- *   "file": optional FilePath
- *   "uri": optional String
+ *   "change": SourceChange
+ *   "whitespaceOnly": bool
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ExecutionMapUriParams implements HasToJson {
-  String _id;
+class EditGetStatementCompletionResult implements ResponseResult {
+  SourceChange _change;
 
-  String _file;
-
-  String _uri;
+  bool _whitespaceOnly;
 
   /**
-   * The identifier of the execution context in which the URI is to be mapped.
+   * The change to be applied in order to complete the statement.
    */
-  String get id => _id;
+  SourceChange get change => _change;
 
   /**
-   * The identifier of the execution context in which the URI is to be mapped.
+   * The change to be applied in order to complete the statement.
    */
-  void set id(String value) {
+  void set change(SourceChange value) {
     assert(value != null);
-    this._id = value;
+    this._change = value;
   }
 
   /**
-   * The path of the file to be mapped into a URI.
+   * Will be true if the change contains nothing but whitespace characters, or
+   * is empty.
    */
-  String get file => _file;
+  bool get whitespaceOnly => _whitespaceOnly;
 
   /**
-   * The path of the file to be mapped into a URI.
+   * Will be true if the change contains nothing but whitespace characters, or
+   * is empty.
    */
-  void set file(String value) {
-    this._file = value;
+  void set whitespaceOnly(bool value) {
+    assert(value != null);
+    this._whitespaceOnly = value;
   }
 
-  /**
-   * The URI to be mapped into a file path.
-   */
-  String get uri => _uri;
-
-  /**
-   * The URI to be mapped into a file path.
-   */
-  void set uri(String value) {
-    this._uri = value;
+  EditGetStatementCompletionResult(SourceChange change, bool whitespaceOnly) {
+    this.change = change;
+    this.whitespaceOnly = whitespaceOnly;
   }
 
-  ExecutionMapUriParams(String id, {String file, String uri}) {
-    this.id = id;
-    this.file = file;
-    this.uri = uri;
-  }
-
-  factory ExecutionMapUriParams.fromJson(
+  factory EditGetStatementCompletionResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String id;
-      if (json.containsKey("id")) {
-        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      SourceChange change;
+      if (json.containsKey("change")) {
+        change = new SourceChange.fromJson(
+            jsonDecoder, jsonPath + ".change", json["change"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "id");
+        throw jsonDecoder.mismatch(jsonPath, "change");
       }
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
+      bool whitespaceOnly;
+      if (json.containsKey("whitespaceOnly")) {
+        whitespaceOnly = jsonDecoder.decodeBool(
+            jsonPath + ".whitespaceOnly", json["whitespaceOnly"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "whitespaceOnly");
       }
-      String uri;
-      if (json.containsKey("uri")) {
-        uri = jsonDecoder.decodeString(jsonPath + ".uri", json["uri"]);
-      }
-      return new ExecutionMapUriParams(id, file: file, uri: uri);
+      return new EditGetStatementCompletionResult(change, whitespaceOnly);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "execution.mapUri params", json);
+      throw jsonDecoder.mismatch(
+          jsonPath, "edit.getStatementCompletion result", json);
     }
   }
 
-  factory ExecutionMapUriParams.fromRequest(Request request) {
-    return new ExecutionMapUriParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory EditGetStatementCompletionResult.fromResponse(Response response) {
+    return new EditGetStatementCompletionResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["id"] = id;
-    if (file != null) {
-      result["file"] = file;
-    }
-    if (uri != null) {
-      result["uri"] = uri;
-    }
+    result["change"] = change.toJson();
+    result["whitespaceOnly"] = whitespaceOnly;
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "execution.mapUri", toJson());
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ExecutionMapUriParams) {
-      return id == other.id && file == other.file && uri == other.uri;
+    if (other is EditGetStatementCompletionResult) {
+      return change == other.change && whitespaceOnly == other.whitespaceOnly;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, id.hashCode);
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, uri.hashCode);
+    hash = JenkinsSmiHash.combine(hash, change.hashCode);
+    hash = JenkinsSmiHash.combine(hash, whitespaceOnly.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * execution.mapUri result
+ * edit.organizeDirectives params
  *
  * {
- *   "file": optional FilePath
- *   "uri": optional String
+ *   "file": FilePath
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ExecutionMapUriResult implements HasToJson {
+class EditOrganizeDirectivesParams implements RequestParams {
   String _file;
 
-  String _uri;
-
   /**
-   * The file to which the URI was mapped. This field is omitted if the uri
-   * field was not given in the request.
+   * The Dart file to organize directives in.
    */
   String get file => _file;
 
   /**
-   * The file to which the URI was mapped. This field is omitted if the uri
-   * field was not given in the request.
+   * The Dart file to organize directives in.
    */
   void set file(String value) {
+    assert(value != null);
     this._file = value;
   }
 
-  /**
-   * The URI to which the file path was mapped. This field is omitted if the
-   * file field was not given in the request.
-   */
-  String get uri => _uri;
-
-  /**
-   * The URI to which the file path was mapped. This field is omitted if the
-   * file field was not given in the request.
-   */
-  void set uri(String value) {
-    this._uri = value;
+  EditOrganizeDirectivesParams(String file) {
+    this.file = file;
   }
 
-  ExecutionMapUriResult({String file, String uri}) {
-    this.file = file;
-    this.uri = uri;
-  }
-
-  factory ExecutionMapUriResult.fromJson(
+  factory EditOrganizeDirectivesParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      String uri;
-      if (json.containsKey("uri")) {
-        uri = jsonDecoder.decodeString(jsonPath + ".uri", json["uri"]);
-      }
-      return new ExecutionMapUriResult(file: file, uri: uri);
+      return new EditOrganizeDirectivesParams(file);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "execution.mapUri result", json);
+      throw jsonDecoder.mismatch(
+          jsonPath, "edit.organizeDirectives params", json);
     }
   }
 
-  factory ExecutionMapUriResult.fromResponse(Response response) {
-    return new ExecutionMapUriResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
+  factory EditOrganizeDirectivesParams.fromRequest(Request request) {
+    return new EditOrganizeDirectivesParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    if (file != null) {
-      result["file"] = file;
-    }
-    if (uri != null) {
-      result["uri"] = uri;
-    }
+    result["file"] = file;
     return result;
   }
 
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "edit.organizeDirectives", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ExecutionMapUriResult) {
-      return file == other.file && uri == other.uri;
+    if (other is EditOrganizeDirectivesParams) {
+      return file == other.file;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, uri.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * execution.setSubscriptions params
+ * edit.organizeDirectives result
  *
  * {
- *   "subscriptions": List<ExecutionService>
+ *   "edit": SourceFileEdit
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ExecutionSetSubscriptionsParams implements HasToJson {
-  List<ExecutionService> _subscriptions;
+class EditOrganizeDirectivesResult implements ResponseResult {
+  SourceFileEdit _edit;
 
   /**
-   * A list of the services being subscribed to.
+   * The file edit that is to be applied to the given file to effect the
+   * organizing.
    */
-  List<ExecutionService> get subscriptions => _subscriptions;
+  SourceFileEdit get edit => _edit;
 
   /**
-   * A list of the services being subscribed to.
+   * The file edit that is to be applied to the given file to effect the
+   * organizing.
    */
-  void set subscriptions(List<ExecutionService> value) {
+  void set edit(SourceFileEdit value) {
     assert(value != null);
-    this._subscriptions = value;
+    this._edit = value;
   }
 
-  ExecutionSetSubscriptionsParams(List<ExecutionService> subscriptions) {
-    this.subscriptions = subscriptions;
+  EditOrganizeDirectivesResult(SourceFileEdit edit) {
+    this.edit = edit;
   }
 
-  factory ExecutionSetSubscriptionsParams.fromJson(
+  factory EditOrganizeDirectivesResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<ExecutionService> subscriptions;
-      if (json.containsKey("subscriptions")) {
-        subscriptions = jsonDecoder.decodeList(
-            jsonPath + ".subscriptions",
-            json["subscriptions"],
-            (String jsonPath, Object json) =>
-                new ExecutionService.fromJson(jsonDecoder, jsonPath, json));
+      SourceFileEdit edit;
+      if (json.containsKey("edit")) {
+        edit = new SourceFileEdit.fromJson(
+            jsonDecoder, jsonPath + ".edit", json["edit"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "subscriptions");
+        throw jsonDecoder.mismatch(jsonPath, "edit");
       }
-      return new ExecutionSetSubscriptionsParams(subscriptions);
+      return new EditOrganizeDirectivesResult(edit);
     } else {
       throw jsonDecoder.mismatch(
-          jsonPath, "execution.setSubscriptions params", json);
+          jsonPath, "edit.organizeDirectives result", json);
     }
   }
 
-  factory ExecutionSetSubscriptionsParams.fromRequest(Request request) {
-    return new ExecutionSetSubscriptionsParams.fromJson(
-        new RequestDecoder(request), "params", request._params);
+  factory EditOrganizeDirectivesResult.fromResponse(Response response) {
+    return new EditOrganizeDirectivesResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["subscriptions"] =
-        subscriptions.map((ExecutionService value) => value.toJson()).toList();
+    result["edit"] = edit.toJson();
     return result;
   }
 
-  Request toRequest(String id) {
-    return new Request(id, "execution.setSubscriptions", toJson());
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ExecutionSetSubscriptionsParams) {
-      return listEqual(subscriptions, other.subscriptions,
-          (ExecutionService a, ExecutionService b) => a == b);
+    if (other is EditOrganizeDirectivesResult) {
+      return edit == other.edit;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode);
+    hash = JenkinsSmiHash.combine(hash, edit.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * execution.setSubscriptions result
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ExecutionSetSubscriptionsResult {
-  Response toResponse(String id) {
-    return new Response(id, result: null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is ExecutionSetSubscriptionsResult) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 287678780;
-  }
-}
-
-/**
- * execution.launchData params
+ * edit.sortMembers params
  *
  * {
  *   "file": FilePath
- *   "kind": optional ExecutableKind
- *   "referencedFiles": optional List<FilePath>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ExecutionLaunchDataParams implements HasToJson {
+class EditSortMembersParams implements RequestParams {
   String _file;
 
-  ExecutableKind _kind;
-
-  List<String> _referencedFiles;
-
   /**
-   * The file for which launch data is being provided. This will either be a
-   * Dart library or an HTML file.
+   * The Dart file to sort.
    */
   String get file => _file;
 
   /**
-   * The file for which launch data is being provided. This will either be a
-   * Dart library or an HTML file.
+   * The Dart file to sort.
    */
   void set file(String value) {
     assert(value != null);
     this._file = value;
   }
 
-  /**
-   * The kind of the executable file. This field is omitted if the file is not
-   * a Dart file.
-   */
-  ExecutableKind get kind => _kind;
-
-  /**
-   * The kind of the executable file. This field is omitted if the file is not
-   * a Dart file.
-   */
-  void set kind(ExecutableKind value) {
-    this._kind = value;
+  EditSortMembersParams(String file) {
+    this.file = file;
   }
 
-  /**
-   * A list of the Dart files that are referenced by the file. This field is
-   * omitted if the file is not an HTML file.
-   */
-  List<String> get referencedFiles => _referencedFiles;
-
-  /**
-   * A list of the Dart files that are referenced by the file. This field is
-   * omitted if the file is not an HTML file.
-   */
-  void set referencedFiles(List<String> value) {
-    this._referencedFiles = value;
-  }
-
-  ExecutionLaunchDataParams(String file,
-      {ExecutableKind kind, List<String> referencedFiles}) {
-    this.file = file;
-    this.kind = kind;
-    this.referencedFiles = referencedFiles;
-  }
-
-  factory ExecutionLaunchDataParams.fromJson(
+  factory EditSortMembersParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       String file;
       if (json.containsKey("file")) {
         file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      ExecutableKind kind;
-      if (json.containsKey("kind")) {
-        kind = new ExecutableKind.fromJson(
-            jsonDecoder, jsonPath + ".kind", json["kind"]);
-      }
-      List<String> referencedFiles;
-      if (json.containsKey("referencedFiles")) {
-        referencedFiles = jsonDecoder.decodeList(jsonPath + ".referencedFiles",
-            json["referencedFiles"], jsonDecoder.decodeString);
-      }
-      return new ExecutionLaunchDataParams(file,
-          kind: kind, referencedFiles: referencedFiles);
+      return new EditSortMembersParams(file);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "execution.launchData params", json);
+      throw jsonDecoder.mismatch(jsonPath, "edit.sortMembers params", json);
     }
   }
 
-  factory ExecutionLaunchDataParams.fromNotification(
-      Notification notification) {
-    return new ExecutionLaunchDataParams.fromJson(
-        new ResponseDecoder(null), "params", notification._params);
+  factory EditSortMembersParams.fromRequest(Request request) {
+    return new EditSortMembersParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["file"] = file;
-    if (kind != null) {
-      result["kind"] = kind.toJson();
-    }
-    if (referencedFiles != null) {
-      result["referencedFiles"] = referencedFiles;
-    }
     return result;
   }
 
-  Notification toNotification() {
-    return new Notification("execution.launchData", toJson());
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "edit.sortMembers", toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ExecutionLaunchDataParams) {
-      return file == other.file &&
-          kind == other.kind &&
-          listEqual(referencedFiles, other.referencedFiles,
-              (String a, String b) => a == b);
+    if (other is EditSortMembersParams) {
+      return file == other.file;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
-    hash = JenkinsSmiHash.combine(hash, referencedFiles.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * diagnostic.getDiagnostics params
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class DiagnosticGetDiagnosticsParams {
-  Request toRequest(String id) {
-    return new Request(id, "diagnostic.getDiagnostics", null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is DiagnosticGetDiagnosticsParams) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 587526202;
-  }
-}
-
-/**
- * diagnostic.getDiagnostics result
+ * edit.sortMembers result
  *
  * {
- *   "contexts": List<ContextData>
+ *   "edit": SourceFileEdit
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class DiagnosticGetDiagnosticsResult implements HasToJson {
-  List<ContextData> _contexts;
+class EditSortMembersResult implements ResponseResult {
+  SourceFileEdit _edit;
 
   /**
-   * The list of analysis contexts.
+   * The file edit that is to be applied to the given file to effect the
+   * sorting.
    */
-  List<ContextData> get contexts => _contexts;
+  SourceFileEdit get edit => _edit;
 
   /**
-   * The list of analysis contexts.
+   * The file edit that is to be applied to the given file to effect the
+   * sorting.
    */
-  void set contexts(List<ContextData> value) {
+  void set edit(SourceFileEdit value) {
     assert(value != null);
-    this._contexts = value;
+    this._edit = value;
   }
 
-  DiagnosticGetDiagnosticsResult(List<ContextData> contexts) {
-    this.contexts = contexts;
+  EditSortMembersResult(SourceFileEdit edit) {
+    this.edit = edit;
   }
 
-  factory DiagnosticGetDiagnosticsResult.fromJson(
+  factory EditSortMembersResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<ContextData> contexts;
-      if (json.containsKey("contexts")) {
-        contexts = jsonDecoder.decodeList(
-            jsonPath + ".contexts",
-            json["contexts"],
-            (String jsonPath, Object json) =>
-                new ContextData.fromJson(jsonDecoder, jsonPath, json));
+      SourceFileEdit edit;
+      if (json.containsKey("edit")) {
+        edit = new SourceFileEdit.fromJson(
+            jsonDecoder, jsonPath + ".edit", json["edit"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "contexts");
+        throw jsonDecoder.mismatch(jsonPath, "edit");
       }
-      return new DiagnosticGetDiagnosticsResult(contexts);
+      return new EditSortMembersResult(edit);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "diagnostic.getDiagnostics result", json);
+      throw jsonDecoder.mismatch(jsonPath, "edit.sortMembers result", json);
     }
   }
 
-  factory DiagnosticGetDiagnosticsResult.fromResponse(Response response) {
-    return new DiagnosticGetDiagnosticsResult.fromJson(
+  factory EditSortMembersResult.fromResponse(Response response) {
+    return new EditSortMembersResult.fromJson(
         new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
         "result",
-        response._result);
+        response.result);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["contexts"] =
-        contexts.map((ContextData value) => value.toJson()).toList();
+    result["edit"] = edit.toJson();
     return result;
   }
 
+  @override
   Response toResponse(String id) {
     return new Response(id, result: toJson());
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is DiagnosticGetDiagnosticsResult) {
-      return listEqual(
-          contexts, other.contexts, (ContextData a, ContextData b) => a == b);
+    if (other is EditSortMembersResult) {
+      return edit == other.edit;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, contexts.hashCode);
+    hash = JenkinsSmiHash.combine(hash, edit.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * diagnostic.getServerPort params
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class DiagnosticGetServerPortParams {
-  Request toRequest(String id) {
-    return new Request(id, "diagnostic.getServerPort", null);
-  }
-
-  @override
-  bool operator ==(other) {
-    if (other is DiagnosticGetServerPortParams) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 367508704;
-  }
-}
-
-/**
- * diagnostic.getServerPort result
+ * Element
  *
  * {
- *   "port": int
+ *   "kind": ElementKind
+ *   "name": String
+ *   "location": optional Location
+ *   "flags": int
+ *   "parameters": optional String
+ *   "returnType": optional String
+ *   "typeParameters": optional String
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class DiagnosticGetServerPortResult implements HasToJson {
-  int _port;
-
-  /**
-   * The diagnostic server port.
-   */
-  int get port => _port;
-
-  /**
-   * The diagnostic server port.
-   */
-  void set port(int value) {
+class Element implements HasToJson {
+  static const int FLAG_ABSTRACT = 0x01;
+  static const int FLAG_CONST = 0x02;
+  static const int FLAG_FINAL = 0x04;
+  static const int FLAG_STATIC = 0x08;
+  static const int FLAG_PRIVATE = 0x10;
+  static const int FLAG_DEPRECATED = 0x20;
+
+  static int makeFlags(
+      {isAbstract: false,
+      isConst: false,
+      isFinal: false,
+      isStatic: false,
+      isPrivate: false,
+      isDeprecated: false}) {
+    int flags = 0;
+    if (isAbstract) flags |= FLAG_ABSTRACT;
+    if (isConst) flags |= FLAG_CONST;
+    if (isFinal) flags |= FLAG_FINAL;
+    if (isStatic) flags |= FLAG_STATIC;
+    if (isPrivate) flags |= FLAG_PRIVATE;
+    if (isDeprecated) flags |= FLAG_DEPRECATED;
+    return flags;
+  }
+
+  ElementKind _kind;
+
+  String _name;
+
+  Location _location;
+
+  int _flags;
+
+  String _parameters;
+
+  String _returnType;
+
+  String _typeParameters;
+
+  /**
+   * The kind of the element.
+   */
+  ElementKind get kind => _kind;
+
+  /**
+   * The kind of the element.
+   */
+  void set kind(ElementKind value) {
     assert(value != null);
-    this._port = value;
-  }
-
-  DiagnosticGetServerPortResult(int port) {
-    this.port = port;
-  }
-
-  factory DiagnosticGetServerPortResult.fromJson(
+    this._kind = value;
+  }
+
+  /**
+   * The name of the element. This is typically used as the label in the
+   * outline.
+   */
+  String get name => _name;
+
+  /**
+   * The name of the element. This is typically used as the label in the
+   * outline.
+   */
+  void set name(String value) {
+    assert(value != null);
+    this._name = value;
+  }
+
+  /**
+   * The location of the name in the declaration of the element.
+   */
+  Location get location => _location;
+
+  /**
+   * The location of the name in the declaration of the element.
+   */
+  void set location(Location value) {
+    this._location = value;
+  }
+
+  /**
+   * A bit-map containing the following flags:
+   *
+   * - 0x01 - set if the element is explicitly or implicitly abstract
+   * - 0x02 - set if the element was declared to be ‘const’
+   * - 0x04 - set if the element was declared to be ‘final’
+   * - 0x08 - set if the element is a static member of a class or is a
+   *   top-level function or field
+   * - 0x10 - set if the element is private
+   * - 0x20 - set if the element is deprecated
+   */
+  int get flags => _flags;
+
+  /**
+   * A bit-map containing the following flags:
+   *
+   * - 0x01 - set if the element is explicitly or implicitly abstract
+   * - 0x02 - set if the element was declared to be ‘const’
+   * - 0x04 - set if the element was declared to be ‘final’
+   * - 0x08 - set if the element is a static member of a class or is a
+   *   top-level function or field
+   * - 0x10 - set if the element is private
+   * - 0x20 - set if the element is deprecated
+   */
+  void set flags(int value) {
+    assert(value != null);
+    this._flags = value;
+  }
+
+  /**
+   * The parameter list for the element. If the element is not a method or
+   * function this field will not be defined. If the element doesn't have
+   * parameters (e.g. getter), this field will not be defined. If the element
+   * has zero parameters, this field will have a value of "()".
+   */
+  String get parameters => _parameters;
+
+  /**
+   * The parameter list for the element. If the element is not a method or
+   * function this field will not be defined. If the element doesn't have
+   * parameters (e.g. getter), this field will not be defined. If the element
+   * has zero parameters, this field will have a value of "()".
+   */
+  void set parameters(String value) {
+    this._parameters = value;
+  }
+
+  /**
+   * The return type of the element. If the element is not a method or function
+   * this field will not be defined. If the element does not have a declared
+   * return type, this field will contain an empty string.
+   */
+  String get returnType => _returnType;
+
+  /**
+   * The return type of the element. If the element is not a method or function
+   * this field will not be defined. If the element does not have a declared
+   * return type, this field will contain an empty string.
+   */
+  void set returnType(String value) {
+    this._returnType = value;
+  }
+
+  /**
+   * The type parameter list for the element. If the element doesn't have type
+   * parameters, this field will not be defined.
+   */
+  String get typeParameters => _typeParameters;
+
+  /**
+   * The type parameter list for the element. If the element doesn't have type
+   * parameters, this field will not be defined.
+   */
+  void set typeParameters(String value) {
+    this._typeParameters = value;
+  }
+
+  Element(ElementKind kind, String name, int flags,
+      {Location location,
+      String parameters,
+      String returnType,
+      String typeParameters}) {
+    this.kind = kind;
+    this.name = name;
+    this.location = location;
+    this.flags = flags;
+    this.parameters = parameters;
+    this.returnType = returnType;
+    this.typeParameters = typeParameters;
+  }
+
+  factory Element.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      int port;
-      if (json.containsKey("port")) {
-        port = jsonDecoder.decodeInt(jsonPath + ".port", json["port"]);
+      ElementKind kind;
+      if (json.containsKey("kind")) {
+        kind = new ElementKind.fromJson(
+            jsonDecoder, jsonPath + ".kind", json["kind"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "port");
-      }
-      return new DiagnosticGetServerPortResult(port);
-    } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "diagnostic.getServerPort result", json);
-    }
-  }
-
-  factory DiagnosticGetServerPortResult.fromResponse(Response response) {
-    return new DiagnosticGetServerPortResult.fromJson(
-        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
-        "result",
-        response._result);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["port"] = port;
-    return result;
-  }
-
-  Response toResponse(String id) {
-    return new Response(id, result: toJson());
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is DiagnosticGetServerPortResult) {
-      return port == other.port;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, port.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * AddContentOverlay
- *
- * {
- *   "type": "add"
- *   "content": String
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AddContentOverlay implements HasToJson {
-  String _content;
-
-  /**
-   * The new content of the file.
-   */
-  String get content => _content;
-
-  /**
-   * The new content of the file.
-   */
-  void set content(String value) {
-    assert(value != null);
-    this._content = value;
-  }
-
-  AddContentOverlay(String content) {
-    this.content = content;
-  }
-
-  factory AddContentOverlay.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      if (json["type"] != "add") {
-        throw jsonDecoder.mismatch(jsonPath, "equal " + "add", json);
-      }
-      String content;
-      if (json.containsKey("content")) {
-        content =
-            jsonDecoder.decodeString(jsonPath + ".content", json["content"]);
+        throw jsonDecoder.mismatch(jsonPath, "kind");
+      }
+      String name;
+      if (json.containsKey("name")) {
+        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "content");
-      }
-      return new AddContentOverlay(content);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "AddContentOverlay", json);
-    }
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["type"] = "add";
-    result["content"] = content;
-    return result;
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is AddContentOverlay) {
-      return content == other.content;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, 704418402);
-    hash = JenkinsSmiHash.combine(hash, content.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * AnalysisError
- *
- * {
- *   "severity": AnalysisErrorSeverity
- *   "type": AnalysisErrorType
- *   "location": Location
- *   "message": String
- *   "correction": optional String
- *   "code": String
- *   "hasFix": optional bool
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisError implements HasToJson {
-  AnalysisErrorSeverity _severity;
-
-  AnalysisErrorType _type;
-
-  Location _location;
-
-  String _message;
-
-  String _correction;
-
-  String _code;
-
-  bool _hasFix;
-
-  /**
-   * The severity of the error.
-   */
-  AnalysisErrorSeverity get severity => _severity;
-
-  /**
-   * The severity of the error.
-   */
-  void set severity(AnalysisErrorSeverity value) {
-    assert(value != null);
-    this._severity = value;
-  }
-
-  /**
-   * The type of the error.
-   */
-  AnalysisErrorType get type => _type;
-
-  /**
-   * The type of the error.
-   */
-  void set type(AnalysisErrorType value) {
-    assert(value != null);
-    this._type = value;
-  }
-
-  /**
-   * The location associated with the error.
-   */
-  Location get location => _location;
-
-  /**
-   * The location associated with the error.
-   */
-  void set location(Location value) {
-    assert(value != null);
-    this._location = value;
-  }
-
-  /**
-   * The message to be displayed for this error. The message should indicate
-   * what is wrong with the code and why it is wrong.
-   */
-  String get message => _message;
-
-  /**
-   * The message to be displayed for this error. The message should indicate
-   * what is wrong with the code and why it is wrong.
-   */
-  void set message(String value) {
-    assert(value != null);
-    this._message = value;
-  }
-
-  /**
-   * The correction message to be displayed for this error. The correction
-   * message should indicate how the user can fix the error. The field is
-   * omitted if there is no correction message associated with the error code.
-   */
-  String get correction => _correction;
-
-  /**
-   * The correction message to be displayed for this error. The correction
-   * message should indicate how the user can fix the error. The field is
-   * omitted if there is no correction message associated with the error code.
-   */
-  void set correction(String value) {
-    this._correction = value;
-  }
-
-  /**
-   * The name, as a string, of the error code associated with this error.
-   */
-  String get code => _code;
-
-  /**
-   * The name, as a string, of the error code associated with this error.
-   */
-  void set code(String value) {
-    assert(value != null);
-    this._code = value;
-  }
-
-  /**
-   * A hint to indicate to interested clients that this error has an associated
-   * fix (or fixes). The absence of this field implies there are not known to
-   * be fixes. Note that since the operation to calculate whether fixes apply
-   * needs to be performant it is possible that complicated tests will be
-   * skipped and a false negative returned. For this reason, this attribute
-   * should be treated as a "hint". Despite the possibility of false negatives,
-   * no false positives should be returned. If a client sees this flag set they
-   * can proceed with the confidence that there are in fact associated fixes.
-   */
-  bool get hasFix => _hasFix;
-
-  /**
-   * A hint to indicate to interested clients that this error has an associated
-   * fix (or fixes). The absence of this field implies there are not known to
-   * be fixes. Note that since the operation to calculate whether fixes apply
-   * needs to be performant it is possible that complicated tests will be
-   * skipped and a false negative returned. For this reason, this attribute
-   * should be treated as a "hint". Despite the possibility of false negatives,
-   * no false positives should be returned. If a client sees this flag set they
-   * can proceed with the confidence that there are in fact associated fixes.
-   */
-  void set hasFix(bool value) {
-    this._hasFix = value;
-  }
-
-  AnalysisError(AnalysisErrorSeverity severity, AnalysisErrorType type,
-      Location location, String message, String code,
-      {String correction, bool hasFix}) {
-    this.severity = severity;
-    this.type = type;
-    this.location = location;
-    this.message = message;
-    this.correction = correction;
-    this.code = code;
-    this.hasFix = hasFix;
-  }
-
-  factory AnalysisError.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      AnalysisErrorSeverity severity;
-      if (json.containsKey("severity")) {
-        severity = new AnalysisErrorSeverity.fromJson(
-            jsonDecoder, jsonPath + ".severity", json["severity"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "severity");
-      }
-      AnalysisErrorType type;
-      if (json.containsKey("type")) {
-        type = new AnalysisErrorType.fromJson(
-            jsonDecoder, jsonPath + ".type", json["type"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "type");
+        throw jsonDecoder.mismatch(jsonPath, "name");
       }
       Location location;
       if (json.containsKey("location")) {
         location = new Location.fromJson(
             jsonDecoder, jsonPath + ".location", json["location"]);
+      }
+      int flags;
+      if (json.containsKey("flags")) {
+        flags = jsonDecoder.decodeInt(jsonPath + ".flags", json["flags"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "location");
-      }
-      String message;
-      if (json.containsKey("message")) {
-        message =
-            jsonDecoder.decodeString(jsonPath + ".message", json["message"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "message");
-      }
-      String correction;
-      if (json.containsKey("correction")) {
-        correction = jsonDecoder.decodeString(
-            jsonPath + ".correction", json["correction"]);
-      }
-      String code;
-      if (json.containsKey("code")) {
-        code = jsonDecoder.decodeString(jsonPath + ".code", json["code"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "code");
-      }
-      bool hasFix;
-      if (json.containsKey("hasFix")) {
-        hasFix = jsonDecoder.decodeBool(jsonPath + ".hasFix", json["hasFix"]);
-      }
-      return new AnalysisError(severity, type, location, message, code,
-          correction: correction, hasFix: hasFix);
+        throw jsonDecoder.mismatch(jsonPath, "flags");
+      }
+      String parameters;
+      if (json.containsKey("parameters")) {
+        parameters = jsonDecoder.decodeString(
+            jsonPath + ".parameters", json["parameters"]);
+      }
+      String returnType;
+      if (json.containsKey("returnType")) {
+        returnType = jsonDecoder.decodeString(
+            jsonPath + ".returnType", json["returnType"]);
+      }
+      String typeParameters;
+      if (json.containsKey("typeParameters")) {
+        typeParameters = jsonDecoder.decodeString(
+            jsonPath + ".typeParameters", json["typeParameters"]);
+      }
+      return new Element(kind, name, flags,
+          location: location,
+          parameters: parameters,
+          returnType: returnType,
+          typeParameters: typeParameters);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "AnalysisError", json);
-    }
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "Element", json);
+    }
+  }
+
+  bool get isAbstract => (flags & FLAG_ABSTRACT) != 0;
+  bool get isConst => (flags & FLAG_CONST) != 0;
+  bool get isFinal => (flags & FLAG_FINAL) != 0;
+  bool get isStatic => (flags & FLAG_STATIC) != 0;
+  bool get isPrivate => (flags & FLAG_PRIVATE) != 0;
+  bool get isDeprecated => (flags & FLAG_DEPRECATED) != 0;
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["severity"] = severity.toJson();
-    result["type"] = type.toJson();
-    result["location"] = location.toJson();
-    result["message"] = message;
-    if (correction != null) {
-      result["correction"] = correction;
-    }
-    result["code"] = code;
-    if (hasFix != null) {
-      result["hasFix"] = hasFix;
+    result["kind"] = kind.toJson();
+    result["name"] = name;
+    if (location != null) {
+      result["location"] = location.toJson();
+    }
+    result["flags"] = flags;
+    if (parameters != null) {
+      result["parameters"] = parameters;
+    }
+    if (returnType != null) {
+      result["returnType"] = returnType;
+    }
+    if (typeParameters != null) {
+      result["typeParameters"] = typeParameters;
     }
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisError) {
-      return severity == other.severity &&
-          type == other.type &&
+    if (other is Element) {
+      return kind == other.kind &&
+          name == other.name &&
           location == other.location &&
-          message == other.message &&
-          correction == other.correction &&
-          code == other.code &&
-          hasFix == other.hasFix;
+          flags == other.flags &&
+          parameters == other.parameters &&
+          returnType == other.returnType &&
+          typeParameters == other.typeParameters;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, severity.hashCode);
-    hash = JenkinsSmiHash.combine(hash, type.hashCode);
+    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
+    hash = JenkinsSmiHash.combine(hash, name.hashCode);
     hash = JenkinsSmiHash.combine(hash, location.hashCode);
-    hash = JenkinsSmiHash.combine(hash, message.hashCode);
-    hash = JenkinsSmiHash.combine(hash, correction.hashCode);
-    hash = JenkinsSmiHash.combine(hash, code.hashCode);
-    hash = JenkinsSmiHash.combine(hash, hasFix.hashCode);
+    hash = JenkinsSmiHash.combine(hash, flags.hashCode);
+    hash = JenkinsSmiHash.combine(hash, parameters.hashCode);
+    hash = JenkinsSmiHash.combine(hash, returnType.hashCode);
+    hash = JenkinsSmiHash.combine(hash, typeParameters.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * AnalysisErrorFixes
- *
- * {
- *   "error": AnalysisError
- *   "fixes": List<SourceChange>
+ * ElementKind
+ *
+ * enum {
+ *   CLASS
+ *   CLASS_TYPE_ALIAS
+ *   COMPILATION_UNIT
+ *   CONSTRUCTOR
+ *   ENUM
+ *   ENUM_CONSTANT
+ *   FIELD
+ *   FILE
+ *   FUNCTION
+ *   FUNCTION_TYPE_ALIAS
+ *   GETTER
+ *   LABEL
+ *   LIBRARY
+ *   LOCAL_VARIABLE
+ *   METHOD
+ *   PARAMETER
+ *   PREFIX
+ *   SETTER
+ *   TOP_LEVEL_VARIABLE
+ *   TYPE_PARAMETER
+ *   UNIT_TEST_GROUP
+ *   UNIT_TEST_TEST
+ *   UNKNOWN
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisErrorFixes implements HasToJson {
-  AnalysisError _error;
-
-  List<SourceChange> _fixes;
-
-  /**
-   * The error with which the fixes are associated.
-   */
-  AnalysisError get error => _error;
-
-  /**
-   * The error with which the fixes are associated.
-   */
-  void set error(AnalysisError value) {
+class ElementKind implements Enum {
+  static const ElementKind CLASS = const ElementKind._("CLASS");
+
+  static const ElementKind CLASS_TYPE_ALIAS =
+      const ElementKind._("CLASS_TYPE_ALIAS");
+
+  static const ElementKind COMPILATION_UNIT =
+      const ElementKind._("COMPILATION_UNIT");
+
+  static const ElementKind CONSTRUCTOR = const ElementKind._("CONSTRUCTOR");
+
+  static const ElementKind ENUM = const ElementKind._("ENUM");
+
+  static const ElementKind ENUM_CONSTANT = const ElementKind._("ENUM_CONSTANT");
+
+  static const ElementKind FIELD = const ElementKind._("FIELD");
+
+  static const ElementKind FILE = const ElementKind._("FILE");
+
+  static const ElementKind FUNCTION = const ElementKind._("FUNCTION");
+
+  static const ElementKind FUNCTION_TYPE_ALIAS =
+      const ElementKind._("FUNCTION_TYPE_ALIAS");
+
+  static const ElementKind GETTER = const ElementKind._("GETTER");
+
+  static const ElementKind LABEL = const ElementKind._("LABEL");
+
+  static const ElementKind LIBRARY = const ElementKind._("LIBRARY");
+
+  static const ElementKind LOCAL_VARIABLE =
+      const ElementKind._("LOCAL_VARIABLE");
+
+  static const ElementKind METHOD = const ElementKind._("METHOD");
+
+  static const ElementKind PARAMETER = const ElementKind._("PARAMETER");
+
+  static const ElementKind PREFIX = const ElementKind._("PREFIX");
+
+  static const ElementKind SETTER = const ElementKind._("SETTER");
+
+  static const ElementKind TOP_LEVEL_VARIABLE =
+      const ElementKind._("TOP_LEVEL_VARIABLE");
+
+  static const ElementKind TYPE_PARAMETER =
+      const ElementKind._("TYPE_PARAMETER");
+
+  /**
+   * Deprecated: support for tests was removed.
+   */
+  static const ElementKind UNIT_TEST_GROUP =
+      const ElementKind._("UNIT_TEST_GROUP");
+
+  /**
+   * Deprecated: support for tests was removed.
+   */
+  static const ElementKind UNIT_TEST_TEST =
+      const ElementKind._("UNIT_TEST_TEST");
+
+  static const ElementKind UNKNOWN = const ElementKind._("UNKNOWN");
+
+  /**
+   * A list containing all of the enum values that are defined.
+   */
+  static const List<ElementKind> VALUES = const <ElementKind>[
+    CLASS,
+    CLASS_TYPE_ALIAS,
+    COMPILATION_UNIT,
+    CONSTRUCTOR,
+    ENUM,
+    ENUM_CONSTANT,
+    FIELD,
+    FILE,
+    FUNCTION,
+    FUNCTION_TYPE_ALIAS,
+    GETTER,
+    LABEL,
+    LIBRARY,
+    LOCAL_VARIABLE,
+    METHOD,
+    PARAMETER,
+    PREFIX,
+    SETTER,
+    TOP_LEVEL_VARIABLE,
+    TYPE_PARAMETER,
+    UNIT_TEST_GROUP,
+    UNIT_TEST_TEST,
+    UNKNOWN
+  ];
+
+  @override
+  final String name;
+
+  const ElementKind._(this.name);
+
+  factory ElementKind(String name) {
+    switch (name) {
+      case "CLASS":
+        return CLASS;
+      case "CLASS_TYPE_ALIAS":
+        return CLASS_TYPE_ALIAS;
+      case "COMPILATION_UNIT":
+        return COMPILATION_UNIT;
+      case "CONSTRUCTOR":
+        return CONSTRUCTOR;
+      case "ENUM":
+        return ENUM;
+      case "ENUM_CONSTANT":
+        return ENUM_CONSTANT;
+      case "FIELD":
+        return FIELD;
+      case "FILE":
+        return FILE;
+      case "FUNCTION":
+        return FUNCTION;
+      case "FUNCTION_TYPE_ALIAS":
+        return FUNCTION_TYPE_ALIAS;
+      case "GETTER":
+        return GETTER;
+      case "LABEL":
+        return LABEL;
+      case "LIBRARY":
+        return LIBRARY;
+      case "LOCAL_VARIABLE":
+        return LOCAL_VARIABLE;
+      case "METHOD":
+        return METHOD;
+      case "PARAMETER":
+        return PARAMETER;
+      case "PREFIX":
+        return PREFIX;
+      case "SETTER":
+        return SETTER;
+      case "TOP_LEVEL_VARIABLE":
+        return TOP_LEVEL_VARIABLE;
+      case "TYPE_PARAMETER":
+        return TYPE_PARAMETER;
+      case "UNIT_TEST_GROUP":
+        return UNIT_TEST_GROUP;
+      case "UNIT_TEST_TEST":
+        return UNIT_TEST_TEST;
+      case "UNKNOWN":
+        return UNKNOWN;
+    }
+    throw new Exception('Illegal enum value: $name');
+  }
+
+  factory ElementKind.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json is String) {
+      try {
+        return new ElementKind(json);
+      } catch (_) {
+        // Fall through
+      }
+    }
+    throw jsonDecoder.mismatch(jsonPath, "ElementKind", json);
+  }
+
+  @override
+  String toString() => "ElementKind.$name";
+
+  String toJson() => name;
+}
+
+/**
+ * ExecutableFile
+ *
+ * {
+ *   "file": FilePath
+ *   "kind": ExecutableKind
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ExecutableFile implements HasToJson {
+  String _file;
+
+  ExecutableKind _kind;
+
+  /**
+   * The path of the executable file.
+   */
+  String get file => _file;
+
+  /**
+   * The path of the executable file.
+   */
+  void set file(String value) {
     assert(value != null);
-    this._error = value;
-  }
-
-  /**
-   * The fixes associated with the error.
-   */
-  List<SourceChange> get fixes => _fixes;
-
-  /**
-   * The fixes associated with the error.
-   */
-  void set fixes(List<SourceChange> value) {
+    this._file = value;
+  }
+
+  /**
+   * The kind of the executable file.
+   */
+  ExecutableKind get kind => _kind;
+
+  /**
+   * The kind of the executable file.
+   */
+  void set kind(ExecutableKind value) {
     assert(value != null);
-    this._fixes = value;
-  }
-
-  AnalysisErrorFixes(AnalysisError error, {List<SourceChange> fixes}) {
-    this.error = error;
-    if (fixes == null) {
-      this.fixes = <SourceChange>[];
-    } else {
-      this.fixes = fixes;
-    }
-  }
-
-  factory AnalysisErrorFixes.fromJson(
+    this._kind = value;
+  }
+
+  ExecutableFile(String file, ExecutableKind kind) {
+    this.file = file;
+    this.kind = kind;
+  }
+
+  factory ExecutableFile.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      AnalysisError error;
-      if (json.containsKey("error")) {
-        error = new AnalysisError.fromJson(
-            jsonDecoder, jsonPath + ".error", json["error"]);
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "error");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      List<SourceChange> fixes;
-      if (json.containsKey("fixes")) {
-        fixes = jsonDecoder.decodeList(
-            jsonPath + ".fixes",
-            json["fixes"],
-            (String jsonPath, Object json) =>
-                new SourceChange.fromJson(jsonDecoder, jsonPath, json));
+      ExecutableKind kind;
+      if (json.containsKey("kind")) {
+        kind = new ExecutableKind.fromJson(
+            jsonDecoder, jsonPath + ".kind", json["kind"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "fixes");
+        throw jsonDecoder.mismatch(jsonPath, "kind");
       }
-      return new AnalysisErrorFixes(error, fixes: fixes);
+      return new ExecutableFile(file, kind);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "AnalysisErrorFixes", json);
-    }
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "ExecutableFile", json);
+    }
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["error"] = error.toJson();
-    result["fixes"] =
-        fixes.map((SourceChange value) => value.toJson()).toList();
+    result["file"] = file;
+    result["kind"] = kind.toJson();
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisErrorFixes) {
-      return error == other.error &&
-          listEqual(
-              fixes, other.fixes, (SourceChange a, SourceChange b) => a == b);
+    if (other is ExecutableFile) {
+      return file == other.file && kind == other.kind;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, error.hashCode);
-    hash = JenkinsSmiHash.combine(hash, fixes.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * AnalysisErrorSeverity
+ * ExecutableKind
  *
  * enum {
- *   INFO
- *   WARNING
- *   ERROR
+ *   CLIENT
+ *   EITHER
+ *   NOT_EXECUTABLE
+ *   SERVER
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisErrorSeverity implements Enum {
-  static const AnalysisErrorSeverity INFO =
-      const AnalysisErrorSeverity._("INFO");
-
-  static const AnalysisErrorSeverity WARNING =
-      const AnalysisErrorSeverity._("WARNING");
-
-  static const AnalysisErrorSeverity ERROR =
-      const AnalysisErrorSeverity._("ERROR");
+class ExecutableKind implements Enum {
+  static const ExecutableKind CLIENT = const ExecutableKind._("CLIENT");
+
+  static const ExecutableKind EITHER = const ExecutableKind._("EITHER");
+
+  static const ExecutableKind NOT_EXECUTABLE =
+      const ExecutableKind._("NOT_EXECUTABLE");
+
+  static const ExecutableKind SERVER = const ExecutableKind._("SERVER");
 
   /**
    * A list containing all of the enum values that are defined.
    */
-  static const List<AnalysisErrorSeverity> VALUES =
-      const <AnalysisErrorSeverity>[INFO, WARNING, ERROR];
-
+  static const List<ExecutableKind> VALUES = const <ExecutableKind>[
+    CLIENT,
+    EITHER,
+    NOT_EXECUTABLE,
+    SERVER
+  ];
+
+  @override
   final String name;
 
-  const AnalysisErrorSeverity._(this.name);
-
-  factory AnalysisErrorSeverity(String name) {
+  const ExecutableKind._(this.name);
+
+  factory ExecutableKind(String name) {
     switch (name) {
-      case "INFO":
-        return INFO;
-      case "WARNING":
-        return WARNING;
-      case "ERROR":
-        return ERROR;
+      case "CLIENT":
+        return CLIENT;
+      case "EITHER":
+        return EITHER;
+      case "NOT_EXECUTABLE":
+        return NOT_EXECUTABLE;
+      case "SERVER":
+        return SERVER;
     }
     throw new Exception('Illegal enum value: $name');
   }
 
-  factory AnalysisErrorSeverity.fromJson(
+  factory ExecutableKind.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json is String) {
       try {
-        return new AnalysisErrorSeverity(json);
+        return new ExecutableKind(json);
       } catch (_) {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "AnalysisErrorSeverity", json);
-  }
-
-  @override
-  String toString() => "AnalysisErrorSeverity.$name";
+    throw jsonDecoder.mismatch(jsonPath, "ExecutableKind", json);
+  }
+
+  @override
+  String toString() => "ExecutableKind.$name";
 
   String toJson() => name;
 }
 
 /**
- * AnalysisErrorType
- *
- * enum {
- *   CHECKED_MODE_COMPILE_TIME_ERROR
- *   COMPILE_TIME_ERROR
- *   HINT
- *   LINT
- *   STATIC_TYPE_WARNING
- *   STATIC_WARNING
- *   SYNTACTIC_ERROR
- *   TODO
+ * execution.createContext params
+ *
+ * {
+ *   "contextRoot": FilePath
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisErrorType implements Enum {
-  static const AnalysisErrorType CHECKED_MODE_COMPILE_TIME_ERROR =
-      const AnalysisErrorType._("CHECKED_MODE_COMPILE_TIME_ERROR");
-
-  static const AnalysisErrorType COMPILE_TIME_ERROR =
-      const AnalysisErrorType._("COMPILE_TIME_ERROR");
-
-  static const AnalysisErrorType HINT = const AnalysisErrorType._("HINT");
-
-  static const AnalysisErrorType LINT = const AnalysisErrorType._("LINT");
-
-  static const AnalysisErrorType STATIC_TYPE_WARNING =
-      const AnalysisErrorType._("STATIC_TYPE_WARNING");
-
-  static const AnalysisErrorType STATIC_WARNING =
-      const AnalysisErrorType._("STATIC_WARNING");
-
-  static const AnalysisErrorType SYNTACTIC_ERROR =
-      const AnalysisErrorType._("SYNTACTIC_ERROR");
-
-  static const AnalysisErrorType TODO = const AnalysisErrorType._("TODO");
-
-  /**
-   * A list containing all of the enum values that are defined.
-   */
-  static const List<AnalysisErrorType> VALUES = const <AnalysisErrorType>[
-    CHECKED_MODE_COMPILE_TIME_ERROR,
-    COMPILE_TIME_ERROR,
-    HINT,
-    LINT,
-    STATIC_TYPE_WARNING,
-    STATIC_WARNING,
-    SYNTACTIC_ERROR,
-    TODO
-  ];
-
-  final String name;
-
-  const AnalysisErrorType._(this.name);
-
-  factory AnalysisErrorType(String name) {
-    switch (name) {
-      case "CHECKED_MODE_COMPILE_TIME_ERROR":
-        return CHECKED_MODE_COMPILE_TIME_ERROR;
-      case "COMPILE_TIME_ERROR":
-        return COMPILE_TIME_ERROR;
-      case "HINT":
-        return HINT;
-      case "LINT":
-        return LINT;
-      case "STATIC_TYPE_WARNING":
-        return STATIC_TYPE_WARNING;
-      case "STATIC_WARNING":
-        return STATIC_WARNING;
-      case "SYNTACTIC_ERROR":
-        return SYNTACTIC_ERROR;
-      case "TODO":
-        return TODO;
-    }
-    throw new Exception('Illegal enum value: $name');
-  }
-
-  factory AnalysisErrorType.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json is String) {
-      try {
-        return new AnalysisErrorType(json);
-      } catch (_) {
-        // Fall through
-      }
-    }
-    throw jsonDecoder.mismatch(jsonPath, "AnalysisErrorType", json);
-  }
-
-  @override
-  String toString() => "AnalysisErrorType.$name";
-
-  String toJson() => name;
-}
-
-/**
- * AnalysisOptions
- *
- * {
- *   "enableAsync": optional bool
- *   "enableDeferredLoading": optional bool
- *   "enableEnums": optional bool
- *   "enableNullAwareOperators": optional bool
- *   "enableSuperMixins": optional bool
- *   "generateDart2jsHints": optional bool
- *   "generateHints": optional bool
- *   "generateLints": optional bool
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisOptions implements HasToJson {
-  bool _enableAsync;
-
-  bool _enableDeferredLoading;
-
-  bool _enableEnums;
-
-  bool _enableNullAwareOperators;
-
-  bool _enableSuperMixins;
-
-  bool _generateDart2jsHints;
-
-  bool _generateHints;
-
-  bool _generateLints;
-
-  /**
-   * Deprecated: this feature is always enabled.
-   *
-   * True if the client wants to enable support for the proposed async feature.
-   */
-  bool get enableAsync => _enableAsync;
-
-  /**
-   * Deprecated: this feature is always enabled.
-   *
-   * True if the client wants to enable support for the proposed async feature.
-   */
-  void set enableAsync(bool value) {
-    this._enableAsync = value;
-  }
-
-  /**
-   * Deprecated: this feature is always enabled.
-   *
-   * True if the client wants to enable support for the proposed deferred
-   * loading feature.
-   */
-  bool get enableDeferredLoading => _enableDeferredLoading;
-
-  /**
-   * Deprecated: this feature is always enabled.
-   *
-   * True if the client wants to enable support for the proposed deferred
-   * loading feature.
-   */
-  void set enableDeferredLoading(bool value) {
-    this._enableDeferredLoading = value;
-  }
-
-  /**
-   * Deprecated: this feature is always enabled.
-   *
-   * True if the client wants to enable support for the proposed enum feature.
-   */
-  bool get enableEnums => _enableEnums;
-
-  /**
-   * Deprecated: this feature is always enabled.
-   *
-   * True if the client wants to enable support for the proposed enum feature.
-   */
-  void set enableEnums(bool value) {
-    this._enableEnums = value;
-  }
-
-  /**
-   * Deprecated: this feature is always enabled.
-   *
-   * True if the client wants to enable support for the proposed "null aware
-   * operators" feature.
-   */
-  bool get enableNullAwareOperators => _enableNullAwareOperators;
-
-  /**
-   * Deprecated: this feature is always enabled.
-   *
-   * True if the client wants to enable support for the proposed "null aware
-   * operators" feature.
-   */
-  void set enableNullAwareOperators(bool value) {
-    this._enableNullAwareOperators = value;
-  }
-
-  /**
-   * True if the client wants to enable support for the proposed "less
-   * restricted mixins" proposal (DEP 34).
-   */
-  bool get enableSuperMixins => _enableSuperMixins;
-
-  /**
-   * True if the client wants to enable support for the proposed "less
-   * restricted mixins" proposal (DEP 34).
-   */
-  void set enableSuperMixins(bool value) {
-    this._enableSuperMixins = value;
-  }
-
-  /**
-   * True if hints that are specific to dart2js should be generated. This
-   * option is ignored if generateHints is false.
-   */
-  bool get generateDart2jsHints => _generateDart2jsHints;
-
-  /**
-   * True if hints that are specific to dart2js should be generated. This
-   * option is ignored if generateHints is false.
-   */
-  void set generateDart2jsHints(bool value) {
-    this._generateDart2jsHints = value;
-  }
-
-  /**
-   * True if hints should be generated as part of generating errors and
-   * warnings.
-   */
-  bool get generateHints => _generateHints;
-
-  /**
-   * True if hints should be generated as part of generating errors and
-   * warnings.
-   */
-  void set generateHints(bool value) {
-    this._generateHints = value;
-  }
-
-  /**
-   * True if lints should be generated as part of generating errors and
-   * warnings.
-   */
-  bool get generateLints => _generateLints;
-
-  /**
-   * True if lints should be generated as part of generating errors and
-   * warnings.
-   */
-  void set generateLints(bool value) {
-    this._generateLints = value;
-  }
-
-  AnalysisOptions(
-      {bool enableAsync,
-      bool enableDeferredLoading,
-      bool enableEnums,
-      bool enableNullAwareOperators,
-      bool enableSuperMixins,
-      bool generateDart2jsHints,
-      bool generateHints,
-      bool generateLints}) {
-    this.enableAsync = enableAsync;
-    this.enableDeferredLoading = enableDeferredLoading;
-    this.enableEnums = enableEnums;
-    this.enableNullAwareOperators = enableNullAwareOperators;
-    this.enableSuperMixins = enableSuperMixins;
-    this.generateDart2jsHints = generateDart2jsHints;
-    this.generateHints = generateHints;
-    this.generateLints = generateLints;
-  }
-
-  factory AnalysisOptions.fromJson(
+class ExecutionCreateContextParams implements RequestParams {
+  String _contextRoot;
+
+  /**
+   * The path of the Dart or HTML file that will be launched, or the path of
+   * the directory containing the file.
+   */
+  String get contextRoot => _contextRoot;
+
+  /**
+   * The path of the Dart or HTML file that will be launched, or the path of
+   * the directory containing the file.
+   */
+  void set contextRoot(String value) {
+    assert(value != null);
+    this._contextRoot = value;
+  }
+
+  ExecutionCreateContextParams(String contextRoot) {
+    this.contextRoot = contextRoot;
+  }
+
+  factory ExecutionCreateContextParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      bool enableAsync;
-      if (json.containsKey("enableAsync")) {
-        enableAsync = jsonDecoder.decodeBool(
-            jsonPath + ".enableAsync", json["enableAsync"]);
-      }
-      bool enableDeferredLoading;
-      if (json.containsKey("enableDeferredLoading")) {
-        enableDeferredLoading = jsonDecoder.decodeBool(
-            jsonPath + ".enableDeferredLoading", json["enableDeferredLoading"]);
-      }
-      bool enableEnums;
-      if (json.containsKey("enableEnums")) {
-        enableEnums = jsonDecoder.decodeBool(
-            jsonPath + ".enableEnums", json["enableEnums"]);
-      }
-      bool enableNullAwareOperators;
-      if (json.containsKey("enableNullAwareOperators")) {
-        enableNullAwareOperators = jsonDecoder.decodeBool(
-            jsonPath + ".enableNullAwareOperators",
-            json["enableNullAwareOperators"]);
-      }
-      bool enableSuperMixins;
-      if (json.containsKey("enableSuperMixins")) {
-        enableSuperMixins = jsonDecoder.decodeBool(
-            jsonPath + ".enableSuperMixins", json["enableSuperMixins"]);
-      }
-      bool generateDart2jsHints;
-      if (json.containsKey("generateDart2jsHints")) {
-        generateDart2jsHints = jsonDecoder.decodeBool(
-            jsonPath + ".generateDart2jsHints", json["generateDart2jsHints"]);
-      }
-      bool generateHints;
-      if (json.containsKey("generateHints")) {
-        generateHints = jsonDecoder.decodeBool(
-            jsonPath + ".generateHints", json["generateHints"]);
-      }
-      bool generateLints;
-      if (json.containsKey("generateLints")) {
-        generateLints = jsonDecoder.decodeBool(
-            jsonPath + ".generateLints", json["generateLints"]);
-      }
-      return new AnalysisOptions(
-          enableAsync: enableAsync,
-          enableDeferredLoading: enableDeferredLoading,
-          enableEnums: enableEnums,
-          enableNullAwareOperators: enableNullAwareOperators,
-          enableSuperMixins: enableSuperMixins,
-          generateDart2jsHints: generateDart2jsHints,
-          generateHints: generateHints,
-          generateLints: generateLints);
+      String contextRoot;
+      if (json.containsKey("contextRoot")) {
+        contextRoot = jsonDecoder.decodeString(
+            jsonPath + ".contextRoot", json["contextRoot"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "contextRoot");
+      }
+      return new ExecutionCreateContextParams(contextRoot);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "AnalysisOptions", json);
-    }
-  }
-
+      throw jsonDecoder.mismatch(
+          jsonPath, "execution.createContext params", json);
+    }
+  }
+
+  factory ExecutionCreateContextParams.fromRequest(Request request) {
+    return new ExecutionCreateContextParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    if (enableAsync != null) {
-      result["enableAsync"] = enableAsync;
-    }
-    if (enableDeferredLoading != null) {
-      result["enableDeferredLoading"] = enableDeferredLoading;
-    }
-    if (enableEnums != null) {
-      result["enableEnums"] = enableEnums;
-    }
-    if (enableNullAwareOperators != null) {
-      result["enableNullAwareOperators"] = enableNullAwareOperators;
-    }
-    if (enableSuperMixins != null) {
-      result["enableSuperMixins"] = enableSuperMixins;
-    }
-    if (generateDart2jsHints != null) {
-      result["generateDart2jsHints"] = generateDart2jsHints;
-    }
-    if (generateHints != null) {
-      result["generateHints"] = generateHints;
-    }
-    if (generateLints != null) {
-      result["generateLints"] = generateLints;
-    }
+    result["contextRoot"] = contextRoot;
     return result;
   }
 
   @override
+  Request toRequest(String id) {
+    return new Request(id, "execution.createContext", toJson());
+  }
+
+  @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisOptions) {
-      return enableAsync == other.enableAsync &&
-          enableDeferredLoading == other.enableDeferredLoading &&
-          enableEnums == other.enableEnums &&
-          enableNullAwareOperators == other.enableNullAwareOperators &&
-          enableSuperMixins == other.enableSuperMixins &&
-          generateDart2jsHints == other.generateDart2jsHints &&
-          generateHints == other.generateHints &&
-          generateLints == other.generateLints;
+    if (other is ExecutionCreateContextParams) {
+      return contextRoot == other.contextRoot;
     }
     return false;
   }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, contextRoot.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * execution.createContext result
+ *
+ * {
+ *   "id": ExecutionContextId
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ExecutionCreateContextResult implements ResponseResult {
+  String _id;
+
+  /**
+   * The identifier used to refer to the execution context that was created.
+   */
+  String get id => _id;
+
+  /**
+   * The identifier used to refer to the execution context that was created.
+   */
+  void set id(String value) {
+    assert(value != null);
+    this._id = value;
+  }
+
+  ExecutionCreateContextResult(String id) {
+    this.id = id;
+  }
+
+  factory ExecutionCreateContextResult.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String id;
+      if (json.containsKey("id")) {
+        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "id");
+      }
+      return new ExecutionCreateContextResult(id);
+    } else {
+      throw jsonDecoder.mismatch(
+          jsonPath, "execution.createContext result", json);
+    }
+  }
+
+  factory ExecutionCreateContextResult.fromResponse(Response response) {
+    return new ExecutionCreateContextResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["id"] = id;
+    return result;
+  }
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is ExecutionCreateContextResult) {
+      return id == other.id;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, id.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * execution.deleteContext params
+ *
+ * {
+ *   "id": ExecutionContextId
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ExecutionDeleteContextParams implements RequestParams {
+  String _id;
+
+  /**
+   * The identifier of the execution context that is to be deleted.
+   */
+  String get id => _id;
+
+  /**
+   * The identifier of the execution context that is to be deleted.
+   */
+  void set id(String value) {
+    assert(value != null);
+    this._id = value;
+  }
+
+  ExecutionDeleteContextParams(String id) {
+    this.id = id;
+  }
+
+  factory ExecutionDeleteContextParams.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String id;
+      if (json.containsKey("id")) {
+        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "id");
+      }
+      return new ExecutionDeleteContextParams(id);
+    } else {
+      throw jsonDecoder.mismatch(
+          jsonPath, "execution.deleteContext params", json);
+    }
+  }
+
+  factory ExecutionDeleteContextParams.fromRequest(Request request) {
+    return new ExecutionDeleteContextParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["id"] = id;
+    return result;
+  }
+
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "execution.deleteContext", toJson());
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is ExecutionDeleteContextParams) {
+      return id == other.id;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, id.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * execution.deleteContext result
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ExecutionDeleteContextResult implements ResponseResult {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is ExecutionDeleteContextResult) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 479954425;
+  }
+}
+
+/**
+ * execution.launchData params
+ *
+ * {
+ *   "file": FilePath
+ *   "kind": optional ExecutableKind
+ *   "referencedFiles": optional List<FilePath>
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ExecutionLaunchDataParams implements HasToJson {
+  String _file;
+
+  ExecutableKind _kind;
+
+  List<String> _referencedFiles;
+
+  /**
+   * The file for which launch data is being provided. This will either be a
+   * Dart library or an HTML file.
+   */
+  String get file => _file;
+
+  /**
+   * The file for which launch data is being provided. This will either be a
+   * Dart library or an HTML file.
+   */
+  void set file(String value) {
+    assert(value != null);
+    this._file = value;
+  }
+
+  /**
+   * The kind of the executable file. This field is omitted if the file is not
+   * a Dart file.
+   */
+  ExecutableKind get kind => _kind;
+
+  /**
+   * The kind of the executable file. This field is omitted if the file is not
+   * a Dart file.
+   */
+  void set kind(ExecutableKind value) {
+    this._kind = value;
+  }
+
+  /**
+   * A list of the Dart files that are referenced by the file. This field is
+   * omitted if the file is not an HTML file.
+   */
+  List<String> get referencedFiles => _referencedFiles;
+
+  /**
+   * A list of the Dart files that are referenced by the file. This field is
+   * omitted if the file is not an HTML file.
+   */
+  void set referencedFiles(List<String> value) {
+    this._referencedFiles = value;
+  }
+
+  ExecutionLaunchDataParams(String file,
+      {ExecutableKind kind, List<String> referencedFiles}) {
+    this.file = file;
+    this.kind = kind;
+    this.referencedFiles = referencedFiles;
+  }
+
+  factory ExecutionLaunchDataParams.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "file");
+      }
+      ExecutableKind kind;
+      if (json.containsKey("kind")) {
+        kind = new ExecutableKind.fromJson(
+            jsonDecoder, jsonPath + ".kind", json["kind"]);
+      }
+      List<String> referencedFiles;
+      if (json.containsKey("referencedFiles")) {
+        referencedFiles = jsonDecoder.decodeList(jsonPath + ".referencedFiles",
+            json["referencedFiles"], jsonDecoder.decodeString);
+      }
+      return new ExecutionLaunchDataParams(file,
+          kind: kind, referencedFiles: referencedFiles);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "execution.launchData params", json);
+    }
+  }
+
+  factory ExecutionLaunchDataParams.fromNotification(
+      Notification notification) {
+    return new ExecutionLaunchDataParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["file"] = file;
+    if (kind != null) {
+      result["kind"] = kind.toJson();
+    }
+    if (referencedFiles != null) {
+      result["referencedFiles"] = referencedFiles;
+    }
+    return result;
+  }
+
+  Notification toNotification() {
+    return new Notification("execution.launchData", toJson());
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is ExecutionLaunchDataParams) {
+      return file == other.file &&
+          kind == other.kind &&
+          listEqual(referencedFiles, other.referencedFiles,
+              (String a, String b) => a == b);
+    }
+    return false;
+  }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, enableAsync.hashCode);
-    hash = JenkinsSmiHash.combine(hash, enableDeferredLoading.hashCode);
-    hash = JenkinsSmiHash.combine(hash, enableEnums.hashCode);
-    hash = JenkinsSmiHash.combine(hash, enableNullAwareOperators.hashCode);
-    hash = JenkinsSmiHash.combine(hash, enableSuperMixins.hashCode);
-    hash = JenkinsSmiHash.combine(hash, generateDart2jsHints.hashCode);
-    hash = JenkinsSmiHash.combine(hash, generateHints.hashCode);
-    hash = JenkinsSmiHash.combine(hash, generateLints.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
+    hash = JenkinsSmiHash.combine(hash, referencedFiles.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * AnalysisService
+ * execution.mapUri params
  *
- * enum {
- *   FOLDING
- *   HIGHLIGHTS
- *   IMPLEMENTED
- *   INVALIDATE
- *   NAVIGATION
- *   OCCURRENCES
- *   OUTLINE
- *   OVERRIDES
+ * {
+ *   "id": ExecutionContextId
+ *   "file": optional FilePath
+ *   "uri": optional String
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class AnalysisService implements Enum {
-  static const AnalysisService FOLDING = const AnalysisService._("FOLDING");
+class ExecutionMapUriParams implements RequestParams {
+  String _id;
 
-  static const AnalysisService HIGHLIGHTS =
-      const AnalysisService._("HIGHLIGHTS");
+  String _file;
 
-  static const AnalysisService IMPLEMENTED =
-      const AnalysisService._("IMPLEMENTED");
+  String _uri;
 
   /**
-   * This service is not currently implemented and will become a
-   * GeneralAnalysisService in a future release.
+   * The identifier of the execution context in which the URI is to be mapped.
    */
-  static const AnalysisService INVALIDATE =
-      const AnalysisService._("INVALIDATE");
-
-  static const AnalysisService NAVIGATION =
-      const AnalysisService._("NAVIGATION");
-
-  static const AnalysisService OCCURRENCES =
-      const AnalysisService._("OCCURRENCES");
-
-  static const AnalysisService OUTLINE = const AnalysisService._("OUTLINE");
-
-  static const AnalysisService OVERRIDES = const AnalysisService._("OVERRIDES");
+  String get id => _id;
 
   /**
-   * A list containing all of the enum values that are defined.
+   * The identifier of the execution context in which the URI is to be mapped.
    */
-  static const List<AnalysisService> VALUES = const <AnalysisService>[
-    FOLDING,
-    HIGHLIGHTS,
-    IMPLEMENTED,
-    INVALIDATE,
-    NAVIGATION,
-    OCCURRENCES,
-    OUTLINE,
-    OVERRIDES
-  ];
-
-  final String name;
-
-  const AnalysisService._(this.name);
-
-  factory AnalysisService(String name) {
-    switch (name) {
-      case "FOLDING":
-        return FOLDING;
-      case "HIGHLIGHTS":
-        return HIGHLIGHTS;
-      case "IMPLEMENTED":
-        return IMPLEMENTED;
-      case "INVALIDATE":
-        return INVALIDATE;
-      case "NAVIGATION":
-        return NAVIGATION;
-      case "OCCURRENCES":
-        return OCCURRENCES;
-      case "OUTLINE":
-        return OUTLINE;
-      case "OVERRIDES":
-        return OVERRIDES;
-    }
-    throw new Exception('Illegal enum value: $name');
-  }
-
-  factory AnalysisService.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json is String) {
-      try {
-        return new AnalysisService(json);
-      } catch (_) {
-        // Fall through
-      }
-    }
-    throw jsonDecoder.mismatch(jsonPath, "AnalysisService", json);
-  }
-
-  @override
-  String toString() => "AnalysisService.$name";
-
-  String toJson() => name;
-}
-
-/**
- * AnalysisStatus
- *
- * {
- *   "isAnalyzing": bool
- *   "analysisTarget": optional String
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class AnalysisStatus implements HasToJson {
-  bool _isAnalyzing;
-
-  String _analysisTarget;
-
-  /**
-   * True if analysis is currently being performed.
-   */
-  bool get isAnalyzing => _isAnalyzing;
-
-  /**
-   * True if analysis is currently being performed.
-   */
-  void set isAnalyzing(bool value) {
+  void set id(String value) {
     assert(value != null);
-    this._isAnalyzing = value;
+    this._id = value;
   }
 
   /**
-   * The name of the current target of analysis. This field is omitted if
-   * analyzing is false.
+   * The path of the file to be mapped into a URI.
    */
-  String get analysisTarget => _analysisTarget;
+  String get file => _file;
 
   /**
-   * The name of the current target of analysis. This field is omitted if
-   * analyzing is false.
+   * The path of the file to be mapped into a URI.
    */
-  void set analysisTarget(String value) {
-    this._analysisTarget = value;
+  void set file(String value) {
+    this._file = value;
   }
 
-  AnalysisStatus(bool isAnalyzing, {String analysisTarget}) {
-    this.isAnalyzing = isAnalyzing;
-    this.analysisTarget = analysisTarget;
+  /**
+   * The URI to be mapped into a file path.
+   */
+  String get uri => _uri;
+
+  /**
+   * The URI to be mapped into a file path.
+   */
+  void set uri(String value) {
+    this._uri = value;
   }
 
-  factory AnalysisStatus.fromJson(
+  ExecutionMapUriParams(String id, {String file, String uri}) {
+    this.id = id;
+    this.file = file;
+    this.uri = uri;
+  }
+
+  factory ExecutionMapUriParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      bool isAnalyzing;
-      if (json.containsKey("isAnalyzing")) {
-        isAnalyzing = jsonDecoder.decodeBool(
-            jsonPath + ".isAnalyzing", json["isAnalyzing"]);
+      String id;
+      if (json.containsKey("id")) {
+        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "isAnalyzing");
+        throw jsonDecoder.mismatch(jsonPath, "id");
       }
-      String analysisTarget;
-      if (json.containsKey("analysisTarget")) {
-        analysisTarget = jsonDecoder.decodeString(
-            jsonPath + ".analysisTarget", json["analysisTarget"]);
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       }
-      return new AnalysisStatus(isAnalyzing, analysisTarget: analysisTarget);
+      String uri;
+      if (json.containsKey("uri")) {
+        uri = jsonDecoder.decodeString(jsonPath + ".uri", json["uri"]);
+      }
+      return new ExecutionMapUriParams(id, file: file, uri: uri);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "AnalysisStatus", json);
+      throw jsonDecoder.mismatch(jsonPath, "execution.mapUri params", json);
     }
   }
 
+  factory ExecutionMapUriParams.fromRequest(Request request) {
+    return new ExecutionMapUriParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["isAnalyzing"] = isAnalyzing;
-    if (analysisTarget != null) {
-      result["analysisTarget"] = analysisTarget;
+    result["id"] = id;
+    if (file != null) {
+      result["file"] = file;
+    }
+    if (uri != null) {
+      result["uri"] = uri;
     }
     return result;
   }
 
   @override
+  Request toRequest(String id) {
+    return new Request(id, "execution.mapUri", toJson());
+  }
+
+  @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is AnalysisStatus) {
-      return isAnalyzing == other.isAnalyzing &&
-          analysisTarget == other.analysisTarget;
+    if (other is ExecutionMapUriParams) {
+      return id == other.id && file == other.file && uri == other.uri;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, isAnalyzing.hashCode);
-    hash = JenkinsSmiHash.combine(hash, analysisTarget.hashCode);
+    hash = JenkinsSmiHash.combine(hash, id.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, uri.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * ChangeContentOverlay
+ * execution.mapUri result
  *
  * {
- *   "type": "change"
- *   "edits": List<SourceEdit>
+ *   "file": optional FilePath
+ *   "uri": optional String
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ChangeContentOverlay implements HasToJson {
-  List<SourceEdit> _edits;
+class ExecutionMapUriResult implements ResponseResult {
+  String _file;
+
+  String _uri;
 
   /**
-   * The edits to be applied to the file.
+   * The file to which the URI was mapped. This field is omitted if the uri
+   * field was not given in the request.
    */
-  List<SourceEdit> get edits => _edits;
+  String get file => _file;
 
   /**
-   * The edits to be applied to the file.
+   * The file to which the URI was mapped. This field is omitted if the uri
+   * field was not given in the request.
    */
-  void set edits(List<SourceEdit> value) {
-    assert(value != null);
-    this._edits = value;
+  void set file(String value) {
+    this._file = value;
   }
 
-  ChangeContentOverlay(List<SourceEdit> edits) {
-    this.edits = edits;
+  /**
+   * The URI to which the file path was mapped. This field is omitted if the
+   * file field was not given in the request.
+   */
+  String get uri => _uri;
+
+  /**
+   * The URI to which the file path was mapped. This field is omitted if the
+   * file field was not given in the request.
+   */
+  void set uri(String value) {
+    this._uri = value;
   }
 
-  factory ChangeContentOverlay.fromJson(
+  ExecutionMapUriResult({String file, String uri}) {
+    this.file = file;
+    this.uri = uri;
+  }
+
+  factory ExecutionMapUriResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      if (json["type"] != "change") {
-        throw jsonDecoder.mismatch(jsonPath, "equal " + "change", json);
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       }
-      List<SourceEdit> edits;
-      if (json.containsKey("edits")) {
-        edits = jsonDecoder.decodeList(
-            jsonPath + ".edits",
-            json["edits"],
-            (String jsonPath, Object json) =>
-                new SourceEdit.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "edits");
+      String uri;
+      if (json.containsKey("uri")) {
+        uri = jsonDecoder.decodeString(jsonPath + ".uri", json["uri"]);
       }
-      return new ChangeContentOverlay(edits);
+      return new ExecutionMapUriResult(file: file, uri: uri);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "ChangeContentOverlay", json);
+      throw jsonDecoder.mismatch(jsonPath, "execution.mapUri result", json);
     }
   }
 
+  factory ExecutionMapUriResult.fromResponse(Response response) {
+    return new ExecutionMapUriResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["type"] = "change";
-    result["edits"] = edits.map((SourceEdit value) => value.toJson()).toList();
+    if (file != null) {
+      result["file"] = file;
+    }
+    if (uri != null) {
+      result["uri"] = uri;
+    }
     return result;
   }
 
   @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
+  }
+
+  @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ChangeContentOverlay) {
-      return listEqual(
-          edits, other.edits, (SourceEdit a, SourceEdit b) => a == b);
+    if (other is ExecutionMapUriResult) {
+      return file == other.file && uri == other.uri;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, 873118866);
-    hash = JenkinsSmiHash.combine(hash, edits.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, uri.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * CompletionSuggestion
- *
- * {
- *   "kind": CompletionSuggestionKind
- *   "relevance": int
- *   "completion": String
- *   "selectionOffset": int
- *   "selectionLength": int
- *   "isDeprecated": bool
- *   "isPotential": bool
- *   "docSummary": optional String
- *   "docComplete": optional String
- *   "declaringType": optional String
- *   "defaultArgumentListString": optional String
- *   "defaultArgumentListTextRanges": optional List<int>
- *   "element": optional Element
- *   "returnType": optional String
- *   "parameterNames": optional List<String>
- *   "parameterTypes": optional List<String>
- *   "requiredParameterCount": optional int
- *   "hasNamedParameters": optional bool
- *   "parameterName": optional String
- *   "parameterType": optional String
- *   "importUri": optional String
+ * ExecutionService
+ *
+ * enum {
+ *   LAUNCH_DATA
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class CompletionSuggestion implements HasToJson {
-  CompletionSuggestionKind _kind;
-
-  int _relevance;
-
-  String _completion;
-
-  int _selectionOffset;
-
-  int _selectionLength;
-
-  bool _isDeprecated;
-
-  bool _isPotential;
-
-  String _docSummary;
-
-  String _docComplete;
-
-  String _declaringType;
-
-  String _defaultArgumentListString;
-
-  List<int> _defaultArgumentListTextRanges;
-
-  Element _element;
-
-  String _returnType;
-
-  List<String> _parameterNames;
-
-  List<String> _parameterTypes;
-
-  int _requiredParameterCount;
-
-  bool _hasNamedParameters;
-
-  String _parameterName;
-
-  String _parameterType;
-
-  String _importUri;
-
-  /**
-   * The kind of element being suggested.
-   */
-  CompletionSuggestionKind get kind => _kind;
-
-  /**
-   * The kind of element being suggested.
-   */
-  void set kind(CompletionSuggestionKind value) {
-    assert(value != null);
-    this._kind = value;
-  }
-
-  /**
-   * The relevance of this completion suggestion where a higher number
-   * indicates a higher relevance.
-   */
-  int get relevance => _relevance;
-
-  /**
-   * The relevance of this completion suggestion where a higher number
-   * indicates a higher relevance.
-   */
-  void set relevance(int value) {
-    assert(value != null);
-    this._relevance = value;
-  }
-
-  /**
-   * The identifier to be inserted if the suggestion is selected. If the
-   * suggestion is for a method or function, the client might want to
-   * additionally insert a template for the parameters. The information
-   * required in order to do so is contained in other fields.
-   */
-  String get completion => _completion;
-
-  /**
-   * The identifier to be inserted if the suggestion is selected. If the
-   * suggestion is for a method or function, the client might want to
-   * additionally insert a template for the parameters. The information
-   * required in order to do so is contained in other fields.
-   */
-  void set completion(String value) {
-    assert(value != null);
-    this._completion = value;
-  }
-
-  /**
-   * The offset, relative to the beginning of the completion, of where the
-   * selection should be placed after insertion.
-   */
-  int get selectionOffset => _selectionOffset;
-
-  /**
-   * The offset, relative to the beginning of the completion, of where the
-   * selection should be placed after insertion.
-   */
-  void set selectionOffset(int value) {
-    assert(value != null);
-    this._selectionOffset = value;
-  }
-
-  /**
-   * The number of characters that should be selected after insertion.
-   */
-  int get selectionLength => _selectionLength;
-
-  /**
-   * The number of characters that should be selected after insertion.
-   */
-  void set selectionLength(int value) {
-    assert(value != null);
-    this._selectionLength = value;
-  }
-
-  /**
-   * True if the suggested element is deprecated.
-   */
-  bool get isDeprecated => _isDeprecated;
-
-  /**
-   * True if the suggested element is deprecated.
-   */
-  void set isDeprecated(bool value) {
-    assert(value != null);
-    this._isDeprecated = value;
-  }
-
-  /**
-   * True if the element is not known to be valid for the target. This happens
-   * if the type of the target is dynamic.
-   */
-  bool get isPotential => _isPotential;
-
-  /**
-   * True if the element is not known to be valid for the target. This happens
-   * if the type of the target is dynamic.
-   */
-  void set isPotential(bool value) {
-    assert(value != null);
-    this._isPotential = value;
-  }
-
-  /**
-   * An abbreviated version of the Dartdoc associated with the element being
-   * suggested, This field is omitted if there is no Dartdoc associated with
-   * the element.
-   */
-  String get docSummary => _docSummary;
-
-  /**
-   * An abbreviated version of the Dartdoc associated with the element being
-   * suggested, This field is omitted if there is no Dartdoc associated with
-   * the element.
-   */
-  void set docSummary(String value) {
-    this._docSummary = value;
-  }
-
-  /**
-   * The Dartdoc associated with the element being suggested, This field is
-   * omitted if there is no Dartdoc associated with the element.
-   */
-  String get docComplete => _docComplete;
-
-  /**
-   * The Dartdoc associated with the element being suggested, This field is
-   * omitted if there is no Dartdoc associated with the element.
-   */
-  void set docComplete(String value) {
-    this._docComplete = value;
-  }
-
-  /**
-   * The class that declares the element being suggested. This field is omitted
-   * if the suggested element is not a member of a class.
-   */
-  String get declaringType => _declaringType;
-
-  /**
-   * The class that declares the element being suggested. This field is omitted
-   * if the suggested element is not a member of a class.
-   */
-  void set declaringType(String value) {
-    this._declaringType = value;
-  }
-
-  /**
-   * A default String for use in generating argument list source contents on
-   * the client side.
-   */
-  String get defaultArgumentListString => _defaultArgumentListString;
-
-  /**
-   * A default String for use in generating argument list source contents on
-   * the client side.
-   */
-  void set defaultArgumentListString(String value) {
-    this._defaultArgumentListString = value;
-  }
-
-  /**
-   * Pairs of offsets and lengths describing 'defaultArgumentListString' text
-   * ranges suitable for use by clients to set up linked edits of default
-   * argument source contents. For example, given an argument list string 'x,
-   * y', the corresponding text range [0, 1, 3, 1], indicates two text ranges
-   * of length 1, starting at offsets 0 and 3. Clients can use these ranges to
-   * treat the 'x' and 'y' values specially for linked edits.
-   */
-  List<int> get defaultArgumentListTextRanges => _defaultArgumentListTextRanges;
-
-  /**
-   * Pairs of offsets and lengths describing 'defaultArgumentListString' text
-   * ranges suitable for use by clients to set up linked edits of default
-   * argument source contents. For example, given an argument list string 'x,
-   * y', the corresponding text range [0, 1, 3, 1], indicates two text ranges
-   * of length 1, starting at offsets 0 and 3. Clients can use these ranges to
-   * treat the 'x' and 'y' values specially for linked edits.
-   */
-  void set defaultArgumentListTextRanges(List<int> value) {
-    this._defaultArgumentListTextRanges = value;
-  }
-
-  /**
-   * Information about the element reference being suggested.
-   */
-  Element get element => _element;
-
-  /**
-   * Information about the element reference being suggested.
-   */
-  void set element(Element value) {
-    this._element = value;
-  }
-
-  /**
-   * The return type of the getter, function or method or the type of the field
-   * being suggested. This field is omitted if the suggested element is not a
-   * getter, function or method.
-   */
-  String get returnType => _returnType;
-
-  /**
-   * The return type of the getter, function or method or the type of the field
-   * being suggested. This field is omitted if the suggested element is not a
-   * getter, function or method.
-   */
-  void set returnType(String value) {
-    this._returnType = value;
-  }
-
-  /**
-   * The names of the parameters of the function or method being suggested.
-   * This field is omitted if the suggested element is not a setter, function
-   * or method.
-   */
-  List<String> get parameterNames => _parameterNames;
-
-  /**
-   * The names of the parameters of the function or method being suggested.
-   * This field is omitted if the suggested element is not a setter, function
-   * or method.
-   */
-  void set parameterNames(List<String> value) {
-    this._parameterNames = value;
-  }
-
-  /**
-   * The types of the parameters of the function or method being suggested.
-   * This field is omitted if the parameterNames field is omitted.
-   */
-  List<String> get parameterTypes => _parameterTypes;
-
-  /**
-   * The types of the parameters of the function or method being suggested.
-   * This field is omitted if the parameterNames field is omitted.
-   */
-  void set parameterTypes(List<String> value) {
-    this._parameterTypes = value;
-  }
-
-  /**
-   * The number of required parameters for the function or method being
-   * suggested. This field is omitted if the parameterNames field is omitted.
-   */
-  int get requiredParameterCount => _requiredParameterCount;
-
-  /**
-   * The number of required parameters for the function or method being
-   * suggested. This field is omitted if the parameterNames field is omitted.
-   */
-  void set requiredParameterCount(int value) {
-    this._requiredParameterCount = value;
-  }
-
-  /**
-   * True if the function or method being suggested has at least one named
-   * parameter. This field is omitted if the parameterNames field is omitted.
-   */
-  bool get hasNamedParameters => _hasNamedParameters;
-
-  /**
-   * True if the function or method being suggested has at least one named
-   * parameter. This field is omitted if the parameterNames field is omitted.
-   */
-  void set hasNamedParameters(bool value) {
-    this._hasNamedParameters = value;
-  }
-
-  /**
-   * The name of the optional parameter being suggested. This field is omitted
-   * if the suggestion is not the addition of an optional argument within an
-   * argument list.
-   */
-  String get parameterName => _parameterName;
-
-  /**
-   * The name of the optional parameter being suggested. This field is omitted
-   * if the suggestion is not the addition of an optional argument within an
-   * argument list.
-   */
-  void set parameterName(String value) {
-    this._parameterName = value;
-  }
-
-  /**
-   * The type of the options parameter being suggested. This field is omitted
-   * if the parameterName field is omitted.
-   */
-  String get parameterType => _parameterType;
-
-  /**
-   * The type of the options parameter being suggested. This field is omitted
-   * if the parameterName field is omitted.
-   */
-  void set parameterType(String value) {
-    this._parameterType = value;
-  }
-
-  /**
-   * The import to be added if the suggestion is out of scope and needs an
-   * import to be added to be in scope.
-   */
-  String get importUri => _importUri;
-
-  /**
-   * The import to be added if the suggestion is out of scope and needs an
-   * import to be added to be in scope.
-   */
-  void set importUri(String value) {
-    this._importUri = value;
-  }
-
-  CompletionSuggestion(
-      CompletionSuggestionKind kind,
-      int relevance,
-      String completion,
-      int selectionOffset,
-      int selectionLength,
-      bool isDeprecated,
-      bool isPotential,
-      {String docSummary,
-      String docComplete,
-      String declaringType,
-      String defaultArgumentListString,
-      List<int> defaultArgumentListTextRanges,
-      Element element,
-      String returnType,
-      List<String> parameterNames,
-      List<String> parameterTypes,
-      int requiredParameterCount,
-      bool hasNamedParameters,
-      String parameterName,
-      String parameterType,
-      String importUri}) {
-    this.kind = kind;
-    this.relevance = relevance;
-    this.completion = completion;
-    this.selectionOffset = selectionOffset;
-    this.selectionLength = selectionLength;
-    this.isDeprecated = isDeprecated;
-    this.isPotential = isPotential;
-    this.docSummary = docSummary;
-    this.docComplete = docComplete;
-    this.declaringType = declaringType;
-    this.defaultArgumentListString = defaultArgumentListString;
-    this.defaultArgumentListTextRanges = defaultArgumentListTextRanges;
-    this.element = element;
-    this.returnType = returnType;
-    this.parameterNames = parameterNames;
-    this.parameterTypes = parameterTypes;
-    this.requiredParameterCount = requiredParameterCount;
-    this.hasNamedParameters = hasNamedParameters;
-    this.parameterName = parameterName;
-    this.parameterType = parameterType;
-    this.importUri = importUri;
-  }
-
-  factory CompletionSuggestion.fromJson(
+class ExecutionService implements Enum {
+  static const ExecutionService LAUNCH_DATA =
+      const ExecutionService._("LAUNCH_DATA");
+
+  /**
+   * A list containing all of the enum values that are defined.
+   */
+  static const List<ExecutionService> VALUES = const <ExecutionService>[
+    LAUNCH_DATA
+  ];
+
+  @override
+  final String name;
+
+  const ExecutionService._(this.name);
+
+  factory ExecutionService(String name) {
+    switch (name) {
+      case "LAUNCH_DATA":
+        return LAUNCH_DATA;
+    }
+    throw new Exception('Illegal enum value: $name');
+  }
+
+  factory ExecutionService.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json is String) {
+      try {
+        return new ExecutionService(json);
+      } catch (_) {
+        // Fall through
+      }
+    }
+    throw jsonDecoder.mismatch(jsonPath, "ExecutionService", json);
+  }
+
+  @override
+  String toString() => "ExecutionService.$name";
+
+  String toJson() => name;
+}
+
+/**
+ * execution.setSubscriptions params
+ *
+ * {
+ *   "subscriptions": List<ExecutionService>
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ExecutionSetSubscriptionsParams implements RequestParams {
+  List<ExecutionService> _subscriptions;
+
+  /**
+   * A list of the services being subscribed to.
+   */
+  List<ExecutionService> get subscriptions => _subscriptions;
+
+  /**
+   * A list of the services being subscribed to.
+   */
+  void set subscriptions(List<ExecutionService> value) {
+    assert(value != null);
+    this._subscriptions = value;
+  }
+
+  ExecutionSetSubscriptionsParams(List<ExecutionService> subscriptions) {
+    this.subscriptions = subscriptions;
+  }
+
+  factory ExecutionSetSubscriptionsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      CompletionSuggestionKind kind;
-      if (json.containsKey("kind")) {
-        kind = new CompletionSuggestionKind.fromJson(
-            jsonDecoder, jsonPath + ".kind", json["kind"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "kind");
-      }
-      int relevance;
-      if (json.containsKey("relevance")) {
-        relevance =
-            jsonDecoder.decodeInt(jsonPath + ".relevance", json["relevance"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "relevance");
-      }
-      String completion;
-      if (json.containsKey("completion")) {
-        completion = jsonDecoder.decodeString(
-            jsonPath + ".completion", json["completion"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "completion");
-      }
-      int selectionOffset;
-      if (json.containsKey("selectionOffset")) {
-        selectionOffset = jsonDecoder.decodeInt(
-            jsonPath + ".selectionOffset", json["selectionOffset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "selectionOffset");
-      }
-      int selectionLength;
-      if (json.containsKey("selectionLength")) {
-        selectionLength = jsonDecoder.decodeInt(
-            jsonPath + ".selectionLength", json["selectionLength"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "selectionLength");
-      }
-      bool isDeprecated;
-      if (json.containsKey("isDeprecated")) {
-        isDeprecated = jsonDecoder.decodeBool(
-            jsonPath + ".isDeprecated", json["isDeprecated"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "isDeprecated");
-      }
-      bool isPotential;
-      if (json.containsKey("isPotential")) {
-        isPotential = jsonDecoder.decodeBool(
-            jsonPath + ".isPotential", json["isPotential"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "isPotential");
-      }
-      String docSummary;
-      if (json.containsKey("docSummary")) {
-        docSummary = jsonDecoder.decodeString(
-            jsonPath + ".docSummary", json["docSummary"]);
-      }
-      String docComplete;
-      if (json.containsKey("docComplete")) {
-        docComplete = jsonDecoder.decodeString(
-            jsonPath + ".docComplete", json["docComplete"]);
-      }
-      String declaringType;
-      if (json.containsKey("declaringType")) {
-        declaringType = jsonDecoder.decodeString(
-            jsonPath + ".declaringType", json["declaringType"]);
-      }
-      String defaultArgumentListString;
-      if (json.containsKey("defaultArgumentListString")) {
-        defaultArgumentListString = jsonDecoder.decodeString(
-            jsonPath + ".defaultArgumentListString",
-            json["defaultArgumentListString"]);
-      }
-      List<int> defaultArgumentListTextRanges;
-      if (json.containsKey("defaultArgumentListTextRanges")) {
-        defaultArgumentListTextRanges = jsonDecoder.decodeList(
-            jsonPath + ".defaultArgumentListTextRanges",
-            json["defaultArgumentListTextRanges"],
-            jsonDecoder.decodeInt);
-      }
-      Element element;
-      if (json.containsKey("element")) {
-        element = new Element.fromJson(
-            jsonDecoder, jsonPath + ".element", json["element"]);
-      }
-      String returnType;
-      if (json.containsKey("returnType")) {
-        returnType = jsonDecoder.decodeString(
-            jsonPath + ".returnType", json["returnType"]);
-      }
-      List<String> parameterNames;
-      if (json.containsKey("parameterNames")) {
-        parameterNames = jsonDecoder.decodeList(jsonPath + ".parameterNames",
-            json["parameterNames"], jsonDecoder.decodeString);
-      }
-      List<String> parameterTypes;
-      if (json.containsKey("parameterTypes")) {
-        parameterTypes = jsonDecoder.decodeList(jsonPath + ".parameterTypes",
-            json["parameterTypes"], jsonDecoder.decodeString);
-      }
-      int requiredParameterCount;
-      if (json.containsKey("requiredParameterCount")) {
-        requiredParameterCount = jsonDecoder.decodeInt(
-            jsonPath + ".requiredParameterCount",
-            json["requiredParameterCount"]);
-      }
-      bool hasNamedParameters;
-      if (json.containsKey("hasNamedParameters")) {
-        hasNamedParameters = jsonDecoder.decodeBool(
-            jsonPath + ".hasNamedParameters", json["hasNamedParameters"]);
-      }
-      String parameterName;
-      if (json.containsKey("parameterName")) {
-        parameterName = jsonDecoder.decodeString(
-            jsonPath + ".parameterName", json["parameterName"]);
-      }
-      String parameterType;
-      if (json.containsKey("parameterType")) {
-        parameterType = jsonDecoder.decodeString(
-            jsonPath + ".parameterType", json["parameterType"]);
-      }
-      String importUri;
-      if (json.containsKey("importUri")) {
-        importUri = jsonDecoder.decodeString(
-            jsonPath + ".importUri", json["importUri"]);
-      }
-      return new CompletionSuggestion(kind, relevance, completion,
-          selectionOffset, selectionLength, isDeprecated, isPotential,
-          docSummary: docSummary,
-          docComplete: docComplete,
-          declaringType: declaringType,
-          defaultArgumentListString: defaultArgumentListString,
-          defaultArgumentListTextRanges: defaultArgumentListTextRanges,
-          element: element,
-          returnType: returnType,
-          parameterNames: parameterNames,
-          parameterTypes: parameterTypes,
-          requiredParameterCount: requiredParameterCount,
-          hasNamedParameters: hasNamedParameters,
-          parameterName: parameterName,
-          parameterType: parameterType,
-          importUri: importUri);
+      List<ExecutionService> subscriptions;
+      if (json.containsKey("subscriptions")) {
+        subscriptions = jsonDecoder.decodeList(
+            jsonPath + ".subscriptions",
+            json["subscriptions"],
+            (String jsonPath, Object json) =>
+                new ExecutionService.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "subscriptions");
+      }
+      return new ExecutionSetSubscriptionsParams(subscriptions);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "CompletionSuggestion", json);
-    }
-  }
-
+      throw jsonDecoder.mismatch(
+          jsonPath, "execution.setSubscriptions params", json);
+    }
+  }
+
+  factory ExecutionSetSubscriptionsParams.fromRequest(Request request) {
+    return new ExecutionSetSubscriptionsParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["kind"] = kind.toJson();
-    result["relevance"] = relevance;
-    result["completion"] = completion;
-    result["selectionOffset"] = selectionOffset;
-    result["selectionLength"] = selectionLength;
-    result["isDeprecated"] = isDeprecated;
-    result["isPotential"] = isPotential;
-    if (docSummary != null) {
-      result["docSummary"] = docSummary;
-    }
-    if (docComplete != null) {
-      result["docComplete"] = docComplete;
-    }
-    if (declaringType != null) {
-      result["declaringType"] = declaringType;
-    }
-    if (defaultArgumentListString != null) {
-      result["defaultArgumentListString"] = defaultArgumentListString;
-    }
-    if (defaultArgumentListTextRanges != null) {
-      result["defaultArgumentListTextRanges"] = defaultArgumentListTextRanges;
-    }
-    if (element != null) {
-      result["element"] = element.toJson();
-    }
-    if (returnType != null) {
-      result["returnType"] = returnType;
-    }
-    if (parameterNames != null) {
-      result["parameterNames"] = parameterNames;
-    }
-    if (parameterTypes != null) {
-      result["parameterTypes"] = parameterTypes;
-    }
-    if (requiredParameterCount != null) {
-      result["requiredParameterCount"] = requiredParameterCount;
-    }
-    if (hasNamedParameters != null) {
-      result["hasNamedParameters"] = hasNamedParameters;
-    }
-    if (parameterName != null) {
-      result["parameterName"] = parameterName;
-    }
-    if (parameterType != null) {
-      result["parameterType"] = parameterType;
-    }
-    if (importUri != null) {
-      result["importUri"] = importUri;
-    }
+    result["subscriptions"] =
+        subscriptions.map((ExecutionService value) => value.toJson()).toList();
     return result;
   }
 
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "execution.setSubscriptions", toJson());
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is ExecutionSetSubscriptionsParams) {
+      return listEqual(subscriptions, other.subscriptions,
+          (ExecutionService a, ExecutionService b) => a == b);
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * execution.setSubscriptions result
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ExecutionSetSubscriptionsResult implements ResponseResult {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is ExecutionSetSubscriptionsResult) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 287678780;
+  }
+}
+
+/**
+ * extractLocalVariable feedback
+ *
+ * {
+ *   "coveringExpressionOffsets": optional List<int>
+ *   "coveringExpressionLengths": optional List<int>
+ *   "names": List<String>
+ *   "offsets": List<int>
+ *   "lengths": List<int>
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ExtractLocalVariableFeedback extends RefactoringFeedback {
+  List<int> _coveringExpressionOffsets;
+
+  List<int> _coveringExpressionLengths;
+
+  List<String> _names;
+
+  List<int> _offsets;
+
+  List<int> _lengths;
+
+  /**
+   * The offsets of the expressions that cover the specified selection, from
+   * the down most to the up most.
+   */
+  List<int> get coveringExpressionOffsets => _coveringExpressionOffsets;
+
+  /**
+   * The offsets of the expressions that cover the specified selection, from
+   * the down most to the up most.
+   */
+  void set coveringExpressionOffsets(List<int> value) {
+    this._coveringExpressionOffsets = value;
+  }
+
+  /**
+   * The lengths of the expressions that cover the specified selection, from
+   * the down most to the up most.
+   */
+  List<int> get coveringExpressionLengths => _coveringExpressionLengths;
+
+  /**
+   * The lengths of the expressions that cover the specified selection, from
+   * the down most to the up most.
+   */
+  void set coveringExpressionLengths(List<int> value) {
+    this._coveringExpressionLengths = value;
+  }
+
+  /**
+   * The proposed names for the local variable.
+   */
+  List<String> get names => _names;
+
+  /**
+   * The proposed names for the local variable.
+   */
+  void set names(List<String> value) {
+    assert(value != null);
+    this._names = value;
+  }
+
+  /**
+   * The offsets of the expressions that would be replaced by a reference to
+   * the variable.
+   */
+  List<int> get offsets => _offsets;
+
+  /**
+   * The offsets of the expressions that would be replaced by a reference to
+   * the variable.
+   */
+  void set offsets(List<int> value) {
+    assert(value != null);
+    this._offsets = value;
+  }
+
+  /**
+   * The lengths of the expressions that would be replaced by a reference to
+   * the variable. The lengths correspond to the offsets. In other words, for a
+   * given expression, if the offset of that expression is offsets[i], then the
+   * length of that expression is lengths[i].
+   */
+  List<int> get lengths => _lengths;
+
+  /**
+   * The lengths of the expressions that would be replaced by a reference to
+   * the variable. The lengths correspond to the offsets. In other words, for a
+   * given expression, if the offset of that expression is offsets[i], then the
+   * length of that expression is lengths[i].
+   */
+  void set lengths(List<int> value) {
+    assert(value != null);
+    this._lengths = value;
+  }
+
+  ExtractLocalVariableFeedback(
+      List<String> names, List<int> offsets, List<int> lengths,
+      {List<int> coveringExpressionOffsets,
+      List<int> coveringExpressionLengths}) {
+    this.coveringExpressionOffsets = coveringExpressionOffsets;
+    this.coveringExpressionLengths = coveringExpressionLengths;
+    this.names = names;
+    this.offsets = offsets;
+    this.lengths = lengths;
+  }
+
+  factory ExtractLocalVariableFeedback.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      List<int> coveringExpressionOffsets;
+      if (json.containsKey("coveringExpressionOffsets")) {
+        coveringExpressionOffsets = jsonDecoder.decodeList(
+            jsonPath + ".coveringExpressionOffsets",
+            json["coveringExpressionOffsets"],
+            jsonDecoder.decodeInt);
+      }
+      List<int> coveringExpressionLengths;
+      if (json.containsKey("coveringExpressionLengths")) {
+        coveringExpressionLengths = jsonDecoder.decodeList(
+            jsonPath + ".coveringExpressionLengths",
+            json["coveringExpressionLengths"],
+            jsonDecoder.decodeInt);
+      }
+      List<String> names;
+      if (json.containsKey("names")) {
+        names = jsonDecoder.decodeList(
+            jsonPath + ".names", json["names"], jsonDecoder.decodeString);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "names");
+      }
+      List<int> offsets;
+      if (json.containsKey("offsets")) {
+        offsets = jsonDecoder.decodeList(
+            jsonPath + ".offsets", json["offsets"], jsonDecoder.decodeInt);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offsets");
+      }
+      List<int> lengths;
+      if (json.containsKey("lengths")) {
+        lengths = jsonDecoder.decodeList(
+            jsonPath + ".lengths", json["lengths"], jsonDecoder.decodeInt);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "lengths");
+      }
+      return new ExtractLocalVariableFeedback(names, offsets, lengths,
+          coveringExpressionOffsets: coveringExpressionOffsets,
+          coveringExpressionLengths: coveringExpressionLengths);
+    } else {
+      throw jsonDecoder.mismatch(
+          jsonPath, "extractLocalVariable feedback", json);
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    if (coveringExpressionOffsets != null) {
+      result["coveringExpressionOffsets"] = coveringExpressionOffsets;
+    }
+    if (coveringExpressionLengths != null) {
+      result["coveringExpressionLengths"] = coveringExpressionLengths;
+    }
+    result["names"] = names;
+    result["offsets"] = offsets;
+    result["lengths"] = lengths;
+    return result;
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is ExtractLocalVariableFeedback) {
+      return listEqual(coveringExpressionOffsets,
+              other.coveringExpressionOffsets, (int a, int b) => a == b) &&
+          listEqual(coveringExpressionLengths, other.coveringExpressionLengths,
+              (int a, int b) => a == b) &&
+          listEqual(names, other.names, (String a, String b) => a == b) &&
+          listEqual(offsets, other.offsets, (int a, int b) => a == b) &&
+          listEqual(lengths, other.lengths, (int a, int b) => a == b);
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, coveringExpressionOffsets.hashCode);
+    hash = JenkinsSmiHash.combine(hash, coveringExpressionLengths.hashCode);
+    hash = JenkinsSmiHash.combine(hash, names.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offsets.hashCode);
+    hash = JenkinsSmiHash.combine(hash, lengths.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * extractLocalVariable options
+ *
+ * {
+ *   "name": String
+ *   "extractAll": bool
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ExtractLocalVariableOptions extends RefactoringOptions {
+  String _name;
+
+  bool _extractAll;
+
+  /**
+   * The name that the local variable should be given.
+   */
+  String get name => _name;
+
+  /**
+   * The name that the local variable should be given.
+   */
+  void set name(String value) {
+    assert(value != null);
+    this._name = value;
+  }
+
+  /**
+   * True if all occurrences of the expression within the scope in which the
+   * variable will be defined should be replaced by a reference to the local
+   * variable. The expression used to initiate the refactoring will always be
+   * replaced.
+   */
+  bool get extractAll => _extractAll;
+
+  /**
+   * True if all occurrences of the expression within the scope in which the
+   * variable will be defined should be replaced by a reference to the local
+   * variable. The expression used to initiate the refactoring will always be
+   * replaced.
+   */
+  void set extractAll(bool value) {
+    assert(value != null);
+    this._extractAll = value;
+  }
+
+  ExtractLocalVariableOptions(String name, bool extractAll) {
+    this.name = name;
+    this.extractAll = extractAll;
+  }
+
+  factory ExtractLocalVariableOptions.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String name;
+      if (json.containsKey("name")) {
+        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "name");
+      }
+      bool extractAll;
+      if (json.containsKey("extractAll")) {
+        extractAll = jsonDecoder.decodeBool(
+            jsonPath + ".extractAll", json["extractAll"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "extractAll");
+      }
+      return new ExtractLocalVariableOptions(name, extractAll);
+    } else {
+      throw jsonDecoder.mismatch(
+          jsonPath, "extractLocalVariable options", json);
+    }
+  }
+
+  factory ExtractLocalVariableOptions.fromRefactoringParams(
+      EditGetRefactoringParams refactoringParams, Request request) {
+    return new ExtractLocalVariableOptions.fromJson(
+        new RequestDecoder(request), "options", refactoringParams.options);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["name"] = name;
+    result["extractAll"] = extractAll;
+    return result;
+  }
+
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is CompletionSuggestion) {
-      return kind == other.kind &&
-          relevance == other.relevance &&
-          completion == other.completion &&
-          selectionOffset == other.selectionOffset &&
-          selectionLength == other.selectionLength &&
-          isDeprecated == other.isDeprecated &&
-          isPotential == other.isPotential &&
-          docSummary == other.docSummary &&
-          docComplete == other.docComplete &&
-          declaringType == other.declaringType &&
-          defaultArgumentListString == other.defaultArgumentListString &&
-          listEqual(defaultArgumentListTextRanges,
-              other.defaultArgumentListTextRanges, (int a, int b) => a == b) &&
-          element == other.element &&
-          returnType == other.returnType &&
-          listEqual(parameterNames, other.parameterNames,
-              (String a, String b) => a == b) &&
-          listEqual(parameterTypes, other.parameterTypes,
-              (String a, String b) => a == b) &&
-          requiredParameterCount == other.requiredParameterCount &&
-          hasNamedParameters == other.hasNamedParameters &&
-          parameterName == other.parameterName &&
-          parameterType == other.parameterType &&
-          importUri == other.importUri;
+    if (other is ExtractLocalVariableOptions) {
+      return name == other.name && extractAll == other.extractAll;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
-    hash = JenkinsSmiHash.combine(hash, relevance.hashCode);
-    hash = JenkinsSmiHash.combine(hash, completion.hashCode);
-    hash = JenkinsSmiHash.combine(hash, selectionOffset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, selectionLength.hashCode);
-    hash = JenkinsSmiHash.combine(hash, isDeprecated.hashCode);
-    hash = JenkinsSmiHash.combine(hash, isPotential.hashCode);
-    hash = JenkinsSmiHash.combine(hash, docSummary.hashCode);
-    hash = JenkinsSmiHash.combine(hash, docComplete.hashCode);
-    hash = JenkinsSmiHash.combine(hash, declaringType.hashCode);
-    hash = JenkinsSmiHash.combine(hash, defaultArgumentListString.hashCode);
-    hash = JenkinsSmiHash.combine(hash, defaultArgumentListTextRanges.hashCode);
-    hash = JenkinsSmiHash.combine(hash, element.hashCode);
-    hash = JenkinsSmiHash.combine(hash, returnType.hashCode);
-    hash = JenkinsSmiHash.combine(hash, parameterNames.hashCode);
-    hash = JenkinsSmiHash.combine(hash, parameterTypes.hashCode);
-    hash = JenkinsSmiHash.combine(hash, requiredParameterCount.hashCode);
-    hash = JenkinsSmiHash.combine(hash, hasNamedParameters.hashCode);
-    hash = JenkinsSmiHash.combine(hash, parameterName.hashCode);
-    hash = JenkinsSmiHash.combine(hash, parameterType.hashCode);
-    hash = JenkinsSmiHash.combine(hash, importUri.hashCode);
+    hash = JenkinsSmiHash.combine(hash, name.hashCode);
+    hash = JenkinsSmiHash.combine(hash, extractAll.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * CompletionSuggestionKind
+ * extractMethod feedback
  *
- * enum {
- *   ARGUMENT_LIST
- *   IMPORT
- *   IDENTIFIER
- *   INVOCATION
- *   KEYWORD
- *   NAMED_ARGUMENT
- *   OPTIONAL_ARGUMENT
- *   PARAMETER
+ * {
+ *   "offset": int
+ *   "length": int
+ *   "returnType": String
+ *   "names": List<String>
+ *   "canCreateGetter": bool
+ *   "parameters": List<RefactoringMethodParameter>
+ *   "offsets": List<int>
+ *   "lengths": List<int>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class CompletionSuggestionKind implements Enum {
-  /**
-   * A list of arguments for the method or function that is being invoked. For
-   * this suggestion kind, the completion field is a textual representation of
-   * the invocation and the parameterNames, parameterTypes, and
-   * requiredParameterCount attributes are defined.
-   */
-  static const CompletionSuggestionKind ARGUMENT_LIST =
-      const CompletionSuggestionKind._("ARGUMENT_LIST");
-
-  static const CompletionSuggestionKind IMPORT =
-      const CompletionSuggestionKind._("IMPORT");
-
-  /**
-   * The element identifier should be inserted at the completion location. For
-   * example "someMethod" in import 'myLib.dart' show someMethod; . For
-   * suggestions of this kind, the element attribute is defined and the
-   * completion field is the element's identifier.
-   */
-  static const CompletionSuggestionKind IDENTIFIER =
-      const CompletionSuggestionKind._("IDENTIFIER");
-
-  /**
-   * The element is being invoked at the completion location. For example,
-   * "someMethod" in x.someMethod(); . For suggestions of this kind, the
-   * element attribute is defined and the completion field is the element's
-   * identifier.
-   */
-  static const CompletionSuggestionKind INVOCATION =
-      const CompletionSuggestionKind._("INVOCATION");
-
-  /**
-   * A keyword is being suggested. For suggestions of this kind, the completion
-   * is the keyword.
-   */
-  static const CompletionSuggestionKind KEYWORD =
-      const CompletionSuggestionKind._("KEYWORD");
-
-  /**
-   * A named argument for the current callsite is being suggested. For
-   * suggestions of this kind, the completion is the named argument identifier
-   * including a trailing ':' and space.
-   */
-  static const CompletionSuggestionKind NAMED_ARGUMENT =
-      const CompletionSuggestionKind._("NAMED_ARGUMENT");
-
-  static const CompletionSuggestionKind OPTIONAL_ARGUMENT =
-      const CompletionSuggestionKind._("OPTIONAL_ARGUMENT");
-
-  static const CompletionSuggestionKind PARAMETER =
-      const CompletionSuggestionKind._("PARAMETER");
-
-  /**
-   * A list containing all of the enum values that are defined.
-   */
-  static const List<CompletionSuggestionKind> VALUES =
-      const <CompletionSuggestionKind>[
-    ARGUMENT_LIST,
-    IMPORT,
-    IDENTIFIER,
-    INVOCATION,
-    KEYWORD,
-    NAMED_ARGUMENT,
-    OPTIONAL_ARGUMENT,
-    PARAMETER
-  ];
-
-  final String name;
-
-  const CompletionSuggestionKind._(this.name);
-
-  factory CompletionSuggestionKind(String name) {
-    switch (name) {
-      case "ARGUMENT_LIST":
-        return ARGUMENT_LIST;
-      case "IMPORT":
-        return IMPORT;
-      case "IDENTIFIER":
-        return IDENTIFIER;
-      case "INVOCATION":
-        return INVOCATION;
-      case "KEYWORD":
-        return KEYWORD;
-      case "NAMED_ARGUMENT":
-        return NAMED_ARGUMENT;
-      case "OPTIONAL_ARGUMENT":
-        return OPTIONAL_ARGUMENT;
-      case "PARAMETER":
-        return PARAMETER;
-    }
-    throw new Exception('Illegal enum value: $name');
-  }
-
-  factory CompletionSuggestionKind.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json is String) {
-      try {
-        return new CompletionSuggestionKind(json);
-      } catch (_) {
-        // Fall through
-      }
-    }
-    throw jsonDecoder.mismatch(jsonPath, "CompletionSuggestionKind", json);
-  }
-
-  @override
-  String toString() => "CompletionSuggestionKind.$name";
-
-  String toJson() => name;
-}
-
-/**
- * ContextData
- *
- * {
- *   "name": String
- *   "explicitFileCount": int
- *   "implicitFileCount": int
- *   "workItemQueueLength": int
- *   "cacheEntryExceptions": List<String>
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ContextData implements HasToJson {
-  String _name;
-
-  int _explicitFileCount;
-
-  int _implicitFileCount;
-
-  int _workItemQueueLength;
-
-  List<String> _cacheEntryExceptions;
-
-  /**
-   * The name of the context.
-   */
-  String get name => _name;
-
-  /**
-   * The name of the context.
-   */
-  void set name(String value) {
-    assert(value != null);
-    this._name = value;
-  }
-
-  /**
-   * Explicitly analyzed files.
-   */
-  int get explicitFileCount => _explicitFileCount;
-
-  /**
-   * Explicitly analyzed files.
-   */
-  void set explicitFileCount(int value) {
-    assert(value != null);
-    this._explicitFileCount = value;
-  }
-
-  /**
-   * Implicitly analyzed files.
-   */
-  int get implicitFileCount => _implicitFileCount;
-
-  /**
-   * Implicitly analyzed files.
-   */
-  void set implicitFileCount(int value) {
-    assert(value != null);
-    this._implicitFileCount = value;
-  }
-
-  /**
-   * The number of work items in the queue.
-   */
-  int get workItemQueueLength => _workItemQueueLength;
-
-  /**
-   * The number of work items in the queue.
-   */
-  void set workItemQueueLength(int value) {
-    assert(value != null);
-    this._workItemQueueLength = value;
-  }
-
-  /**
-   * Exceptions associated with cache entries.
-   */
-  List<String> get cacheEntryExceptions => _cacheEntryExceptions;
-
-  /**
-   * Exceptions associated with cache entries.
-   */
-  void set cacheEntryExceptions(List<String> value) {
-    assert(value != null);
-    this._cacheEntryExceptions = value;
-  }
-
-  ContextData(String name, int explicitFileCount, int implicitFileCount,
-      int workItemQueueLength, List<String> cacheEntryExceptions) {
-    this.name = name;
-    this.explicitFileCount = explicitFileCount;
-    this.implicitFileCount = implicitFileCount;
-    this.workItemQueueLength = workItemQueueLength;
-    this.cacheEntryExceptions = cacheEntryExceptions;
-  }
-
-  factory ContextData.fromJson(
+class ExtractMethodFeedback extends RefactoringFeedback {
+  int _offset;
+
+  int _length;
+
+  String _returnType;
+
+  List<String> _names;
+
+  bool _canCreateGetter;
+
+  List<RefactoringMethodParameter> _parameters;
+
+  List<int> _offsets;
+
+  List<int> _lengths;
+
+  /**
+   * The offset to the beginning of the expression or statements that will be
+   * extracted.
+   */
+  int get offset => _offset;
+
+  /**
+   * The offset to the beginning of the expression or statements that will be
+   * extracted.
+   */
+  void set offset(int value) {
+    assert(value != null);
+    this._offset = value;
+  }
+
+  /**
+   * The length of the expression or statements that will be extracted.
+   */
+  int get length => _length;
+
+  /**
+   * The length of the expression or statements that will be extracted.
+   */
+  void set length(int value) {
+    assert(value != null);
+    this._length = value;
+  }
+
+  /**
+   * The proposed return type for the method. If the returned element does not
+   * have a declared return type, this field will contain an empty string.
+   */
+  String get returnType => _returnType;
+
+  /**
+   * The proposed return type for the method. If the returned element does not
+   * have a declared return type, this field will contain an empty string.
+   */
+  void set returnType(String value) {
+    assert(value != null);
+    this._returnType = value;
+  }
+
+  /**
+   * The proposed names for the method.
+   */
+  List<String> get names => _names;
+
+  /**
+   * The proposed names for the method.
+   */
+  void set names(List<String> value) {
+    assert(value != null);
+    this._names = value;
+  }
+
+  /**
+   * True if a getter could be created rather than a method.
+   */
+  bool get canCreateGetter => _canCreateGetter;
+
+  /**
+   * True if a getter could be created rather than a method.
+   */
+  void set canCreateGetter(bool value) {
+    assert(value != null);
+    this._canCreateGetter = value;
+  }
+
+  /**
+   * The proposed parameters for the method.
+   */
+  List<RefactoringMethodParameter> get parameters => _parameters;
+
+  /**
+   * The proposed parameters for the method.
+   */
+  void set parameters(List<RefactoringMethodParameter> value) {
+    assert(value != null);
+    this._parameters = value;
+  }
+
+  /**
+   * The offsets of the expressions or statements that would be replaced by an
+   * invocation of the method.
+   */
+  List<int> get offsets => _offsets;
+
+  /**
+   * The offsets of the expressions or statements that would be replaced by an
+   * invocation of the method.
+   */
+  void set offsets(List<int> value) {
+    assert(value != null);
+    this._offsets = value;
+  }
+
+  /**
+   * The lengths of the expressions or statements that would be replaced by an
+   * invocation of the method. The lengths correspond to the offsets. In other
+   * words, for a given expression (or block of statements), if the offset of
+   * that expression is offsets[i], then the length of that expression is
+   * lengths[i].
+   */
+  List<int> get lengths => _lengths;
+
+  /**
+   * The lengths of the expressions or statements that would be replaced by an
+   * invocation of the method. The lengths correspond to the offsets. In other
+   * words, for a given expression (or block of statements), if the offset of
+   * that expression is offsets[i], then the length of that expression is
+   * lengths[i].
+   */
+  void set lengths(List<int> value) {
+    assert(value != null);
+    this._lengths = value;
+  }
+
+  ExtractMethodFeedback(
+      int offset,
+      int length,
+      String returnType,
+      List<String> names,
+      bool canCreateGetter,
+      List<RefactoringMethodParameter> parameters,
+      List<int> offsets,
+      List<int> lengths) {
+    this.offset = offset;
+    this.length = length;
+    this.returnType = returnType;
+    this.names = names;
+    this.canCreateGetter = canCreateGetter;
+    this.parameters = parameters;
+    this.offsets = offsets;
+    this.lengths = lengths;
+  }
+
+  factory ExtractMethodFeedback.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String name;
-      if (json.containsKey("name")) {
-        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "name");
-      }
-      int explicitFileCount;
-      if (json.containsKey("explicitFileCount")) {
-        explicitFileCount = jsonDecoder.decodeInt(
-            jsonPath + ".explicitFileCount", json["explicitFileCount"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "explicitFileCount");
-      }
-      int implicitFileCount;
-      if (json.containsKey("implicitFileCount")) {
-        implicitFileCount = jsonDecoder.decodeInt(
-            jsonPath + ".implicitFileCount", json["implicitFileCount"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "implicitFileCount");
-      }
-      int workItemQueueLength;
-      if (json.containsKey("workItemQueueLength")) {
-        workItemQueueLength = jsonDecoder.decodeInt(
-            jsonPath + ".workItemQueueLength", json["workItemQueueLength"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "workItemQueueLength");
-      }
-      List<String> cacheEntryExceptions;
-      if (json.containsKey("cacheEntryExceptions")) {
-        cacheEntryExceptions = jsonDecoder.decodeList(
-            jsonPath + ".cacheEntryExceptions",
-            json["cacheEntryExceptions"],
-            jsonDecoder.decodeString);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "cacheEntryExceptions");
-      }
-      return new ContextData(name, explicitFileCount, implicitFileCount,
-          workItemQueueLength, cacheEntryExceptions);
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offset");
+      }
+      int length;
+      if (json.containsKey("length")) {
+        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "length");
+      }
+      String returnType;
+      if (json.containsKey("returnType")) {
+        returnType = jsonDecoder.decodeString(
+            jsonPath + ".returnType", json["returnType"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "returnType");
+      }
+      List<String> names;
+      if (json.containsKey("names")) {
+        names = jsonDecoder.decodeList(
+            jsonPath + ".names", json["names"], jsonDecoder.decodeString);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "names");
+      }
+      bool canCreateGetter;
+      if (json.containsKey("canCreateGetter")) {
+        canCreateGetter = jsonDecoder.decodeBool(
+            jsonPath + ".canCreateGetter", json["canCreateGetter"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "canCreateGetter");
+      }
+      List<RefactoringMethodParameter> parameters;
+      if (json.containsKey("parameters")) {
+        parameters = jsonDecoder.decodeList(
+            jsonPath + ".parameters",
+            json["parameters"],
+            (String jsonPath, Object json) =>
+                new RefactoringMethodParameter.fromJson(
+                    jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "parameters");
+      }
+      List<int> offsets;
+      if (json.containsKey("offsets")) {
+        offsets = jsonDecoder.decodeList(
+            jsonPath + ".offsets", json["offsets"], jsonDecoder.decodeInt);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offsets");
+      }
+      List<int> lengths;
+      if (json.containsKey("lengths")) {
+        lengths = jsonDecoder.decodeList(
+            jsonPath + ".lengths", json["lengths"], jsonDecoder.decodeInt);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "lengths");
+      }
+      return new ExtractMethodFeedback(offset, length, returnType, names,
+          canCreateGetter, parameters, offsets, lengths);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "ContextData", json);
+      throw jsonDecoder.mismatch(jsonPath, "extractMethod feedback", json);
     }
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["name"] = name;
-    result["explicitFileCount"] = explicitFileCount;
-    result["implicitFileCount"] = implicitFileCount;
-    result["workItemQueueLength"] = workItemQueueLength;
-    result["cacheEntryExceptions"] = cacheEntryExceptions;
+    result["offset"] = offset;
+    result["length"] = length;
+    result["returnType"] = returnType;
+    result["names"] = names;
+    result["canCreateGetter"] = canCreateGetter;
+    result["parameters"] = parameters
+        .map((RefactoringMethodParameter value) => value.toJson())
+        .toList();
+    result["offsets"] = offsets;
+    result["lengths"] = lengths;
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ContextData) {
-      return name == other.name &&
-          explicitFileCount == other.explicitFileCount &&
-          implicitFileCount == other.implicitFileCount &&
-          workItemQueueLength == other.workItemQueueLength &&
-          listEqual(cacheEntryExceptions, other.cacheEntryExceptions,
-              (String a, String b) => a == b);
+    if (other is ExtractMethodFeedback) {
+      return offset == other.offset &&
+          length == other.length &&
+          returnType == other.returnType &&
+          listEqual(names, other.names, (String a, String b) => a == b) &&
+          canCreateGetter == other.canCreateGetter &&
+          listEqual(
+              parameters,
+              other.parameters,
+              (RefactoringMethodParameter a, RefactoringMethodParameter b) =>
+                  a == b) &&
+          listEqual(offsets, other.offsets, (int a, int b) => a == b) &&
+          listEqual(lengths, other.lengths, (int a, int b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, name.hashCode);
-    hash = JenkinsSmiHash.combine(hash, explicitFileCount.hashCode);
-    hash = JenkinsSmiHash.combine(hash, implicitFileCount.hashCode);
-    hash = JenkinsSmiHash.combine(hash, workItemQueueLength.hashCode);
-    hash = JenkinsSmiHash.combine(hash, cacheEntryExceptions.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, length.hashCode);
+    hash = JenkinsSmiHash.combine(hash, returnType.hashCode);
+    hash = JenkinsSmiHash.combine(hash, names.hashCode);
+    hash = JenkinsSmiHash.combine(hash, canCreateGetter.hashCode);
+    hash = JenkinsSmiHash.combine(hash, parameters.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offsets.hashCode);
+    hash = JenkinsSmiHash.combine(hash, lengths.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * Element
+ * extractMethod options
  *
  * {
- *   "kind": ElementKind
+ *   "returnType": String
+ *   "createGetter": bool
  *   "name": String
- *   "location": optional Location
- *   "flags": int
- *   "parameters": optional String
- *   "returnType": optional String
- *   "typeParameters": optional String
+ *   "parameters": List<RefactoringMethodParameter>
+ *   "extractAll": bool
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class Element implements HasToJson {
-  static const int FLAG_ABSTRACT = 0x01;
-  static const int FLAG_CONST = 0x02;
-  static const int FLAG_FINAL = 0x04;
-  static const int FLAG_STATIC = 0x08;
-  static const int FLAG_PRIVATE = 0x10;
-  static const int FLAG_DEPRECATED = 0x20;
-
-  static int makeFlags(
-      {isAbstract: false,
-      isConst: false,
-      isFinal: false,
-      isStatic: false,
-      isPrivate: false,
-      isDeprecated: false}) {
-    int flags = 0;
-    if (isAbstract) flags |= FLAG_ABSTRACT;
-    if (isConst) flags |= FLAG_CONST;
-    if (isFinal) flags |= FLAG_FINAL;
-    if (isStatic) flags |= FLAG_STATIC;
-    if (isPrivate) flags |= FLAG_PRIVATE;
-    if (isDeprecated) flags |= FLAG_DEPRECATED;
-    return flags;
-  }
-
-  ElementKind _kind;
+class ExtractMethodOptions extends RefactoringOptions {
+  String _returnType;
+
+  bool _createGetter;
 
   String _name;
 
-  Location _location;
-
-  int _flags;
-
-  String _parameters;
-
-  String _returnType;
-
-  String _typeParameters;
-
-  /**
-   * The kind of the element.
-   */
-  ElementKind get kind => _kind;
-
-  /**
-   * The kind of the element.
-   */
-  void set kind(ElementKind value) {
-    assert(value != null);
-    this._kind = value;
-  }
-
-  /**
-   * The name of the element. This is typically used as the label in the
-   * outline.
+  List<RefactoringMethodParameter> _parameters;
+
+  bool _extractAll;
+
+  /**
+   * The return type that should be defined for the method.
+   */
+  String get returnType => _returnType;
+
+  /**
+   * The return type that should be defined for the method.
+   */
+  void set returnType(String value) {
+    assert(value != null);
+    this._returnType = value;
+  }
+
+  /**
+   * True if a getter should be created rather than a method. It is an error if
+   * this field is true and the list of parameters is non-empty.
+   */
+  bool get createGetter => _createGetter;
+
+  /**
+   * True if a getter should be created rather than a method. It is an error if
+   * this field is true and the list of parameters is non-empty.
+   */
+  void set createGetter(bool value) {
+    assert(value != null);
+    this._createGetter = value;
+  }
+
+  /**
+   * The name that the method should be given.
    */
   String get name => _name;
 
   /**
-   * The name of the element. This is typically used as the label in the
-   * outline.
+   * The name that the method should be given.
    */
   void set name(String value) {
     assert(value != null);
     this._name = value;
   }
 
   /**
-   * The location of the name in the declaration of the element.
-   */
-  Location get location => _location;
-
-  /**
-   * The location of the name in the declaration of the element.
-   */
-  void set location(Location value) {
-    this._location = value;
-  }
-
-  /**
-   * A bit-map containing the following flags:
-   *
-   * - 0x01 - set if the element is explicitly or implicitly abstract
-   * - 0x02 - set if the element was declared to be ‘const’
-   * - 0x04 - set if the element was declared to be ‘final’
-   * - 0x08 - set if the element is a static member of a class or is a
-   *   top-level function or field
-   * - 0x10 - set if the element is private
-   * - 0x20 - set if the element is deprecated
-   */
-  int get flags => _flags;
-
-  /**
-   * A bit-map containing the following flags:
-   *
-   * - 0x01 - set if the element is explicitly or implicitly abstract
-   * - 0x02 - set if the element was declared to be ‘const’
-   * - 0x04 - set if the element was declared to be ‘final’
-   * - 0x08 - set if the element is a static member of a class or is a
-   *   top-level function or field
-   * - 0x10 - set if the element is private
-   * - 0x20 - set if the element is deprecated
-   */
-  void set flags(int value) {
-    assert(value != null);
-    this._flags = value;
-  }
-
-  /**
-   * The parameter list for the element. If the element is not a method or
-   * function this field will not be defined. If the element doesn't have
-   * parameters (e.g. getter), this field will not be defined. If the element
-   * has zero parameters, this field will have a value of "()".
-   */
-  String get parameters => _parameters;
-
-  /**
-   * The parameter list for the element. If the element is not a method or
-   * function this field will not be defined. If the element doesn't have
-   * parameters (e.g. getter), this field will not be defined. If the element
-   * has zero parameters, this field will have a value of "()".
-   */
-  void set parameters(String value) {
+   * The parameters that should be defined for the method.
+   *
+   * It is an error if a REQUIRED or NAMED parameter follows a POSITIONAL
+   * parameter. It is an error if a REQUIRED or POSITIONAL parameter follows a
+   * NAMED parameter.
+   *
+   * - To change the order and/or update proposed parameters, add parameters
+   *   with the same identifiers as proposed.
+   * - To add new parameters, omit their identifier.
+   * - To remove some parameters, omit them in this list.
+   */
+  List<RefactoringMethodParameter> get parameters => _parameters;
+
+  /**
+   * The parameters that should be defined for the method.
+   *
+   * It is an error if a REQUIRED or NAMED parameter follows a POSITIONAL
+   * parameter. It is an error if a REQUIRED or POSITIONAL parameter follows a
+   * NAMED parameter.
+   *
+   * - To change the order and/or update proposed parameters, add parameters
+   *   with the same identifiers as proposed.
+   * - To add new parameters, omit their identifier.
+   * - To remove some parameters, omit them in this list.
+   */
+  void set parameters(List<RefactoringMethodParameter> value) {
+    assert(value != null);
     this._parameters = value;
   }
 
   /**
-   * The return type of the element. If the element is not a method or function
-   * this field will not be defined. If the element does not have a declared
-   * return type, this field will contain an empty string.
-   */
-  String get returnType => _returnType;
-
-  /**
-   * The return type of the element. If the element is not a method or function
-   * this field will not be defined. If the element does not have a declared
-   * return type, this field will contain an empty string.
-   */
-  void set returnType(String value) {
-    this._returnType = value;
-  }
-
-  /**
-   * The type parameter list for the element. If the element doesn't have type
-   * parameters, this field will not be defined.
-   */
-  String get typeParameters => _typeParameters;
-
-  /**
-   * The type parameter list for the element. If the element doesn't have type
-   * parameters, this field will not be defined.
-   */
-  void set typeParameters(String value) {
-    this._typeParameters = value;
-  }
-
-  Element(ElementKind kind, String name, int flags,
-      {Location location,
-      String parameters,
-      String returnType,
-      String typeParameters}) {
-    this.kind = kind;
+   * True if all occurrences of the expression or statements should be replaced
+   * by an invocation of the method. The expression or statements used to
+   * initiate the refactoring will always be replaced.
+   */
+  bool get extractAll => _extractAll;
+
+  /**
+   * True if all occurrences of the expression or statements should be replaced
+   * by an invocation of the method. The expression or statements used to
+   * initiate the refactoring will always be replaced.
+   */
+  void set extractAll(bool value) {
+    assert(value != null);
+    this._extractAll = value;
+  }
+
+  ExtractMethodOptions(String returnType, bool createGetter, String name,
+      List<RefactoringMethodParameter> parameters, bool extractAll) {
+    this.returnType = returnType;
+    this.createGetter = createGetter;
     this.name = name;
-    this.location = location;
-    this.flags = flags;
     this.parameters = parameters;
-    this.returnType = returnType;
-    this.typeParameters = typeParameters;
-  }
-
-  factory Element.fromJson(
+    this.extractAll = extractAll;
+  }
+
+  factory ExtractMethodOptions.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      ElementKind kind;
-      if (json.containsKey("kind")) {
-        kind = new ElementKind.fromJson(
-            jsonDecoder, jsonPath + ".kind", json["kind"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "kind");
-      }
-      String name;
-      if (json.containsKey("name")) {
-        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "name");
-      }
-      Location location;
-      if (json.containsKey("location")) {
-        location = new Location.fromJson(
-            jsonDecoder, jsonPath + ".location", json["location"]);
-      }
-      int flags;
-      if (json.containsKey("flags")) {
-        flags = jsonDecoder.decodeInt(jsonPath + ".flags", json["flags"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "flags");
-      }
-      String parameters;
-      if (json.containsKey("parameters")) {
-        parameters = jsonDecoder.decodeString(
-            jsonPath + ".parameters", json["parameters"]);
-      }
       String returnType;
       if (json.containsKey("returnType")) {
         returnType = jsonDecoder.decodeString(
             jsonPath + ".returnType", json["returnType"]);
-      }
-      String typeParameters;
-      if (json.containsKey("typeParameters")) {
-        typeParameters = jsonDecoder.decodeString(
-            jsonPath + ".typeParameters", json["typeParameters"]);
-      }
-      return new Element(kind, name, flags,
-          location: location,
-          parameters: parameters,
-          returnType: returnType,
-          typeParameters: typeParameters);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "returnType");
+      }
+      bool createGetter;
+      if (json.containsKey("createGetter")) {
+        createGetter = jsonDecoder.decodeBool(
+            jsonPath + ".createGetter", json["createGetter"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "createGetter");
+      }
+      String name;
+      if (json.containsKey("name")) {
+        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "name");
+      }
+      List<RefactoringMethodParameter> parameters;
+      if (json.containsKey("parameters")) {
+        parameters = jsonDecoder.decodeList(
+            jsonPath + ".parameters",
+            json["parameters"],
+            (String jsonPath, Object json) =>
+                new RefactoringMethodParameter.fromJson(
+                    jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "parameters");
+      }
+      bool extractAll;
+      if (json.containsKey("extractAll")) {
+        extractAll = jsonDecoder.decodeBool(
+            jsonPath + ".extractAll", json["extractAll"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "extractAll");
+      }
+      return new ExtractMethodOptions(
+          returnType, createGetter, name, parameters, extractAll);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "Element", json);
+      throw jsonDecoder.mismatch(jsonPath, "extractMethod options", json);
     }
   }
 
-  bool get isAbstract => (flags & FLAG_ABSTRACT) != 0;
-  bool get isConst => (flags & FLAG_CONST) != 0;
-  bool get isFinal => (flags & FLAG_FINAL) != 0;
-  bool get isStatic => (flags & FLAG_STATIC) != 0;
-  bool get isPrivate => (flags & FLAG_PRIVATE) != 0;
-  bool get isDeprecated => (flags & FLAG_DEPRECATED) != 0;
-
+  factory ExtractMethodOptions.fromRefactoringParams(
+      EditGetRefactoringParams refactoringParams, Request request) {
+    return new ExtractMethodOptions.fromJson(
+        new RequestDecoder(request), "options", refactoringParams.options);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["kind"] = kind.toJson();
+    result["returnType"] = returnType;
+    result["createGetter"] = createGetter;
     result["name"] = name;
-    if (location != null) {
-      result["location"] = location.toJson();
-    }
-    result["flags"] = flags;
-    if (parameters != null) {
-      result["parameters"] = parameters;
-    }
-    if (returnType != null) {
-      result["returnType"] = returnType;
-    }
-    if (typeParameters != null) {
-      result["typeParameters"] = typeParameters;
-    }
+    result["parameters"] = parameters
+        .map((RefactoringMethodParameter value) => value.toJson())
+        .toList();
+    result["extractAll"] = extractAll;
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is Element) {
-      return kind == other.kind &&
+    if (other is ExtractMethodOptions) {
+      return returnType == other.returnType &&
+          createGetter == other.createGetter &&
           name == other.name &&
-          location == other.location &&
-          flags == other.flags &&
-          parameters == other.parameters &&
-          returnType == other.returnType &&
-          typeParameters == other.typeParameters;
+          listEqual(
+              parameters,
+              other.parameters,
+              (RefactoringMethodParameter a, RefactoringMethodParameter b) =>
+                  a == b) &&
+          extractAll == other.extractAll;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
+    hash = JenkinsSmiHash.combine(hash, returnType.hashCode);
+    hash = JenkinsSmiHash.combine(hash, createGetter.hashCode);
     hash = JenkinsSmiHash.combine(hash, name.hashCode);
-    hash = JenkinsSmiHash.combine(hash, location.hashCode);
-    hash = JenkinsSmiHash.combine(hash, flags.hashCode);
     hash = JenkinsSmiHash.combine(hash, parameters.hashCode);
-    hash = JenkinsSmiHash.combine(hash, returnType.hashCode);
-    hash = JenkinsSmiHash.combine(hash, typeParameters.hashCode);
+    hash = JenkinsSmiHash.combine(hash, extractAll.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * ElementKind
+ * FileKind
  *
  * enum {
- *   CLASS
- *   CLASS_TYPE_ALIAS
- *   COMPILATION_UNIT
- *   CONSTRUCTOR
- *   ENUM
- *   ENUM_CONSTANT
- *   FIELD
- *   FILE
- *   FUNCTION
- *   FUNCTION_TYPE_ALIAS
- *   GETTER
- *   LABEL
  *   LIBRARY
- *   LOCAL_VARIABLE
- *   METHOD
- *   PARAMETER
- *   PREFIX
- *   SETTER
- *   TOP_LEVEL_VARIABLE
- *   TYPE_PARAMETER
- *   UNIT_TEST_GROUP
- *   UNIT_TEST_TEST
- *   UNKNOWN
+ *   PART
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ElementKind implements Enum {
-  static const ElementKind CLASS = const ElementKind._("CLASS");
-
-  static const ElementKind CLASS_TYPE_ALIAS =
-      const ElementKind._("CLASS_TYPE_ALIAS");
-
-  static const ElementKind COMPILATION_UNIT =
-      const ElementKind._("COMPILATION_UNIT");
-
-  static const ElementKind CONSTRUCTOR = const ElementKind._("CONSTRUCTOR");
-
-  static const ElementKind ENUM = const ElementKind._("ENUM");
-
-  static const ElementKind ENUM_CONSTANT = const ElementKind._("ENUM_CONSTANT");
-
-  static const ElementKind FIELD = const ElementKind._("FIELD");
-
-  static const ElementKind FILE = const ElementKind._("FILE");
-
-  static const ElementKind FUNCTION = const ElementKind._("FUNCTION");
-
-  static const ElementKind FUNCTION_TYPE_ALIAS =
-      const ElementKind._("FUNCTION_TYPE_ALIAS");
-
-  static const ElementKind GETTER = const ElementKind._("GETTER");
-
-  static const ElementKind LABEL = const ElementKind._("LABEL");
-
-  static const ElementKind LIBRARY = const ElementKind._("LIBRARY");
-
-  static const ElementKind LOCAL_VARIABLE =
-      const ElementKind._("LOCAL_VARIABLE");
-
-  static const ElementKind METHOD = const ElementKind._("METHOD");
-
-  static const ElementKind PARAMETER = const ElementKind._("PARAMETER");
-
-  static const ElementKind PREFIX = const ElementKind._("PREFIX");
-
-  static const ElementKind SETTER = const ElementKind._("SETTER");
-
-  static const ElementKind TOP_LEVEL_VARIABLE =
-      const ElementKind._("TOP_LEVEL_VARIABLE");
-
-  static const ElementKind TYPE_PARAMETER =
-      const ElementKind._("TYPE_PARAMETER");
-
-  /**
-   * Deprecated: support for tests was removed.
-   */
-  static const ElementKind UNIT_TEST_GROUP =
-      const ElementKind._("UNIT_TEST_GROUP");
-
-  /**
-   * Deprecated: support for tests was removed.
-   */
-  static const ElementKind UNIT_TEST_TEST =
-      const ElementKind._("UNIT_TEST_TEST");
-
-  static const ElementKind UNKNOWN = const ElementKind._("UNKNOWN");
+class FileKind implements Enum {
+  static const FileKind LIBRARY = const FileKind._("LIBRARY");
+
+  static const FileKind PART = const FileKind._("PART");
 
   /**
    * A list containing all of the enum values that are defined.
    */
-  static const List<ElementKind> VALUES = const <ElementKind>[
-    CLASS,
-    CLASS_TYPE_ALIAS,
-    COMPILATION_UNIT,
-    CONSTRUCTOR,
-    ENUM,
-    ENUM_CONSTANT,
-    FIELD,
-    FILE,
-    FUNCTION,
-    FUNCTION_TYPE_ALIAS,
-    GETTER,
-    LABEL,
-    LIBRARY,
-    LOCAL_VARIABLE,
-    METHOD,
-    PARAMETER,
-    PREFIX,
-    SETTER,
-    TOP_LEVEL_VARIABLE,
-    TYPE_PARAMETER,
-    UNIT_TEST_GROUP,
-    UNIT_TEST_TEST,
-    UNKNOWN
-  ];
-
+  static const List<FileKind> VALUES = const <FileKind>[LIBRARY, PART];
+
+  @override
   final String name;
 
-  const ElementKind._(this.name);
-
-  factory ElementKind(String name) {
+  const FileKind._(this.name);
+
+  factory FileKind(String name) {
     switch (name) {
-      case "CLASS":
-        return CLASS;
-      case "CLASS_TYPE_ALIAS":
-        return CLASS_TYPE_ALIAS;
-      case "COMPILATION_UNIT":
-        return COMPILATION_UNIT;
-      case "CONSTRUCTOR":
-        return CONSTRUCTOR;
-      case "ENUM":
-        return ENUM;
-      case "ENUM_CONSTANT":
-        return ENUM_CONSTANT;
-      case "FIELD":
-        return FIELD;
-      case "FILE":
-        return FILE;
-      case "FUNCTION":
-        return FUNCTION;
-      case "FUNCTION_TYPE_ALIAS":
-        return FUNCTION_TYPE_ALIAS;
-      case "GETTER":
-        return GETTER;
-      case "LABEL":
-        return LABEL;
       case "LIBRARY":
         return LIBRARY;
-      case "LOCAL_VARIABLE":
-        return LOCAL_VARIABLE;
-      case "METHOD":
-        return METHOD;
-      case "PARAMETER":
-        return PARAMETER;
-      case "PREFIX":
-        return PREFIX;
-      case "SETTER":
-        return SETTER;
-      case "TOP_LEVEL_VARIABLE":
-        return TOP_LEVEL_VARIABLE;
-      case "TYPE_PARAMETER":
-        return TYPE_PARAMETER;
-      case "UNIT_TEST_GROUP":
-        return UNIT_TEST_GROUP;
-      case "UNIT_TEST_TEST":
-        return UNIT_TEST_TEST;
-      case "UNKNOWN":
-        return UNKNOWN;
+      case "PART":
+        return PART;
     }
     throw new Exception('Illegal enum value: $name');
   }
 
-  factory ElementKind.fromJson(
+  factory FileKind.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json is String) {
       try {
-        return new ElementKind(json);
+        return new FileKind(json);
       } catch (_) {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "ElementKind", json);
-  }
-
-  @override
-  String toString() => "ElementKind.$name";
+    throw jsonDecoder.mismatch(jsonPath, "FileKind", json);
+  }
+
+  @override
+  String toString() => "FileKind.$name";
 
   String toJson() => name;
 }
 
 /**
- * ExecutableFile
- *
- * {
- *   "file": FilePath
- *   "kind": ExecutableKind
+ * FoldingKind
+ *
+ * enum {
+ *   COMMENT
+ *   CLASS_MEMBER
+ *   DIRECTIVES
+ *   DOCUMENTATION_COMMENT
+ *   TOP_LEVEL_DECLARATION
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ExecutableFile implements HasToJson {
-  String _file;
-
-  ExecutableKind _kind;
-
-  /**
-   * The path of the executable file.
-   */
-  String get file => _file;
-
-  /**
-   * The path of the executable file.
-   */
-  void set file(String value) {
-    assert(value != null);
-    this._file = value;
-  }
-
-  /**
-   * The kind of the executable file.
-   */
-  ExecutableKind get kind => _kind;
-
-  /**
-   * The kind of the executable file.
-   */
-  void set kind(ExecutableKind value) {
+class FoldingKind implements Enum {
+  static const FoldingKind COMMENT = const FoldingKind._("COMMENT");
+
+  static const FoldingKind CLASS_MEMBER = const FoldingKind._("CLASS_MEMBER");
+
+  static const FoldingKind DIRECTIVES = const FoldingKind._("DIRECTIVES");
+
+  static const FoldingKind DOCUMENTATION_COMMENT =
+      const FoldingKind._("DOCUMENTATION_COMMENT");
+
+  static const FoldingKind TOP_LEVEL_DECLARATION =
+      const FoldingKind._("TOP_LEVEL_DECLARATION");
+
+  /**
+   * A list containing all of the enum values that are defined.
+   */
+  static const List<FoldingKind> VALUES = const <FoldingKind>[
+    COMMENT,
+    CLASS_MEMBER,
+    DIRECTIVES,
+    DOCUMENTATION_COMMENT,
+    TOP_LEVEL_DECLARATION
+  ];
+
+  @override
+  final String name;
+
+  const FoldingKind._(this.name);
+
+  factory FoldingKind(String name) {
+    switch (name) {
+      case "COMMENT":
+        return COMMENT;
+      case "CLASS_MEMBER":
+        return CLASS_MEMBER;
+      case "DIRECTIVES":
+        return DIRECTIVES;
+      case "DOCUMENTATION_COMMENT":
+        return DOCUMENTATION_COMMENT;
+      case "TOP_LEVEL_DECLARATION":
+        return TOP_LEVEL_DECLARATION;
+    }
+    throw new Exception('Illegal enum value: $name');
+  }
+
+  factory FoldingKind.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json is String) {
+      try {
+        return new FoldingKind(json);
+      } catch (_) {
+        // Fall through
+      }
+    }
+    throw jsonDecoder.mismatch(jsonPath, "FoldingKind", json);
+  }
+
+  @override
+  String toString() => "FoldingKind.$name";
+
+  String toJson() => name;
+}
+
+/**
+ * FoldingRegion
+ *
+ * {
+ *   "kind": FoldingKind
+ *   "offset": int
+ *   "length": int
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class FoldingRegion implements HasToJson {
+  FoldingKind _kind;
+
+  int _offset;
+
+  int _length;
+
+  /**
+   * The kind of the region.
+   */
+  FoldingKind get kind => _kind;
+
+  /**
+   * The kind of the region.
+   */
+  void set kind(FoldingKind value) {
     assert(value != null);
     this._kind = value;
   }
 
-  ExecutableFile(String file, ExecutableKind kind) {
-    this.file = file;
+  /**
+   * The offset of the region to be folded.
+   */
+  int get offset => _offset;
+
+  /**
+   * The offset of the region to be folded.
+   */
+  void set offset(int value) {
+    assert(value != null);
+    this._offset = value;
+  }
+
+  /**
+   * The length of the region to be folded.
+   */
+  int get length => _length;
+
+  /**
+   * The length of the region to be folded.
+   */
+  void set length(int value) {
+    assert(value != null);
+    this._length = value;
+  }
+
+  FoldingRegion(FoldingKind kind, int offset, int length) {
     this.kind = kind;
-  }
-
-  factory ExecutableFile.fromJson(
+    this.offset = offset;
+    this.length = length;
+  }
+
+  factory FoldingRegion.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
-      }
-      ExecutableKind kind;
+      FoldingKind kind;
       if (json.containsKey("kind")) {
-        kind = new ExecutableKind.fromJson(
+        kind = new FoldingKind.fromJson(
             jsonDecoder, jsonPath + ".kind", json["kind"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "kind");
-      }
-      return new ExecutableFile(file, kind);
+        throw jsonDecoder.mismatch(jsonPath, "kind");
+      }
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offset");
+      }
+      int length;
+      if (json.containsKey("length")) {
+        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "length");
+      }
+      return new FoldingRegion(kind, offset, length);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "ExecutableFile", json);
-    }
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "FoldingRegion", json);
+    }
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["file"] = file;
     result["kind"] = kind.toJson();
+    result["offset"] = offset;
+    result["length"] = length;
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ExecutableFile) {
-      return file == other.file && kind == other.kind;
+    if (other is FoldingRegion) {
+      return kind == other.kind &&
+          offset == other.offset &&
+          length == other.length;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
     hash = JenkinsSmiHash.combine(hash, kind.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, length.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * ExecutableKind
+ * GeneralAnalysisService
  *
  * enum {
- *   CLIENT
- *   EITHER
- *   NOT_EXECUTABLE
- *   SERVER
+ *   ANALYZED_FILES
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ExecutableKind implements Enum {
-  static const ExecutableKind CLIENT = const ExecutableKind._("CLIENT");
-
-  static const ExecutableKind EITHER = const ExecutableKind._("EITHER");
-
-  static const ExecutableKind NOT_EXECUTABLE =
-      const ExecutableKind._("NOT_EXECUTABLE");
-
-  static const ExecutableKind SERVER = const ExecutableKind._("SERVER");
+class GeneralAnalysisService implements Enum {
+  static const GeneralAnalysisService ANALYZED_FILES =
+      const GeneralAnalysisService._("ANALYZED_FILES");
 
   /**
    * A list containing all of the enum values that are defined.
    */
-  static const List<ExecutableKind> VALUES = const <ExecutableKind>[
-    CLIENT,
-    EITHER,
-    NOT_EXECUTABLE,
-    SERVER
-  ];
+  static const List<GeneralAnalysisService> VALUES =
+      const <GeneralAnalysisService>[ANALYZED_FILES];
 
+  @override
   final String name;
 
-  const ExecutableKind._(this.name);
+  const GeneralAnalysisService._(this.name);
 
-  factory ExecutableKind(String name) {
+  factory GeneralAnalysisService(String name) {
     switch (name) {
-      case "CLIENT":
-        return CLIENT;
-      case "EITHER":
-        return EITHER;
-      case "NOT_EXECUTABLE":
-        return NOT_EXECUTABLE;
-      case "SERVER":
-        return SERVER;
+      case "ANALYZED_FILES":
+        return ANALYZED_FILES;
     }
     throw new Exception('Illegal enum value: $name');
   }
 
-  factory ExecutableKind.fromJson(
+  factory GeneralAnalysisService.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json is String) {
       try {
-        return new ExecutableKind(json);
+        return new GeneralAnalysisService(json);
       } catch (_) {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "ExecutableKind", json);
+    throw jsonDecoder.mismatch(jsonPath, "GeneralAnalysisService", json);
   }
 
   @override
-  String toString() => "ExecutableKind.$name";
+  String toString() => "GeneralAnalysisService.$name";
 
   String toJson() => name;
 }
 
 /**
- * ExecutionService
- *
- * enum {
- *   LAUNCH_DATA
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ExecutionService implements Enum {
-  static const ExecutionService LAUNCH_DATA =
-      const ExecutionService._("LAUNCH_DATA");
-
-  /**
-   * A list containing all of the enum values that are defined.
-   */
-  static const List<ExecutionService> VALUES = const <ExecutionService>[
-    LAUNCH_DATA
-  ];
-
-  final String name;
-
-  const ExecutionService._(this.name);
-
-  factory ExecutionService(String name) {
-    switch (name) {
-      case "LAUNCH_DATA":
-        return LAUNCH_DATA;
-    }
-    throw new Exception('Illegal enum value: $name');
-  }
-
-  factory ExecutionService.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json is String) {
-      try {
-        return new ExecutionService(json);
-      } catch (_) {
-        // Fall through
-      }
-    }
-    throw jsonDecoder.mismatch(jsonPath, "ExecutionService", json);
-  }
-
-  @override
-  String toString() => "ExecutionService.$name";
-
-  String toJson() => name;
-}
-
-/**
- * FileKind
- *
- * enum {
- *   LIBRARY
- *   PART
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class FileKind implements Enum {
-  static const FileKind LIBRARY = const FileKind._("LIBRARY");
-
-  static const FileKind PART = const FileKind._("PART");
-
-  /**
-   * A list containing all of the enum values that are defined.
-   */
-  static const List<FileKind> VALUES = const <FileKind>[LIBRARY, PART];
-
-  final String name;
-
-  const FileKind._(this.name);
-
-  factory FileKind(String name) {
-    switch (name) {
-      case "LIBRARY":
-        return LIBRARY;
-      case "PART":
-        return PART;
-    }
-    throw new Exception('Illegal enum value: $name');
-  }
-
-  factory FileKind.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json is String) {
-      try {
-        return new FileKind(json);
-      } catch (_) {
-        // Fall through
-      }
-    }
-    throw jsonDecoder.mismatch(jsonPath, "FileKind", json);
-  }
-
-  @override
-  String toString() => "FileKind.$name";
-
-  String toJson() => name;
-}
-
-/**
- * FoldingKind
- *
- * enum {
- *   COMMENT
- *   CLASS_MEMBER
- *   DIRECTIVES
- *   DOCUMENTATION_COMMENT
- *   TOP_LEVEL_DECLARATION
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class FoldingKind implements Enum {
-  static const FoldingKind COMMENT = const FoldingKind._("COMMENT");
-
-  static const FoldingKind CLASS_MEMBER = const FoldingKind._("CLASS_MEMBER");
-
-  static const FoldingKind DIRECTIVES = const FoldingKind._("DIRECTIVES");
-
-  static const FoldingKind DOCUMENTATION_COMMENT =
-      const FoldingKind._("DOCUMENTATION_COMMENT");
-
-  static const FoldingKind TOP_LEVEL_DECLARATION =
-      const FoldingKind._("TOP_LEVEL_DECLARATION");
-
-  /**
-   * A list containing all of the enum values that are defined.
-   */
-  static const List<FoldingKind> VALUES = const <FoldingKind>[
-    COMMENT,
-    CLASS_MEMBER,
-    DIRECTIVES,
-    DOCUMENTATION_COMMENT,
-    TOP_LEVEL_DECLARATION
-  ];
-
-  final String name;
-
-  const FoldingKind._(this.name);
-
-  factory FoldingKind(String name) {
-    switch (name) {
-      case "COMMENT":
-        return COMMENT;
-      case "CLASS_MEMBER":
-        return CLASS_MEMBER;
-      case "DIRECTIVES":
-        return DIRECTIVES;
-      case "DOCUMENTATION_COMMENT":
-        return DOCUMENTATION_COMMENT;
-      case "TOP_LEVEL_DECLARATION":
-        return TOP_LEVEL_DECLARATION;
-    }
-    throw new Exception('Illegal enum value: $name');
-  }
-
-  factory FoldingKind.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json is String) {
-      try {
-        return new FoldingKind(json);
-      } catch (_) {
-        // Fall through
-      }
-    }
-    throw jsonDecoder.mismatch(jsonPath, "FoldingKind", json);
-  }
-
-  @override
-  String toString() => "FoldingKind.$name";
-
-  String toJson() => name;
-}
-
-/**
- * FoldingRegion
+ * HighlightRegion
  *
  * {
- *   "kind": FoldingKind
+ *   "type": HighlightRegionType
  *   "offset": int
  *   "length": int
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class FoldingRegion implements HasToJson {
-  FoldingKind _kind;
+class HighlightRegion implements HasToJson {
+  HighlightRegionType _type;
 
   int _offset;
 
   int _length;
 
   /**
-   * The kind of the region.
+   * The type of highlight associated with the region.
    */
-  FoldingKind get kind => _kind;
+  HighlightRegionType get type => _type;
 
   /**
-   * The kind of the region.
+   * The type of highlight associated with the region.
    */
-  void set kind(FoldingKind value) {
+  void set type(HighlightRegionType value) {
     assert(value != null);
-    this._kind = value;
+    this._type = value;
   }
 
   /**
-   * The offset of the region to be folded.
+   * The offset of the region to be highlighted.
    */
   int get offset => _offset;
 
   /**
-   * The offset of the region to be folded.
+   * The offset of the region to be highlighted.
    */
   void set offset(int value) {
     assert(value != null);
     this._offset = value;
   }
 
   /**
-   * The length of the region to be folded.
+   * The length of the region to be highlighted.
    */
   int get length => _length;
 
   /**
-   * The length of the region to be folded.
+   * The length of the region to be highlighted.
    */
   void set length(int value) {
     assert(value != null);
     this._length = value;
   }
 
-  FoldingRegion(FoldingKind kind, int offset, int length) {
-    this.kind = kind;
+  HighlightRegion(HighlightRegionType type, int offset, int length) {
+    this.type = type;
     this.offset = offset;
     this.length = length;
   }
 
-  factory FoldingRegion.fromJson(
+  factory HighlightRegion.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      FoldingKind kind;
-      if (json.containsKey("kind")) {
-        kind = new FoldingKind.fromJson(
-            jsonDecoder, jsonPath + ".kind", json["kind"]);
+      HighlightRegionType type;
+      if (json.containsKey("type")) {
+        type = new HighlightRegionType.fromJson(
+            jsonDecoder, jsonPath + ".type", json["type"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "kind");
+        throw jsonDecoder.mismatch(jsonPath, "type");
       }
       int offset;
       if (json.containsKey("offset")) {
         offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
+        throw jsonDecoder.mismatch(jsonPath, "offset");
       }
       int length;
       if (json.containsKey("length")) {
         length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
+        throw jsonDecoder.mismatch(jsonPath, "length");
       }
-      return new FoldingRegion(kind, offset, length);
+      return new HighlightRegion(type, offset, length);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "FoldingRegion", json);
+      throw jsonDecoder.mismatch(jsonPath, "HighlightRegion", json);
     }
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["kind"] = kind.toJson();
+    result["type"] = type.toJson();
     result["offset"] = offset;
     result["length"] = length;
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is FoldingRegion) {
-      return kind == other.kind &&
+    if (other is HighlightRegion) {
+      return type == other.type &&
           offset == other.offset &&
           length == other.length;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
+    hash = JenkinsSmiHash.combine(hash, type.hashCode);
     hash = JenkinsSmiHash.combine(hash, offset.hashCode);
     hash = JenkinsSmiHash.combine(hash, length.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * GeneralAnalysisService
- *
- * enum {
- *   ANALYZED_FILES
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class GeneralAnalysisService implements Enum {
-  static const GeneralAnalysisService ANALYZED_FILES =
-      const GeneralAnalysisService._("ANALYZED_FILES");
-
-  /**
-   * A list containing all of the enum values that are defined.
-   */
-  static const List<GeneralAnalysisService> VALUES =
-      const <GeneralAnalysisService>[ANALYZED_FILES];
-
-  final String name;
-
-  const GeneralAnalysisService._(this.name);
-
-  factory GeneralAnalysisService(String name) {
-    switch (name) {
-      case "ANALYZED_FILES":
-        return ANALYZED_FILES;
-    }
-    throw new Exception('Illegal enum value: $name');
-  }
-
-  factory GeneralAnalysisService.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json is String) {
-      try {
-        return new GeneralAnalysisService(json);
-      } catch (_) {
-        // Fall through
-      }
-    }
-    throw jsonDecoder.mismatch(jsonPath, "GeneralAnalysisService", json);
-  }
-
-  @override
-  String toString() => "GeneralAnalysisService.$name";
-
-  String toJson() => name;
-}
-
-/**
- * HighlightRegion
- *
- * {
- *   "type": HighlightRegionType
- *   "offset": int
- *   "length": int
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class HighlightRegion implements HasToJson {
-  HighlightRegionType _type;
-
-  int _offset;
-
-  int _length;
-
-  /**
-   * The type of highlight associated with the region.
-   */
-  HighlightRegionType get type => _type;
-
-  /**
-   * The type of highlight associated with the region.
-   */
-  void set type(HighlightRegionType value) {
-    assert(value != null);
-    this._type = value;
-  }
-
-  /**
-   * The offset of the region to be highlighted.
-   */
-  int get offset => _offset;
-
-  /**
-   * The offset of the region to be highlighted.
-   */
-  void set offset(int value) {
-    assert(value != null);
-    this._offset = value;
-  }
-
-  /**
-   * The length of the region to be highlighted.
-   */
-  int get length => _length;
-
-  /**
-   * The length of the region to be highlighted.
-   */
-  void set length(int value) {
-    assert(value != null);
-    this._length = value;
-  }
-
-  HighlightRegion(HighlightRegionType type, int offset, int length) {
-    this.type = type;
-    this.offset = offset;
-    this.length = length;
-  }
-
-  factory HighlightRegion.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      HighlightRegionType type;
-      if (json.containsKey("type")) {
-        type = new HighlightRegionType.fromJson(
-            jsonDecoder, jsonPath + ".type", json["type"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "type");
-      }
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
-      }
-      int length;
-      if (json.containsKey("length")) {
-        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
-      }
-      return new HighlightRegion(type, offset, length);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "HighlightRegion", json);
-    }
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["type"] = type.toJson();
-    result["offset"] = offset;
-    result["length"] = length;
-    return result;
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is HighlightRegion) {
-      return type == other.type &&
-          offset == other.offset &&
-          length == other.length;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, type.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
  * HighlightRegionType
  *
  * enum {
  *   ANNOTATION
  *   BUILT_IN
  *   CLASS
  *   COMMENT_BLOCK
  *   COMMENT_DOCUMENTATION
  *   COMMENT_END_OF_LINE
  *   CONSTRUCTOR
@@ skipping 502 matching lines @@
     TOP_LEVEL_GETTER_REFERENCE,
     TOP_LEVEL_SETTER_DECLARATION,
     TOP_LEVEL_SETTER_REFERENCE,
     TOP_LEVEL_VARIABLE_DECLARATION,
     TYPE_NAME_DYNAMIC,
     TYPE_PARAMETER,
     UNRESOLVED_INSTANCE_MEMBER_REFERENCE,
     VALID_STRING_ESCAPE
   ];
 
+  @override
   final String name;
 
   const HighlightRegionType._(this.name);
 
   factory HighlightRegionType(String name) {
     switch (name) {
       case "ANNOTATION":
         return ANNOTATION;
       case "BUILT_IN":
         return BUILT_IN;
@@ skipping 418 matching lines @@
   factory HoverInformation.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       int offset;
       if (json.containsKey("offset")) {
         offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
+        throw jsonDecoder.mismatch(jsonPath, "offset");
       }
       int length;
       if (json.containsKey("length")) {
         length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
+        throw jsonDecoder.mismatch(jsonPath, "length");
       }
       String containingLibraryPath;
       if (json.containsKey("containingLibraryPath")) {
         containingLibraryPath = jsonDecoder.decodeString(
             jsonPath + ".containingLibraryPath", json["containingLibraryPath"]);
       }
       String containingLibraryName;
       if (json.containsKey("containingLibraryName")) {
         containingLibraryName = jsonDecoder.decodeString(
             jsonPath + ".containingLibraryName", json["containingLibraryName"]);
@@ skipping 48 matching lines @@
           elementKind: elementKind,
           isDeprecated: isDeprecated,
           parameter: parameter,
           propagatedType: propagatedType,
           staticType: staticType);
     } else {
       throw jsonDecoder.mismatch(jsonPath, "HoverInformation", json);
     }
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["offset"] = offset;
     result["length"] = length;
     if (containingLibraryPath != null) {
       result["containingLibraryPath"] = containingLibraryPath;
     }
     if (containingLibraryName != null) {
       result["containingLibraryName"] = containingLibraryName;
     }
@@ skipping 17 matching lines @@
     }
     if (propagatedType != null) {
       result["propagatedType"] = propagatedType;
     }
     if (staticType != null) {
       result["staticType"] = staticType;
     }
     return result;
   }
 
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is HoverInformation) {
+      return offset == other.offset &&
+          length == other.length &&
+          containingLibraryPath == other.containingLibraryPath &&
+          containingLibraryName == other.containingLibraryName &&
+          containingClassDescription == other.containingClassDescription &&
+          dartdoc == other.dartdoc &&
+          elementDescription == other.elementDescription &&
+          elementKind == other.elementKind &&
+          isDeprecated == other.isDeprecated &&
+          parameter == other.parameter &&
+          propagatedType == other.propagatedType &&
+          staticType == other.staticType;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, length.hashCode);
+    hash = JenkinsSmiHash.combine(hash, containingLibraryPath.hashCode);
+    hash = JenkinsSmiHash.combine(hash, containingLibraryName.hashCode);
+    hash = JenkinsSmiHash.combine(hash, containingClassDescription.hashCode);
+    hash = JenkinsSmiHash.combine(hash, dartdoc.hashCode);
+    hash = JenkinsSmiHash.combine(hash, elementDescription.hashCode);
+    hash = JenkinsSmiHash.combine(hash, elementKind.hashCode);
+    hash = JenkinsSmiHash.combine(hash, isDeprecated.hashCode);
+    hash = JenkinsSmiHash.combine(hash, parameter.hashCode);
+    hash = JenkinsSmiHash.combine(hash, propagatedType.hashCode);
+    hash = JenkinsSmiHash.combine(hash, staticType.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * ImplementedClass
+ *
+ * {
+ *   "offset": int
+ *   "length": int
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ImplementedClass implements HasToJson {
+  int _offset;
+
+  int _length;
+
+  /**
+   * The offset of the name of the implemented class.
+   */
+  int get offset => _offset;
+
+  /**
+   * The offset of the name of the implemented class.
+   */
+  void set offset(int value) {
+    assert(value != null);
+    this._offset = value;
+  }
+
+  /**
+   * The length of the name of the implemented class.
+   */
+  int get length => _length;
+
+  /**
+   * The length of the name of the implemented class.
+   */
+  void set length(int value) {
+    assert(value != null);
+    this._length = value;
+  }
+
+  ImplementedClass(int offset, int length) {
+    this.offset = offset;
+    this.length = length;
+  }
+
+  factory ImplementedClass.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offset");
+      }
+      int length;
+      if (json.containsKey("length")) {
+        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "length");
+      }
+      return new ImplementedClass(offset, length);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "ImplementedClass", json);
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["offset"] = offset;
+    result["length"] = length;
+    return result;
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is ImplementedClass) {
+      return offset == other.offset && length == other.length;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, length.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * ImplementedMember
+ *
+ * {
+ *   "offset": int
+ *   "length": int
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ImplementedMember implements HasToJson {
+  int _offset;
+
+  int _length;
+
+  /**
+   * The offset of the name of the implemented member.
+   */
+  int get offset => _offset;
+
+  /**
+   * The offset of the name of the implemented member.
+   */
+  void set offset(int value) {
+    assert(value != null);
+    this._offset = value;
+  }
+
+  /**
+   * The length of the name of the implemented member.
+   */
+  int get length => _length;
+
+  /**
+   * The length of the name of the implemented member.
+   */
+  void set length(int value) {
+    assert(value != null);
+    this._length = value;
+  }
+
+  ImplementedMember(int offset, int length) {
+    this.offset = offset;
+    this.length = length;
+  }
+
+  factory ImplementedMember.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offset");
+      }
+      int length;
+      if (json.containsKey("length")) {
+        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "length");
+      }
+      return new ImplementedMember(offset, length);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "ImplementedMember", json);
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["offset"] = offset;
+    result["length"] = length;
+    return result;
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is ImplementedMember) {
+      return offset == other.offset && length == other.length;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, length.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * inlineLocalVariable feedback
+ *
+ * {
+ *   "name": String
+ *   "occurrences": int
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class InlineLocalVariableFeedback extends RefactoringFeedback {
+  String _name;
+
+  int _occurrences;
+
+  /**
+   * The name of the variable being inlined.
+   */
+  String get name => _name;
+
+  /**
+   * The name of the variable being inlined.
+   */
+  void set name(String value) {
+    assert(value != null);
+    this._name = value;
+  }
+
+  /**
+   * The number of times the variable occurs.
+   */
+  int get occurrences => _occurrences;
+
+  /**
+   * The number of times the variable occurs.
+   */
+  void set occurrences(int value) {
+    assert(value != null);
+    this._occurrences = value;
+  }
+
+  InlineLocalVariableFeedback(String name, int occurrences) {
+    this.name = name;
+    this.occurrences = occurrences;
+  }
+
+  factory InlineLocalVariableFeedback.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String name;
+      if (json.containsKey("name")) {
+        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "name");
+      }
+      int occurrences;
+      if (json.containsKey("occurrences")) {
+        occurrences = jsonDecoder.decodeInt(
+            jsonPath + ".occurrences", json["occurrences"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "occurrences");
+      }
+      return new InlineLocalVariableFeedback(name, occurrences);
+    } else {
+      throw jsonDecoder.mismatch(
+          jsonPath, "inlineLocalVariable feedback", json);
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["name"] = name;
+    result["occurrences"] = occurrences;
+    return result;
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is InlineLocalVariableFeedback) {
+      return name == other.name && occurrences == other.occurrences;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, name.hashCode);
+    hash = JenkinsSmiHash.combine(hash, occurrences.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * inlineLocalVariable options
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class InlineLocalVariableOptions extends RefactoringOptions
+    implements HasToJson {
+  @override
+  bool operator ==(other) {
+    if (other is InlineLocalVariableOptions) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 540364977;
+  }
+}
+
+/**
+ * inlineMethod feedback
+ *
+ * {
+ *   "className": optional String
+ *   "methodName": String
+ *   "isDeclaration": bool
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class InlineMethodFeedback extends RefactoringFeedback {
+  String _className;
+
+  String _methodName;
+
+  bool _isDeclaration;
+
+  /**
+   * The name of the class enclosing the method being inlined. If not a class
+   * member is being inlined, this field will be absent.
+   */
+  String get className => _className;
+
+  /**
+   * The name of the class enclosing the method being inlined. If not a class
+   * member is being inlined, this field will be absent.
+   */
+  void set className(String value) {
+    this._className = value;
+  }
+
+  /**
+   * The name of the method (or function) being inlined.
+   */
+  String get methodName => _methodName;
+
+  /**
+   * The name of the method (or function) being inlined.
+   */
+  void set methodName(String value) {
+    assert(value != null);
+    this._methodName = value;
+  }
+
+  /**
+   * True if the declaration of the method is selected. So all references
+   * should be inlined.
+   */
+  bool get isDeclaration => _isDeclaration;
+
+  /**
+   * True if the declaration of the method is selected. So all references
+   * should be inlined.
+   */
+  void set isDeclaration(bool value) {
+    assert(value != null);
+    this._isDeclaration = value;
+  }
+
+  InlineMethodFeedback(String methodName, bool isDeclaration,
+      {String className}) {
+    this.className = className;
+    this.methodName = methodName;
+    this.isDeclaration = isDeclaration;
+  }
+
+  factory InlineMethodFeedback.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String className;
+      if (json.containsKey("className")) {
+        className = jsonDecoder.decodeString(
+            jsonPath + ".className", json["className"]);
+      }
+      String methodName;
+      if (json.containsKey("methodName")) {
+        methodName = jsonDecoder.decodeString(
+            jsonPath + ".methodName", json["methodName"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "methodName");
+      }
+      bool isDeclaration;
+      if (json.containsKey("isDeclaration")) {
+        isDeclaration = jsonDecoder.decodeBool(
+            jsonPath + ".isDeclaration", json["isDeclaration"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "isDeclaration");
+      }
+      return new InlineMethodFeedback(methodName, isDeclaration,
+          className: className);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "inlineMethod feedback", json);
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    if (className != null) {
+      result["className"] = className;
+    }
+    result["methodName"] = methodName;
+    result["isDeclaration"] = isDeclaration;
+    return result;
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is InlineMethodFeedback) {
+      return className == other.className &&
+          methodName == other.methodName &&
+          isDeclaration == other.isDeclaration;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, className.hashCode);
+    hash = JenkinsSmiHash.combine(hash, methodName.hashCode);
+    hash = JenkinsSmiHash.combine(hash, isDeclaration.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * inlineMethod options
+ *
+ * {
+ *   "deleteSource": bool
+ *   "inlineAll": bool
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class InlineMethodOptions extends RefactoringOptions {
+  bool _deleteSource;
+
+  bool _inlineAll;
+
+  /**
+   * True if the method being inlined should be removed. It is an error if this
+   * field is true and inlineAll is false.
+   */
+  bool get deleteSource => _deleteSource;
+
+  /**
+   * True if the method being inlined should be removed. It is an error if this
+   * field is true and inlineAll is false.
+   */
+  void set deleteSource(bool value) {
+    assert(value != null);
+    this._deleteSource = value;
+  }
+
+  /**
+   * True if all invocations of the method should be inlined, or false if only
+   * the invocation site used to create this refactoring should be inlined.
+   */
+  bool get inlineAll => _inlineAll;
+
+  /**
+   * True if all invocations of the method should be inlined, or false if only
+   * the invocation site used to create this refactoring should be inlined.
+   */
+  void set inlineAll(bool value) {
+    assert(value != null);
+    this._inlineAll = value;
+  }
+
+  InlineMethodOptions(bool deleteSource, bool inlineAll) {
+    this.deleteSource = deleteSource;
+    this.inlineAll = inlineAll;
+  }
+
+  factory InlineMethodOptions.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      bool deleteSource;
+      if (json.containsKey("deleteSource")) {
+        deleteSource = jsonDecoder.decodeBool(
+            jsonPath + ".deleteSource", json["deleteSource"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "deleteSource");
+      }
+      bool inlineAll;
+      if (json.containsKey("inlineAll")) {
+        inlineAll =
+            jsonDecoder.decodeBool(jsonPath + ".inlineAll", json["inlineAll"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "inlineAll");
+      }
+      return new InlineMethodOptions(deleteSource, inlineAll);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "inlineMethod options", json);
+    }
+  }
+
+  factory InlineMethodOptions.fromRefactoringParams(
+      EditGetRefactoringParams refactoringParams, Request request) {
+    return new InlineMethodOptions.fromJson(
+        new RequestDecoder(request), "options", refactoringParams.options);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["deleteSource"] = deleteSource;
+    result["inlineAll"] = inlineAll;
+    return result;
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is InlineMethodOptions) {
+      return deleteSource == other.deleteSource && inlineAll == other.inlineAll;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, deleteSource.hashCode);
+    hash = JenkinsSmiHash.combine(hash, inlineAll.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * LinkedEditGroup
+ *
+ * {
+ *   "positions": List<Position>
+ *   "length": int
+ *   "suggestions": List<LinkedEditSuggestion>
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class LinkedEditGroup implements HasToJson {
+  List<Position> _positions;
+
+  int _length;
+
+  List<LinkedEditSuggestion> _suggestions;
+
+  /**
+   * The positions of the regions that should be edited simultaneously.
+   */
+  List<Position> get positions => _positions;
+
+  /**
+   * The positions of the regions that should be edited simultaneously.
+   */
+  void set positions(List<Position> value) {
+    assert(value != null);
+    this._positions = value;
+  }
+
+  /**
+   * The length of the regions that should be edited simultaneously.
+   */
+  int get length => _length;
+
+  /**
+   * The length of the regions that should be edited simultaneously.
+   */
+  void set length(int value) {
+    assert(value != null);
+    this._length = value;
+  }
+
+  /**
+   * Pre-computed suggestions for what every region might want to be changed
+   * to.
+   */
+  List<LinkedEditSuggestion> get suggestions => _suggestions;
+
+  /**
+   * Pre-computed suggestions for what every region might want to be changed
+   * to.
+   */
+  void set suggestions(List<LinkedEditSuggestion> value) {
+    assert(value != null);
+    this._suggestions = value;
+  }
+
+  LinkedEditGroup(List<Position> positions, int length,
+      List<LinkedEditSuggestion> suggestions) {
+    this.positions = positions;
+    this.length = length;
+    this.suggestions = suggestions;
+  }
+
+  factory LinkedEditGroup.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      List<Position> positions;
+      if (json.containsKey("positions")) {
+        positions = jsonDecoder.decodeList(
+            jsonPath + ".positions",
+            json["positions"],
+            (String jsonPath, Object json) =>
+                new Position.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "positions");
+      }
+      int length;
+      if (json.containsKey("length")) {
+        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "length");
+      }
+      List<LinkedEditSuggestion> suggestions;
+      if (json.containsKey("suggestions")) {
+        suggestions = jsonDecoder.decodeList(
+            jsonPath + ".suggestions",
+            json["suggestions"],
+            (String jsonPath, Object json) =>
+                new LinkedEditSuggestion.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "suggestions");
+      }
+      return new LinkedEditGroup(positions, length, suggestions);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "LinkedEditGroup", json);
+    }
+  }
+
+  /**
+   * Construct an empty LinkedEditGroup.
+   */
+  LinkedEditGroup.empty() : this(<Position>[], 0, <LinkedEditSuggestion>[]);
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["positions"] =
+        positions.map((Position value) => value.toJson()).toList();
+    result["length"] = length;
+    result["suggestions"] = suggestions
+        .map((LinkedEditSuggestion value) => value.toJson())
+        .toList();
+    return result;
+  }
+
+  /**
+   * Add a new position and change the length.
+   */
+  void addPosition(Position position, int length) {
+    positions.add(position);
+    this.length = length;
+  }
+
+  /**
+   * Add a new suggestion.
+   */
+  void addSuggestion(LinkedEditSuggestion suggestion) {
+    suggestions.add(suggestion);
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is LinkedEditGroup) {
+      return listEqual(
+              positions, other.positions, (Position a, Position b) => a == b) &&
+          length == other.length &&
+          listEqual(suggestions, other.suggestions,
+              (LinkedEditSuggestion a, LinkedEditSuggestion b) => a == b);
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, positions.hashCode);
+    hash = JenkinsSmiHash.combine(hash, length.hashCode);
+    hash = JenkinsSmiHash.combine(hash, suggestions.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * LinkedEditSuggestion
+ *
+ * {
+ *   "value": String
+ *   "kind": LinkedEditSuggestionKind
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class LinkedEditSuggestion implements HasToJson {
+  String _value;
+
+  LinkedEditSuggestionKind _kind;
+
+  /**
+   * The value that could be used to replace all of the linked edit regions.
+   */
+  String get value => _value;
+
+  /**
+   * The value that could be used to replace all of the linked edit regions.
+   */
+  void set value(String value) {
+    assert(value != null);
+    this._value = value;
+  }
+
+  /**
+   * The kind of value being proposed.
+   */
+  LinkedEditSuggestionKind get kind => _kind;
+
+  /**
+   * The kind of value being proposed.
+   */
+  void set kind(LinkedEditSuggestionKind value) {
+    assert(value != null);
+    this._kind = value;
+  }
+
+  LinkedEditSuggestion(String value, LinkedEditSuggestionKind kind) {
+    this.value = value;
+    this.kind = kind;
+  }
+
+  factory LinkedEditSuggestion.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String value;
+      if (json.containsKey("value")) {
+        value = jsonDecoder.decodeString(jsonPath + ".value", json["value"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "value");
+      }
+      LinkedEditSuggestionKind kind;
+      if (json.containsKey("kind")) {
+        kind = new LinkedEditSuggestionKind.fromJson(
+            jsonDecoder, jsonPath + ".kind", json["kind"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "kind");
+      }
+      return new LinkedEditSuggestion(value, kind);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "LinkedEditSuggestion", json);
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["value"] = value;
+    result["kind"] = kind.toJson();
+    return result;
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is LinkedEditSuggestion) {
+      return value == other.value && kind == other.kind;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, value.hashCode);
+    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * LinkedEditSuggestionKind
+ *
+ * enum {
+ *   METHOD
+ *   PARAMETER
+ *   TYPE
+ *   VARIABLE
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class LinkedEditSuggestionKind implements Enum {
+  static const LinkedEditSuggestionKind METHOD =
+      const LinkedEditSuggestionKind._("METHOD");
+
+  static const LinkedEditSuggestionKind PARAMETER =
+      const LinkedEditSuggestionKind._("PARAMETER");
+
+  static const LinkedEditSuggestionKind TYPE =
+      const LinkedEditSuggestionKind._("TYPE");
+
+  static const LinkedEditSuggestionKind VARIABLE =
+      const LinkedEditSuggestionKind._("VARIABLE");
+
+  /**
+   * A list containing all of the enum values that are defined.
+   */
+  static const List<LinkedEditSuggestionKind> VALUES =
+      const <LinkedEditSuggestionKind>[METHOD, PARAMETER, TYPE, VARIABLE];
+
+  @override
+  final String name;
+
+  const LinkedEditSuggestionKind._(this.name);
+
+  factory LinkedEditSuggestionKind(String name) {
+    switch (name) {
+      case "METHOD":
+        return METHOD;
+      case "PARAMETER":
+        return PARAMETER;
+      case "TYPE":
+        return TYPE;
+      case "VARIABLE":
+        return VARIABLE;
+    }
+    throw new Exception('Illegal enum value: $name');
+  }
+
+  factory LinkedEditSuggestionKind.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json is String) {
+      try {
+        return new LinkedEditSuggestionKind(json);
+      } catch (_) {
+        // Fall through
+      }
+    }
+    throw jsonDecoder.mismatch(jsonPath, "LinkedEditSuggestionKind", json);
+  }
+
+  @override
+  String toString() => "LinkedEditSuggestionKind.$name";
+
+  String toJson() => name;
+}
+
+/**
+ * Location
+ *
+ * {
+ *   "file": FilePath
+ *   "offset": int
+ *   "length": int
+ *   "startLine": int
+ *   "startColumn": int
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class Location implements HasToJson {
+  String _file;
+
+  int _offset;
+
+  int _length;
+
+  int _startLine;
+
+  int _startColumn;
+
+  /**
+   * The file containing the range.
+   */
+  String get file => _file;
+
+  /**
+   * The file containing the range.
+   */
+  void set file(String value) {
+    assert(value != null);
+    this._file = value;
+  }
+
+  /**
+   * The offset of the range.
+   */
+  int get offset => _offset;
+
+  /**
+   * The offset of the range.
+   */
+  void set offset(int value) {
+    assert(value != null);
+    this._offset = value;
+  }
+
+  /**
+   * The length of the range.
+   */
+  int get length => _length;
+
+  /**
+   * The length of the range.
+   */
+  void set length(int value) {
+    assert(value != null);
+    this._length = value;
+  }
+
+  /**
+   * The one-based index of the line containing the first character of the
+   * range.
+   */
+  int get startLine => _startLine;
+
+  /**
+   * The one-based index of the line containing the first character of the
+   * range.
+   */
+  void set startLine(int value) {
+    assert(value != null);
+    this._startLine = value;
+  }
+
+  /**
+   * The one-based index of the column containing the first character of the
+   * range.
+   */
+  int get startColumn => _startColumn;
+
+  /**
+   * The one-based index of the column containing the first character of the
+   * range.
+   */
+  void set startColumn(int value) {
+    assert(value != null);
+    this._startColumn = value;
+  }
+
+  Location(
+      String file, int offset, int length, int startLine, int startColumn) {
+    this.file = file;
+    this.offset = offset;
+    this.length = length;
+    this.startLine = startLine;
+    this.startColumn = startColumn;
+  }
+
+  factory Location.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "file");
+      }
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offset");
+      }
+      int length;
+      if (json.containsKey("length")) {
+        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "length");
+      }
+      int startLine;
+      if (json.containsKey("startLine")) {
+        startLine =
+            jsonDecoder.decodeInt(jsonPath + ".startLine", json["startLine"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "startLine");
+      }
+      int startColumn;
+      if (json.containsKey("startColumn")) {
+        startColumn = jsonDecoder.decodeInt(
+            jsonPath + ".startColumn", json["startColumn"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "startColumn");
+      }
+      return new Location(file, offset, length, startLine, startColumn);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "Location", json);
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["file"] = file;
+    result["offset"] = offset;
+    result["length"] = length;
+    result["startLine"] = startLine;
+    result["startColumn"] = startColumn;
+    return result;
+  }
+
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is HoverInformation) {
-      return offset == other.offset &&
+    if (other is Location) {
+      return file == other.file &&
+          offset == other.offset &&
           length == other.length &&
-          containingLibraryPath == other.containingLibraryPath &&
-          containingLibraryName == other.containingLibraryName &&
-          containingClassDescription == other.containingClassDescription &&
-          dartdoc == other.dartdoc &&
-          elementDescription == other.elementDescription &&
-          elementKind == other.elementKind &&
-          isDeprecated == other.isDeprecated &&
-          parameter == other.parameter &&
-          propagatedType == other.propagatedType &&
-          staticType == other.staticType;
+          startLine == other.startLine &&
+          startColumn == other.startColumn;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
     hash = JenkinsSmiHash.combine(hash, offset.hashCode);
     hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    hash = JenkinsSmiHash.combine(hash, containingLibraryPath.hashCode);
-    hash = JenkinsSmiHash.combine(hash, containingLibraryName.hashCode);
-    hash = JenkinsSmiHash.combine(hash, containingClassDescription.hashCode);
-    hash = JenkinsSmiHash.combine(hash, dartdoc.hashCode);
-    hash = JenkinsSmiHash.combine(hash, elementDescription.hashCode);
-    hash = JenkinsSmiHash.combine(hash, elementKind.hashCode);
-    hash = JenkinsSmiHash.combine(hash, isDeprecated.hashCode);
-    hash = JenkinsSmiHash.combine(hash, parameter.hashCode);
-    hash = JenkinsSmiHash.combine(hash, propagatedType.hashCode);
-    hash = JenkinsSmiHash.combine(hash, staticType.hashCode);
+    hash = JenkinsSmiHash.combine(hash, startLine.hashCode);
+    hash = JenkinsSmiHash.combine(hash, startColumn.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * ImplementedClass
+ * moveFile feedback
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class MoveFileFeedback extends RefactoringFeedback implements HasToJson {
+  @override
+  bool operator ==(other) {
+    if (other is MoveFileFeedback) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 438975893;
+  }
+}
+
+/**
+ * moveFile options
  *
  * {
- *   "offset": int
- *   "length": int
+ *   "newFile": FilePath
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ImplementedClass implements HasToJson {
-  int _offset;
-
-  int _length;
+class MoveFileOptions extends RefactoringOptions {
+  String _newFile;
 
   /**
-   * The offset of the name of the implemented class.
+   * The new file path to which the given file is being moved.
    */
-  int get offset => _offset;
+  String get newFile => _newFile;
 
   /**
-   * The offset of the name of the implemented class.
+   * The new file path to which the given file is being moved.
    */
-  void set offset(int value) {
+  void set newFile(String value) {
     assert(value != null);
-    this._offset = value;
+    this._newFile = value;
   }
 
-  /**
-   * The length of the name of the implemented class.
-   */
-  int get length => _length;
-
-  /**
-   * The length of the name of the implemented class.
-   */
-  void set length(int value) {
-    assert(value != null);
-    this._length = value;
+  MoveFileOptions(String newFile) {
+    this.newFile = newFile;
   }
 
-  ImplementedClass(int offset, int length) {
-    this.offset = offset;
-    this.length = length;
-  }
-
-  factory ImplementedClass.fromJson(
+  factory MoveFileOptions.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      String newFile;
+      if (json.containsKey("newFile")) {
+        newFile =
+            jsonDecoder.decodeString(jsonPath + ".newFile", json["newFile"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
+        throw jsonDecoder.mismatch(jsonPath, "newFile");
       }
-      int length;
-      if (json.containsKey("length")) {
-        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
-      }
-      return new ImplementedClass(offset, length);
+      return new MoveFileOptions(newFile);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "ImplementedClass", json);
+      throw jsonDecoder.mismatch(jsonPath, "moveFile options", json);
     }
   }
 
+  factory MoveFileOptions.fromRefactoringParams(
+      EditGetRefactoringParams refactoringParams, Request request) {
+    return new MoveFileOptions.fromJson(
+        new RequestDecoder(request), "options", refactoringParams.options);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["offset"] = offset;
-    result["length"] = length;
+    result["newFile"] = newFile;
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ImplementedClass) {
-      return offset == other.offset && length == other.length;
+    if (other is MoveFileOptions) {
+      return newFile == other.newFile;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, length.hashCode);
+    hash = JenkinsSmiHash.combine(hash, newFile.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * ImplementedMember
+ * NavigationRegion
  *
  * {
  *   "offset": int
  *   "length": int
+ *   "targets": List<int>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ImplementedMember implements HasToJson {
+class NavigationRegion implements HasToJson {
   int _offset;
 
   int _length;
 
+  List<int> _targets;
+
   /**
-   * The offset of the name of the implemented member.
+   * The offset of the region from which the user can navigate.
    */
   int get offset => _offset;
 
   /**
-   * The offset of the name of the implemented member.
+   * The offset of the region from which the user can navigate.
    */
   void set offset(int value) {
     assert(value != null);
     this._offset = value;
   }
 
   /**
-   * The length of the name of the implemented member.
+   * The length of the region from which the user can navigate.
    */
   int get length => _length;
 
   /**
-   * The length of the name of the implemented member.
+   * The length of the region from which the user can navigate.
    */
   void set length(int value) {
     assert(value != null);
     this._length = value;
   }
 
-  ImplementedMember(int offset, int length) {
+  /**
+   * The indexes of the targets (in the enclosing navigation response) to which
+   * the given region is bound. By opening the target, clients can implement
+   * one form of navigation. This list cannot be empty.
+   */
+  List<int> get targets => _targets;
+
+  /**
+   * The indexes of the targets (in the enclosing navigation response) to which
+   * the given region is bound. By opening the target, clients can implement
+   * one form of navigation. This list cannot be empty.
+   */
+  void set targets(List<int> value) {
+    assert(value != null);
+    this._targets = value;
+  }
+
+  NavigationRegion(int offset, int length, List<int> targets) {
     this.offset = offset;
     this.length = length;
+    this.targets = targets;
   }
 
-  factory ImplementedMember.fromJson(
+  factory NavigationRegion.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
       int offset;
       if (json.containsKey("offset")) {
         offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
+        throw jsonDecoder.mismatch(jsonPath, "offset");
       }
       int length;
       if (json.containsKey("length")) {
         length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
+        throw jsonDecoder.mismatch(jsonPath, "length");
       }
-      return new ImplementedMember(offset, length);
+      List<int> targets;
+      if (json.containsKey("targets")) {
+        targets = jsonDecoder.decodeList(
+            jsonPath + ".targets", json["targets"], jsonDecoder.decodeInt);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "targets");
+      }
+      return new NavigationRegion(offset, length, targets);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "ImplementedMember", json);
+      throw jsonDecoder.mismatch(jsonPath, "NavigationRegion", json);
     }
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
     result["offset"] = offset;
     result["length"] = length;
+    result["targets"] = targets;
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ImplementedMember) {
-      return offset == other.offset && length == other.length;
+    if (other is NavigationRegion) {
+      return offset == other.offset &&
+          length == other.length &&
+          listEqual(targets, other.targets, (int a, int b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
     hash = JenkinsSmiHash.combine(hash, offset.hashCode);
     hash = JenkinsSmiHash.combine(hash, length.hashCode);
+    hash = JenkinsSmiHash.combine(hash, targets.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * LinkedEditGroup
+ * NavigationTarget
  *
  * {
- *   "positions": List<Position>
+ *   "kind": ElementKind
+ *   "fileIndex": int
+ *   "offset": int
  *   "length": int
- *   "suggestions": List<LinkedEditSuggestion>
+ *   "startLine": int
+ *   "startColumn": int
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class LinkedEditGroup implements HasToJson {
-  List<Position> _positions;
+class NavigationTarget implements HasToJson {
+  ElementKind _kind;
+
+  int _fileIndex;
+
+  int _offset;
 
   int _length;
 
-  List<LinkedEditSuggestion> _suggestions;
+  int _startLine;
+
+  int _startColumn;
 
   /**
-   * The positions of the regions that should be edited simultaneously.
+   * The kind of the element.
    */
-  List<Position> get positions => _positions;
+  ElementKind get kind => _kind;
 
   /**
-   * The positions of the regions that should be edited simultaneously.
+   * The kind of the element.
    */
-  void set positions(List<Position> value) {
+  void set kind(ElementKind value) {
     assert(value != null);
-    this._positions = value;
+    this._kind = value;
   }
 
   /**
-   * The length of the regions that should be edited simultaneously.
+   * The index of the file (in the enclosing navigation response) to navigate
+   * to.
+   */
+  int get fileIndex => _fileIndex;
+
+  /**
+   * The index of the file (in the enclosing navigation response) to navigate
+   * to.
+   */
+  void set fileIndex(int value) {
+    assert(value != null);
+    this._fileIndex = value;
+  }
+
+  /**
+   * The offset of the region to which the user can navigate.
+   */
+  int get offset => _offset;
+
+  /**
+   * The offset of the region to which the user can navigate.
+   */
+  void set offset(int value) {
+    assert(value != null);
+    this._offset = value;
+  }
+
+  /**
+   * The length of the region to which the user can navigate.
    */
   int get length => _length;
 
   /**
-   * The length of the regions that should be edited simultaneously.
+   * The length of the region to which the user can navigate.
    */
   void set length(int value) {
     assert(value != null);
     this._length = value;
   }
 
   /**
-   * Pre-computed suggestions for what every region might want to be changed
-   * to.
+   * The one-based index of the line containing the first character of the
+   * region.
    */
-  List<LinkedEditSuggestion> get suggestions => _suggestions;
+  int get startLine => _startLine;
 
   /**
-   * Pre-computed suggestions for what every region might want to be changed
-   * to.
+   * The one-based index of the line containing the first character of the
+   * region.
    */
-  void set suggestions(List<LinkedEditSuggestion> value) {
+  void set startLine(int value) {
     assert(value != null);
-    this._suggestions = value;
+    this._startLine = value;
   }
 
-  LinkedEditGroup(List<Position> positions, int length,
-      List<LinkedEditSuggestion> suggestions) {
-    this.positions = positions;
-    this.length = length;
-    this.suggestions = suggestions;
+  /**
+   * The one-based index of the column containing the first character of the
+   * region.
+   */
+  int get startColumn => _startColumn;
+
+  /**
+   * The one-based index of the column containing the first character of the
+   * region.
+   */
+  void set startColumn(int value) {
+    assert(value != null);
+    this._startColumn = value;
   }
 
-  factory LinkedEditGroup.fromJson(
+  NavigationTarget(ElementKind kind, int fileIndex, int offset, int length,
+      int startLine, int startColumn) {
+    this.kind = kind;
+    this.fileIndex = fileIndex;
+    this.offset = offset;
+    this.length = length;
+    this.startLine = startLine;
+    this.startColumn = startColumn;
+  }
+
+  factory NavigationTarget.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<Position> positions;
-      if (json.containsKey("positions")) {
-        positions = jsonDecoder.decodeList(
-            jsonPath + ".positions",
-            json["positions"],
-            (String jsonPath, Object json) =>
-                new Position.fromJson(jsonDecoder, jsonPath, json));
+      ElementKind kind;
+      if (json.containsKey("kind")) {
+        kind = new ElementKind.fromJson(
+            jsonDecoder, jsonPath + ".kind", json["kind"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "positions");
+        throw jsonDecoder.mismatch(jsonPath, "kind");
+      }
+      int fileIndex;
+      if (json.containsKey("fileIndex")) {
+        fileIndex =
+            jsonDecoder.decodeInt(jsonPath + ".fileIndex", json["fileIndex"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "fileIndex");
+      }
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offset");
       }
       int length;
       if (json.containsKey("length")) {
         length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
+        throw jsonDecoder.mismatch(jsonPath, "length");
       }
-      List<LinkedEditSuggestion> suggestions;
-      if (json.containsKey("suggestions")) {
-        suggestions = jsonDecoder.decodeList(
-            jsonPath + ".suggestions",
-            json["suggestions"],
-            (String jsonPath, Object json) =>
-                new LinkedEditSuggestion.fromJson(jsonDecoder, jsonPath, json));
+      int startLine;
+      if (json.containsKey("startLine")) {
+        startLine =
+            jsonDecoder.decodeInt(jsonPath + ".startLine", json["startLine"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "suggestions");
+        throw jsonDecoder.mismatch(jsonPath, "startLine");
       }
-      return new LinkedEditGroup(positions, length, suggestions);
+      int startColumn;
+      if (json.containsKey("startColumn")) {
+        startColumn = jsonDecoder.decodeInt(
+            jsonPath + ".startColumn", json["startColumn"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "startColumn");
+      }
+      return new NavigationTarget(
+          kind, fileIndex, offset, length, startLine, startColumn);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "LinkedEditGroup", json);
+      throw jsonDecoder.mismatch(jsonPath, "NavigationTarget", json);
     }
   }
 
-  /**
-   * Construct an empty LinkedEditGroup.
-   */
-  LinkedEditGroup.empty() : this(<Position>[], 0, <LinkedEditSuggestion>[]);
-
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["positions"] =
-        positions.map((Position value) => value.toJson()).toList();
+    result["kind"] = kind.toJson();
+    result["fileIndex"] = fileIndex;
+    result["offset"] = offset;
     result["length"] = length;
-    result["suggestions"] = suggestions
-        .map((LinkedEditSuggestion value) => value.toJson())
-        .toList();
+    result["startLine"] = startLine;
+    result["startColumn"] = startColumn;
     return result;
   }
 
-  /**
-   * Add a new position and change the length.
-   */
-  void addPosition(Position position, int length) {
-    positions.add(position);
-    this.length = length;
-  }
-
-  /**
-   * Add a new suggestion.
-   */
-  void addSuggestion(LinkedEditSuggestion suggestion) {
-    suggestions.add(suggestion);
-  }
-
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is LinkedEditGroup) {
-      return listEqual(
-              positions, other.positions, (Position a, Position b) => a == b) &&
+    if (other is NavigationTarget) {
+      return kind == other.kind &&
+          fileIndex == other.fileIndex &&
+          offset == other.offset &&
           length == other.length &&
-          listEqual(suggestions, other.suggestions,
-              (LinkedEditSuggestion a, LinkedEditSuggestion b) => a == b);
+          startLine == other.startLine &&
+          startColumn == other.startColumn;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, positions.hashCode);
+    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
+    hash = JenkinsSmiHash.combine(hash, fileIndex.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
     hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    hash = JenkinsSmiHash.combine(hash, suggestions.hashCode);
+    hash = JenkinsSmiHash.combine(hash, startLine.hashCode);
+    hash = JenkinsSmiHash.combine(hash, startColumn.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * LinkedEditSuggestion
+ * Occurrences
  *
  * {
- *   "value": String
- *   "kind": LinkedEditSuggestionKind
+ *   "element": Element
+ *   "offsets": List<int>
+ *   "length": int
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class LinkedEditSuggestion implements HasToJson {
-  String _value;
+class Occurrences implements HasToJson {
+  Element _element;
 
-  LinkedEditSuggestionKind _kind;
+  List<int> _offsets;
+
+  int _length;
 
   /**
-   * The value that could be used to replace all of the linked edit regions.
+   * The element that was referenced.
    */
-  String get value => _value;
+  Element get element => _element;
 
   /**
-   * The value that could be used to replace all of the linked edit regions.
+   * The element that was referenced.
    */
-  void set value(String value) {
+  void set element(Element value) {
     assert(value != null);
-    this._value = value;
+    this._element = value;
   }
 
   /**
-   * The kind of value being proposed.
+   * The offsets of the name of the referenced element within the file.
    */
-  LinkedEditSuggestionKind get kind => _kind;
+  List<int> get offsets => _offsets;
 
   /**
-   * The kind of value being proposed.
+   * The offsets of the name of the referenced element within the file.
    */
-  void set kind(LinkedEditSuggestionKind value) {
+  void set offsets(List<int> value) {
     assert(value != null);
-    this._kind = value;
+    this._offsets = value;
   }
 
-  LinkedEditSuggestion(String value, LinkedEditSuggestionKind kind) {
-    this.value = value;
-    this.kind = kind;
+  /**
+   * The length of the name of the referenced element.
+   */
+  int get length => _length;
+
+  /**
+   * The length of the name of the referenced element.
+   */
+  void set length(int value) {
+    assert(value != null);
+    this._length = value;
   }
 
-  factory LinkedEditSuggestion.fromJson(
+  Occurrences(Element element, List<int> offsets, int length) {
+    this.element = element;
+    this.offsets = offsets;
+    this.length = length;
+  }
+
+  factory Occurrences.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String value;
-      if (json.containsKey("value")) {
-        value = jsonDecoder.decodeString(jsonPath + ".value", json["value"]);
+      Element element;
+      if (json.containsKey("element")) {
+        element = new Element.fromJson(
+            jsonDecoder, jsonPath + ".element", json["element"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "value");
+        throw jsonDecoder.mismatch(jsonPath, "element");
       }
-      LinkedEditSuggestionKind kind;
-      if (json.containsKey("kind")) {
-        kind = new LinkedEditSuggestionKind.fromJson(
-            jsonDecoder, jsonPath + ".kind", json["kind"]);
+      List<int> offsets;
+      if (json.containsKey("offsets")) {
+        offsets = jsonDecoder.decodeList(
+            jsonPath + ".offsets", json["offsets"], jsonDecoder.decodeInt);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "kind");
+        throw jsonDecoder.mismatch(jsonPath, "offsets");
       }
-      return new LinkedEditSuggestion(value, kind);
+      int length;
+      if (json.containsKey("length")) {
+        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "length");
+      }
+      return new Occurrences(element, offsets, length);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "LinkedEditSuggestion", json);
+      throw jsonDecoder.mismatch(jsonPath, "Occurrences", json);
     }
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["value"] = value;
-    result["kind"] = kind.toJson();
+    result["element"] = element.toJson();
+    result["offsets"] = offsets;
+    result["length"] = length;
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is LinkedEditSuggestion) {
-      return value == other.value && kind == other.kind;
+    if (other is Occurrences) {
+      return element == other.element &&
+          listEqual(offsets, other.offsets, (int a, int b) => a == b) &&
+          length == other.length;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, value.hashCode);
-    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
+    hash = JenkinsSmiHash.combine(hash, element.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offsets.hashCode);
+    hash = JenkinsSmiHash.combine(hash, length.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * LinkedEditSuggestionKind
+ * Outline
  *
- * enum {
- *   METHOD
- *   PARAMETER
- *   TYPE
- *   VARIABLE
+ * {
+ *   "element": Element
+ *   "offset": int
+ *   "length": int
+ *   "children": optional List<Outline>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class LinkedEditSuggestionKind implements Enum {
-  static const LinkedEditSuggestionKind METHOD =
-      const LinkedEditSuggestionKind._("METHOD");
-
-  static const LinkedEditSuggestionKind PARAMETER =
-      const LinkedEditSuggestionKind._("PARAMETER");
-
-  static const LinkedEditSuggestionKind TYPE =
-      const LinkedEditSuggestionKind._("TYPE");
-
-  static const LinkedEditSuggestionKind VARIABLE =
-      const LinkedEditSuggestionKind._("VARIABLE");
-
-  /**
-   * A list containing all of the enum values that are defined.
-   */
-  static const List<LinkedEditSuggestionKind> VALUES =
-      const <LinkedEditSuggestionKind>[METHOD, PARAMETER, TYPE, VARIABLE];
-
-  final String name;
-
-  const LinkedEditSuggestionKind._(this.name);
-
-  factory LinkedEditSuggestionKind(String name) {
-    switch (name) {
-      case "METHOD":
-        return METHOD;
-      case "PARAMETER":
-        return PARAMETER;
-      case "TYPE":
-        return TYPE;
-      case "VARIABLE":
-        return VARIABLE;
-    }
-    throw new Exception('Illegal enum value: $name');
-  }
-
-  factory LinkedEditSuggestionKind.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json is String) {
-      try {
-        return new LinkedEditSuggestionKind(json);
-      } catch (_) {
-        // Fall through
-      }
-    }
-    throw jsonDecoder.mismatch(jsonPath, "LinkedEditSuggestionKind", json);
-  }
-
-  @override
-  String toString() => "LinkedEditSuggestionKind.$name";
-
-  String toJson() => name;
-}
-
-/**
- * Location
- *
- * {
- *   "file": FilePath
- *   "offset": int
- *   "length": int
- *   "startLine": int
- *   "startColumn": int
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class Location implements HasToJson {
-  String _file;
+class Outline implements HasToJson {
+  Element _element;
 
   int _offset;
 
   int _length;
 
-  int _startLine;
-
-  int _startColumn;
+  List<Outline> _children;
 
   /**
-   * The file containing the range.
+   * A description of the element represented by this node.
    */
-  String get file => _file;
+  Element get element => _element;
 
   /**
-   * The file containing the range.
+   * A description of the element represented by this node.
    */
-  void set file(String value) {
+  void set element(Element value) {
     assert(value != null);
-    this._file = value;
+    this._element = value;
   }
 
   /**
-   * The offset of the range.
+   * The offset of the first character of the element. This is different than
+   * the offset in the Element, which if the offset of the name of the element.
+   * It can be used, for example, to map locations in the file back to an
+   * outline.
    */
   int get offset => _offset;
 
   /**
-   * The offset of the range.
+   * The offset of the first character of the element. This is different than
+   * the offset in the Element, which if the offset of the name of the element.
+   * It can be used, for example, to map locations in the file back to an
+   * outline.
    */
   void set offset(int value) {
     assert(value != null);
     this._offset = value;
   }
 
   /**
-   * The length of the range.
+   * The length of the element.
    */
   int get length => _length;
 
   /**
-   * The length of the range.
+   * The length of the element.
    */
   void set length(int value) {
     assert(value != null);
     this._length = value;
   }
 
   /**
-   * The one-based index of the line containing the first character of the
-   * range.
+   * The children of the node. The field will be omitted if the node has no
+   * children.
    */
-  int get startLine => _startLine;
+  List<Outline> get children => _children;
 
   /**
-   * The one-based index of the line containing the first character of the
-   * range.
+   * The children of the node. The field will be omitted if the node has no
+   * children.
    */
-  void set startLine(int value) {
-    assert(value != null);
-    this._startLine = value;
+  void set children(List<Outline> value) {
+    this._children = value;
   }
 
-  /**
-   * The one-based index of the column containing the first character of the
-   * range.
-   */
-  int get startColumn => _startColumn;
-
-  /**
-   * The one-based index of the column containing the first character of the
-   * range.
-   */
-  void set startColumn(int value) {
-    assert(value != null);
-    this._startColumn = value;
+  Outline(Element element, int offset, int length, {List<Outline> children}) {
+    this.element = element;
+    this.offset = offset;
+    this.length = length;
+    this.children = children;
   }
 
-  Location(
-      String file, int offset, int length, int startLine, int startColumn) {
-    this.file = file;
-    this.offset = offset;
-    this.length = length;
-    this.startLine = startLine;
-    this.startColumn = startColumn;
-  }
-
-  factory Location.fromJson(
+  factory Outline.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
+      Element element;
+      if (json.containsKey("element")) {
+        element = new Element.fromJson(
+            jsonDecoder, jsonPath + ".element", json["element"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+        throw jsonDecoder.mismatch(jsonPath, "element");
       }
       int offset;
       if (json.containsKey("offset")) {
         offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
+        throw jsonDecoder.mismatch(jsonPath, "offset");
       }
       int length;
       if (json.containsKey("length")) {
         length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
+        throw jsonDecoder.mismatch(jsonPath, "length");
       }
-      int startLine;
-      if (json.containsKey("startLine")) {
-        startLine =
-            jsonDecoder.decodeInt(jsonPath + ".startLine", json["startLine"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "startLine");
+      List<Outline> children;
+      if (json.containsKey("children")) {
+        children = jsonDecoder.decodeList(
+            jsonPath + ".children",
+            json["children"],
+            (String jsonPath, Object json) =>
+                new Outline.fromJson(jsonDecoder, jsonPath, json));
       }
-      int startColumn;
-      if (json.containsKey("startColumn")) {
-        startColumn = jsonDecoder.decodeInt(
-            jsonPath + ".startColumn", json["startColumn"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "startColumn");
-      }
-      return new Location(file, offset, length, startLine, startColumn);
+      return new Outline(element, offset, length, children: children);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "Location", json);
+      throw jsonDecoder.mismatch(jsonPath, "Outline", json);
     }
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["file"] = file;
+    result["element"] = element.toJson();
     result["offset"] = offset;
     result["length"] = length;
-    result["startLine"] = startLine;
-    result["startColumn"] = startColumn;
+    if (children != null) {
+      result["children"] =
+          children.map((Outline value) => value.toJson()).toList();
+    }
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is Location) {
-      return file == other.file &&
+    if (other is Outline) {
+      return element == other.element &&
           offset == other.offset &&
           length == other.length &&
-          startLine == other.startLine &&
-          startColumn == other.startColumn;
+          listEqual(children, other.children, (Outline a, Outline b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, element.hashCode);
     hash = JenkinsSmiHash.combine(hash, offset.hashCode);
     hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    hash = JenkinsSmiHash.combine(hash, startLine.hashCode);
-    hash = JenkinsSmiHash.combine(hash, startColumn.hashCode);
+    hash = JenkinsSmiHash.combine(hash, children.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * NavigationRegion
+ * OverriddenMember
  *
  * {
- *   "offset": int
- *   "length": int
- *   "targets": List<int>
+ *   "element": Element
+ *   "className": String
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class NavigationRegion implements HasToJson {
-  int _offset;
+class OverriddenMember implements HasToJson {
+  Element _element;
 
-  int _length;
-
-  List<int> _targets;
+  String _className;
 
   /**
-   * The offset of the region from which the user can navigate.
+   * The element that is being overridden.
    */
-  int get offset => _offset;
+  Element get element => _element;
 
   /**
-   * The offset of the region from which the user can navigate.
+   * The element that is being overridden.
    */
-  void set offset(int value) {
+  void set element(Element value) {
     assert(value != null);
-    this._offset = value;
+    this._element = value;
   }
 
   /**
-   * The length of the region from which the user can navigate.
+   * The name of the class in which the member is defined.
    */
-  int get length => _length;
+  String get className => _className;
 
   /**
-   * The length of the region from which the user can navigate.
+   * The name of the class in which the member is defined.
    */
-  void set length(int value) {
+  void set className(String value) {
     assert(value != null);
-    this._length = value;
+    this._className = value;
   }
 
-  /**
-   * The indexes of the targets (in the enclosing navigation response) to which
-   * the given region is bound. By opening the target, clients can implement
-   * one form of navigation. This list cannot be empty.
-   */
-  List<int> get targets => _targets;
-
-  /**
-   * The indexes of the targets (in the enclosing navigation response) to which
-   * the given region is bound. By opening the target, clients can implement
-   * one form of navigation. This list cannot be empty.
-   */
-  void set targets(List<int> value) {
-    assert(value != null);
-    this._targets = value;
+  OverriddenMember(Element element, String className) {
+    this.element = element;
+    this.className = className;
   }
 
-  NavigationRegion(int offset, int length, List<int> targets) {
-    this.offset = offset;
-    this.length = length;
-    this.targets = targets;
-  }
-
-  factory NavigationRegion.fromJson(
+  factory OverriddenMember.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      Element element;
+      if (json.containsKey("element")) {
+        element = new Element.fromJson(
+            jsonDecoder, jsonPath + ".element", json["element"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
+        throw jsonDecoder.mismatch(jsonPath, "element");
       }
-      int length;
-      if (json.containsKey("length")) {
-        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+      String className;
+      if (json.containsKey("className")) {
+        className = jsonDecoder.decodeString(
+            jsonPath + ".className", json["className"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
+        throw jsonDecoder.mismatch(jsonPath, "className");
       }
-      List<int> targets;
-      if (json.containsKey("targets")) {
-        targets = jsonDecoder.decodeList(
-            jsonPath + ".targets", json["targets"], jsonDecoder.decodeInt);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "targets");
-      }
-      return new NavigationRegion(offset, length, targets);
+      return new OverriddenMember(element, className);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "NavigationRegion", json);
+      throw jsonDecoder.mismatch(jsonPath, "OverriddenMember", json);
     }
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["offset"] = offset;
-    result["length"] = length;
-    result["targets"] = targets;
+    result["element"] = element.toJson();
+    result["className"] = className;
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is NavigationRegion) {
-      return offset == other.offset &&
-          length == other.length &&
-          listEqual(targets, other.targets, (int a, int b) => a == b);
+    if (other is OverriddenMember) {
+      return element == other.element && className == other.className;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    hash = JenkinsSmiHash.combine(hash, targets.hashCode);
+    hash = JenkinsSmiHash.combine(hash, element.hashCode);
+    hash = JenkinsSmiHash.combine(hash, className.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * NavigationTarget
+ * Override
  *
  * {
- *   "kind": ElementKind
- *   "fileIndex": int
  *   "offset": int
  *   "length": int
- *   "startLine": int
- *   "startColumn": int
+ *   "superclassMember": optional OverriddenMember
+ *   "interfaceMembers": optional List<OverriddenMember>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class NavigationTarget implements HasToJson {
-  ElementKind _kind;
-
-  int _fileIndex;
-
+class Override implements HasToJson {
   int _offset;
 
   int _length;
 
-  int _startLine;
+  OverriddenMember _superclassMember;
 
-  int _startColumn;
+  List<OverriddenMember> _interfaceMembers;
 
   /**
-   * The kind of the element.
-   */
-  ElementKind get kind => _kind;
-
-  /**
-   * The kind of the element.
-   */
-  void set kind(ElementKind value) {
-    assert(value != null);
-    this._kind = value;
-  }
-
-  /**
-   * The index of the file (in the enclosing navigation response) to navigate
-   * to.
-   */
-  int get fileIndex => _fileIndex;
-
-  /**
-   * The index of the file (in the enclosing navigation response) to navigate
-   * to.
-   */
-  void set fileIndex(int value) {
-    assert(value != null);
-    this._fileIndex = value;
-  }
-
-  /**
-   * The offset of the region to which the user can navigate.
+   * The offset of the name of the overriding member.
    */
   int get offset => _offset;
 
   /**
-   * The offset of the region to which the user can navigate.
+   * The offset of the name of the overriding member.
    */
   void set offset(int value) {
     assert(value != null);
     this._offset = value;
   }
 
   /**
-   * The length of the region to which the user can navigate.
+   * The length of the name of the overriding member.
    */
   int get length => _length;
 
   /**
-   * The length of the region to which the user can navigate.
+   * The length of the name of the overriding member.
    */
   void set length(int value) {
     assert(value != null);
     this._length = value;
   }
 
   /**
-   * The one-based index of the line containing the first character of the
-   * region.
+   * The member inherited from a superclass that is overridden by the
+   * overriding member. The field is omitted if there is no superclass member,
+   * in which case there must be at least one interface member.
    */
-  int get startLine => _startLine;
+  OverriddenMember get superclassMember => _superclassMember;
 
   /**
-   * The one-based index of the line containing the first character of the
-   * region.
+   * The member inherited from a superclass that is overridden by the
+   * overriding member. The field is omitted if there is no superclass member,
+   * in which case there must be at least one interface member.
    */
-  void set startLine(int value) {
-    assert(value != null);
-    this._startLine = value;
+  void set superclassMember(OverriddenMember value) {
+    this._superclassMember = value;
   }
 
   /**
-   * The one-based index of the column containing the first character of the
-   * region.
+   * The members inherited from interfaces that are overridden by the
+   * overriding member. The field is omitted if there are no interface members,
+   * in which case there must be a superclass member.
    */
-  int get startColumn => _startColumn;
+  List<OverriddenMember> get interfaceMembers => _interfaceMembers;
 
   /**
-   * The one-based index of the column containing the first character of the
-   * region.
+   * The members inherited from interfaces that are overridden by the
+   * overriding member. The field is omitted if there are no interface members,
+   * in which case there must be a superclass member.
    */
-  void set startColumn(int value) {
-    assert(value != null);
-    this._startColumn = value;
+  void set interfaceMembers(List<OverriddenMember> value) {
+    this._interfaceMembers = value;
   }
 
-  NavigationTarget(ElementKind kind, int fileIndex, int offset, int length,
-      int startLine, int startColumn) {
-    this.kind = kind;
-    this.fileIndex = fileIndex;
+  Override(int offset, int length,
+      {OverriddenMember superclassMember,
+      List<OverriddenMember> interfaceMembers}) {
     this.offset = offset;
     this.length = length;
-    this.startLine = startLine;
-    this.startColumn = startColumn;
+    this.superclassMember = superclassMember;
+    this.interfaceMembers = interfaceMembers;
   }
 
-  factory NavigationTarget.fromJson(
+  factory Override.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      ElementKind kind;
-      if (json.containsKey("kind")) {
-        kind = new ElementKind.fromJson(
-            jsonDecoder, jsonPath + ".kind", json["kind"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "kind");
-      }
-      int fileIndex;
-      if (json.containsKey("fileIndex")) {
-        fileIndex =
-            jsonDecoder.decodeInt(jsonPath + ".fileIndex", json["fileIndex"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "fileIndex");
-      }
       int offset;
       if (json.containsKey("offset")) {
         offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
+        throw jsonDecoder.mismatch(jsonPath, "offset");
       }
       int length;
       if (json.containsKey("length")) {
         length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
+        throw jsonDecoder.mismatch(jsonPath, "length");
       }
-      int startLine;
-      if (json.containsKey("startLine")) {
-        startLine =
-            jsonDecoder.decodeInt(jsonPath + ".startLine", json["startLine"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "startLine");
+      OverriddenMember superclassMember;
+      if (json.containsKey("superclassMember")) {
+        superclassMember = new OverriddenMember.fromJson(jsonDecoder,
+            jsonPath + ".superclassMember", json["superclassMember"]);
       }
-      int startColumn;
-      if (json.containsKey("startColumn")) {
-        startColumn = jsonDecoder.decodeInt(
-            jsonPath + ".startColumn", json["startColumn"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "startColumn");
+      List<OverriddenMember> interfaceMembers;
+      if (json.containsKey("interfaceMembers")) {
+        interfaceMembers = jsonDecoder.decodeList(
+            jsonPath + ".interfaceMembers",
+            json["interfaceMembers"],
+            (String jsonPath, Object json) =>
+                new OverriddenMember.fromJson(jsonDecoder, jsonPath, json));
       }
-      return new NavigationTarget(
-          kind, fileIndex, offset, length, startLine, startColumn);
+      return new Override(offset, length,
+          superclassMember: superclassMember,
+          interfaceMembers: interfaceMembers);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "NavigationTarget", json);
+      throw jsonDecoder.mismatch(jsonPath, "Override", json);
     }
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["kind"] = kind.toJson();
-    result["fileIndex"] = fileIndex;
     result["offset"] = offset;
     result["length"] = length;
-    result["startLine"] = startLine;
-    result["startColumn"] = startColumn;
+    if (superclassMember != null) {
+      result["superclassMember"] = superclassMember.toJson();
+    }
+    if (interfaceMembers != null) {
+      result["interfaceMembers"] = interfaceMembers
+          .map((OverriddenMember value) => value.toJson())
+          .toList();
+    }
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is NavigationTarget) {
-      return kind == other.kind &&
-          fileIndex == other.fileIndex &&
-          offset == other.offset &&
+    if (other is Override) {
+      return offset == other.offset &&
           length == other.length &&
-          startLine == other.startLine &&
-          startColumn == other.startColumn;
+          superclassMember == other.superclassMember &&
+          listEqual(interfaceMembers, other.interfaceMembers,
+              (OverriddenMember a, OverriddenMember b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
-    hash = JenkinsSmiHash.combine(hash, fileIndex.hashCode);
     hash = JenkinsSmiHash.combine(hash, offset.hashCode);
     hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    hash = JenkinsSmiHash.combine(hash, startLine.hashCode);
-    hash = JenkinsSmiHash.combine(hash, startColumn.hashCode);
+    hash = JenkinsSmiHash.combine(hash, superclassMember.hashCode);
+    hash = JenkinsSmiHash.combine(hash, interfaceMembers.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * Occurrences
+ * Position
  *
  * {
- *   "element": Element
- *   "offsets": List<int>
- *   "length": int
+ *   "file": FilePath
+ *   "offset": int
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class Occurrences implements HasToJson {
-  Element _element;
+class Position implements HasToJson {
+  String _file;
 
-  List<int> _offsets;
-
-  int _length;
+  int _offset;
 
   /**
-   * The element that was referenced.
+   * The file containing the position.
    */
-  Element get element => _element;
+  String get file => _file;
 
   /**
-   * The element that was referenced.
+   * The file containing the position.
    */
-  void set element(Element value) {
+  void set file(String value) {
     assert(value != null);
-    this._element = value;
+    this._file = value;
   }
 
   /**
-   * The offsets of the name of the referenced element within the file.
+   * The offset of the position.
    */
-  List<int> get offsets => _offsets;
+  int get offset => _offset;
 
   /**
-   * The offsets of the name of the referenced element within the file.
+   * The offset of the position.
    */
-  void set offsets(List<int> value) {
+  void set offset(int value) {
     assert(value != null);
-    this._offsets = value;
+    this._offset = value;
   }
 
-  /**
-   * The length of the name of the referenced element.
-   */
-  int get length => _length;
-
-  /**
-   * The length of the name of the referenced element.
-   */
-  void set length(int value) {
-    assert(value != null);
-    this._length = value;
+  Position(String file, int offset) {
+    this.file = file;
+    this.offset = offset;
   }
 
-  Occurrences(Element element, List<int> offsets, int length) {
-    this.element = element;
-    this.offsets = offsets;
-    this.length = length;
-  }
-
-  factory Occurrences.fromJson(
+  factory Position.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      Element element;
-      if (json.containsKey("element")) {
-        element = new Element.fromJson(
-            jsonDecoder, jsonPath + ".element", json["element"]);
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "element");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      List<int> offsets;
-      if (json.containsKey("offsets")) {
-        offsets = jsonDecoder.decodeList(
-            jsonPath + ".offsets", json["offsets"], jsonDecoder.decodeInt);
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offsets");
+        throw jsonDecoder.mismatch(jsonPath, "offset");
       }
-      int length;
-      if (json.containsKey("length")) {
-        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
-      }
-      return new Occurrences(element, offsets, length);
+      return new Position(file, offset);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "Occurrences", json);
+      throw jsonDecoder.mismatch(jsonPath, "Position", json);
     }
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["element"] = element.toJson();
-    result["offsets"] = offsets;
-    result["length"] = length;
+    result["file"] = file;
+    result["offset"] = offset;
     return result;
   }
 
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is Position) {
+      return file == other.file && offset == other.offset;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * PubStatus
+ *
+ * {
+ *   "isListingPackageDirs": bool
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class PubStatus implements HasToJson {
+  bool _isListingPackageDirs;
+
+  /**
+   * True if the server is currently running pub to produce a list of package
+   * directories.
+   */
+  bool get isListingPackageDirs => _isListingPackageDirs;
+
+  /**
+   * True if the server is currently running pub to produce a list of package
+   * directories.
+   */
+  void set isListingPackageDirs(bool value) {
+    assert(value != null);
+    this._isListingPackageDirs = value;
+  }
+
+  PubStatus(bool isListingPackageDirs) {
+    this.isListingPackageDirs = isListingPackageDirs;
+  }
+
+  factory PubStatus.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      bool isListingPackageDirs;
+      if (json.containsKey("isListingPackageDirs")) {
+        isListingPackageDirs = jsonDecoder.decodeBool(
+            jsonPath + ".isListingPackageDirs", json["isListingPackageDirs"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "isListingPackageDirs");
+      }
+      return new PubStatus(isListingPackageDirs);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "PubStatus", json);
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["isListingPackageDirs"] = isListingPackageDirs;
+    return result;
+  }
+
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is Occurrences) {
-      return element == other.element &&
-          listEqual(offsets, other.offsets, (int a, int b) => a == b) &&
-          length == other.length;
+    if (other is PubStatus) {
+      return isListingPackageDirs == other.isListingPackageDirs;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, element.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offsets.hashCode);
-    hash = JenkinsSmiHash.combine(hash, length.hashCode);
+    hash = JenkinsSmiHash.combine(hash, isListingPackageDirs.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * Outline
+ * RefactoringFeedback
  *
  * {
- *   "element": Element
- *   "offset": int
- *   "length": int
- *   "children": optional List<Outline>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class Outline implements HasToJson {
-  Element _element;
-
-  int _offset;
-
-  int _length;
-
-  List<Outline> _children;
-
-  /**
-   * A description of the element represented by this node.
-   */
-  Element get element => _element;
-
-  /**
-   * A description of the element represented by this node.
-   */
-  void set element(Element value) {
+class RefactoringFeedback implements HasToJson {
+  RefactoringFeedback();
+
+  factory RefactoringFeedback.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json, Map responseJson) {
+    return refactoringFeedbackFromJson(
+        jsonDecoder, jsonPath, json, responseJson);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    return result;
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is RefactoringFeedback) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * RefactoringKind
+ *
+ * enum {
+ *   CONVERT_GETTER_TO_METHOD
+ *   CONVERT_METHOD_TO_GETTER
+ *   EXTRACT_LOCAL_VARIABLE
+ *   EXTRACT_METHOD
+ *   INLINE_LOCAL_VARIABLE
+ *   INLINE_METHOD
+ *   MOVE_FILE
+ *   RENAME
+ *   SORT_MEMBERS
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class RefactoringKind implements Enum {
+  static const RefactoringKind CONVERT_GETTER_TO_METHOD =
+      const RefactoringKind._("CONVERT_GETTER_TO_METHOD");
+
+  static const RefactoringKind CONVERT_METHOD_TO_GETTER =
+      const RefactoringKind._("CONVERT_METHOD_TO_GETTER");
+
+  static const RefactoringKind EXTRACT_LOCAL_VARIABLE =
+      const RefactoringKind._("EXTRACT_LOCAL_VARIABLE");
+
+  static const RefactoringKind EXTRACT_METHOD =
+      const RefactoringKind._("EXTRACT_METHOD");
+
+  static const RefactoringKind INLINE_LOCAL_VARIABLE =
+      const RefactoringKind._("INLINE_LOCAL_VARIABLE");
+
+  static const RefactoringKind INLINE_METHOD =
+      const RefactoringKind._("INLINE_METHOD");
+
+  static const RefactoringKind MOVE_FILE = const RefactoringKind._("MOVE_FILE");
+
+  static const RefactoringKind RENAME = const RefactoringKind._("RENAME");
+
+  static const RefactoringKind SORT_MEMBERS =
+      const RefactoringKind._("SORT_MEMBERS");
+
+  /**
+   * A list containing all of the enum values that are defined.
+   */
+  static const List<RefactoringKind> VALUES = const <RefactoringKind>[
+    CONVERT_GETTER_TO_METHOD,
+    CONVERT_METHOD_TO_GETTER,
+    EXTRACT_LOCAL_VARIABLE,
+    EXTRACT_METHOD,
+    INLINE_LOCAL_VARIABLE,
+    INLINE_METHOD,
+    MOVE_FILE,
+    RENAME,
+    SORT_MEMBERS
+  ];
+
+  @override
+  final String name;
+
+  const RefactoringKind._(this.name);
+
+  factory RefactoringKind(String name) {
+    switch (name) {
+      case "CONVERT_GETTER_TO_METHOD":
+        return CONVERT_GETTER_TO_METHOD;
+      case "CONVERT_METHOD_TO_GETTER":
+        return CONVERT_METHOD_TO_GETTER;
+      case "EXTRACT_LOCAL_VARIABLE":
+        return EXTRACT_LOCAL_VARIABLE;
+      case "EXTRACT_METHOD":
+        return EXTRACT_METHOD;
+      case "INLINE_LOCAL_VARIABLE":
+        return INLINE_LOCAL_VARIABLE;
+      case "INLINE_METHOD":
+        return INLINE_METHOD;
+      case "MOVE_FILE":
+        return MOVE_FILE;
+      case "RENAME":
+        return RENAME;
+      case "SORT_MEMBERS":
+        return SORT_MEMBERS;
+    }
+    throw new Exception('Illegal enum value: $name');
+  }
+
+  factory RefactoringKind.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json is String) {
+      try {
+        return new RefactoringKind(json);
+      } catch (_) {
+        // Fall through
+      }
+    }
+    throw jsonDecoder.mismatch(jsonPath, "RefactoringKind", json);
+  }
+
+  @override
+  String toString() => "RefactoringKind.$name";
+
+  String toJson() => name;
+}
+
+/**
+ * RefactoringMethodParameter
+ *
+ * {
+ *   "id": optional String
+ *   "kind": RefactoringMethodParameterKind
+ *   "type": String
+ *   "name": String
+ *   "parameters": optional String
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class RefactoringMethodParameter implements HasToJson {
+  String _id;
+
+  RefactoringMethodParameterKind _kind;
+
+  String _type;
+
+  String _name;
+
+  String _parameters;
+
+  /**
+   * The unique identifier of the parameter. Clients may omit this field for
+   * the parameters they want to add.
+   */
+  String get id => _id;
+
+  /**
+   * The unique identifier of the parameter. Clients may omit this field for
+   * the parameters they want to add.
+   */
+  void set id(String value) {
+    this._id = value;
+  }
+
+  /**
+   * The kind of the parameter.
+   */
+  RefactoringMethodParameterKind get kind => _kind;
+
+  /**
+   * The kind of the parameter.
+   */
+  void set kind(RefactoringMethodParameterKind value) {
     assert(value != null);
-    this._element = value;
-  }
-
-  /**
-   * The offset of the first character of the element. This is different than
-   * the offset in the Element, which if the offset of the name of the element.
-   * It can be used, for example, to map locations in the file back to an
-   * outline.
-   */
-  int get offset => _offset;
-
-  /**
-   * The offset of the first character of the element. This is different than
-   * the offset in the Element, which if the offset of the name of the element.
-   * It can be used, for example, to map locations in the file back to an
-   * outline.
-   */
-  void set offset(int value) {
+    this._kind = value;
+  }
+
+  /**
+   * The type that should be given to the parameter, or the return type of the
+   * parameter's function type.
+   */
+  String get type => _type;
+
+  /**
+   * The type that should be given to the parameter, or the return type of the
+   * parameter's function type.
+   */
+  void set type(String value) {
     assert(value != null);
-    this._offset = value;
-  }
-
-  /**
-   * The length of the element.
-   */
-  int get length => _length;
-
-  /**
-   * The length of the element.
-   */
-  void set length(int value) {
+    this._type = value;
+  }
+
+  /**
+   * The name that should be given to the parameter.
+   */
+  String get name => _name;
+
+  /**
+   * The name that should be given to the parameter.
+   */
+  void set name(String value) {
     assert(value != null);
-    this._length = value;
-  }
-
-  /**
-   * The children of the node. The field will be omitted if the node has no
-   * children.
-   */
-  List<Outline> get children => _children;
-
-  /**
-   * The children of the node. The field will be omitted if the node has no
-   * children.
-   */
-  void set children(List<Outline> value) {
-    this._children = value;
-  }
-
-  Outline(Element element, int offset, int length, {List<Outline> children}) {
-    this.element = element;
-    this.offset = offset;
-    this.length = length;
-    this.children = children;
-  }
-
-  factory Outline.fromJson(
+    this._name = value;
+  }
+
+  /**
+   * The parameter list of the parameter's function type. If the parameter is
+   * not of a function type, this field will not be defined. If the function
+   * type has zero parameters, this field will have a value of "()".
+   */
+  String get parameters => _parameters;
+
+  /**
+   * The parameter list of the parameter's function type. If the parameter is
+   * not of a function type, this field will not be defined. If the function
+   * type has zero parameters, this field will have a value of "()".
+   */
+  void set parameters(String value) {
+    this._parameters = value;
+  }
+
+  RefactoringMethodParameter(
+      RefactoringMethodParameterKind kind, String type, String name,
+      {String id, String parameters}) {
+    this.id = id;
+    this.kind = kind;
+    this.type = type;
+    this.name = name;
+    this.parameters = parameters;
+  }
+
+  factory RefactoringMethodParameter.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      Element element;
-      if (json.containsKey("element")) {
-        element = new Element.fromJson(
-            jsonDecoder, jsonPath + ".element", json["element"]);
+      String id;
+      if (json.containsKey("id")) {
+        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      }
+      RefactoringMethodParameterKind kind;
+      if (json.containsKey("kind")) {
+        kind = new RefactoringMethodParameterKind.fromJson(
+            jsonDecoder, jsonPath + ".kind", json["kind"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "element");
-      }
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+        throw jsonDecoder.mismatch(jsonPath, "kind");
+      }
+      String type;
+      if (json.containsKey("type")) {
+        type = jsonDecoder.decodeString(jsonPath + ".type", json["type"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
-      }
-      int length;
-      if (json.containsKey("length")) {
-        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+        throw jsonDecoder.mismatch(jsonPath, "type");
+      }
+      String name;
+      if (json.containsKey("name")) {
+        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
-      }
-      List<Outline> children;
-      if (json.containsKey("children")) {
-        children = jsonDecoder.decodeList(
-            jsonPath + ".children",
-            json["children"],
-            (String jsonPath, Object json) =>
-                new Outline.fromJson(jsonDecoder, jsonPath, json));
-      }
-      return new Outline(element, offset, length, children: children);
+        throw jsonDecoder.mismatch(jsonPath, "name");
+      }
+      String parameters;
+      if (json.containsKey("parameters")) {
+        parameters = jsonDecoder.decodeString(
+            jsonPath + ".parameters", json["parameters"]);
+      }
+      return new RefactoringMethodParameter(kind, type, name,
+          id: id, parameters: parameters);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "Outline", json);
-    }
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "RefactoringMethodParameter", json);
+    }
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["element"] = element.toJson();
-    result["offset"] = offset;
-    result["length"] = length;
-    if (children != null) {
-      result["children"] =
-          children.map((Outline value) => value.toJson()).toList();
+    if (id != null) {
+      result["id"] = id;
+    }
+    result["kind"] = kind.toJson();
+    result["type"] = type;
+    result["name"] = name;
+    if (parameters != null) {
+      result["parameters"] = parameters;
     }
     return result;
   }
 
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is Outline) {
-      return element == other.element &&
-          offset == other.offset &&
-          length == other.length &&
-          listEqual(children, other.children, (Outline a, Outline b) => a == b);
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, element.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    hash = JenkinsSmiHash.combine(hash, children.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * Override
- *
- * {
- *   "offset": int
- *   "length": int
- *   "superclassMember": optional OverriddenMember
- *   "interfaceMembers": optional List<OverriddenMember>
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class Override implements HasToJson {
-  int _offset;
-
-  int _length;
-
-  OverriddenMember _superclassMember;
-
-  List<OverriddenMember> _interfaceMembers;
-
-  /**
-   * The offset of the name of the overriding member.
-   */
-  int get offset => _offset;
-
-  /**
-   * The offset of the name of the overriding member.
-   */
-  void set offset(int value) {
-    assert(value != null);
-    this._offset = value;
-  }
-
-  /**
-   * The length of the name of the overriding member.
-   */
-  int get length => _length;
-
-  /**
-   * The length of the name of the overriding member.
-   */
-  void set length(int value) {
-    assert(value != null);
-    this._length = value;
-  }
-
-  /**
-   * The member inherited from a superclass that is overridden by the
-   * overriding member. The field is omitted if there is no superclass member,
-   * in which case there must be at least one interface member.
-   */
-  OverriddenMember get superclassMember => _superclassMember;
-
-  /**
-   * The member inherited from a superclass that is overridden by the
-   * overriding member. The field is omitted if there is no superclass member,
-   * in which case there must be at least one interface member.
-   */
-  void set superclassMember(OverriddenMember value) {
-    this._superclassMember = value;
-  }
-
-  /**
-   * The members inherited from interfaces that are overridden by the
-   * overriding member. The field is omitted if there are no interface members,
-   * in which case there must be a superclass member.
-   */
-  List<OverriddenMember> get interfaceMembers => _interfaceMembers;
-
-  /**
-   * The members inherited from interfaces that are overridden by the
-   * overriding member. The field is omitted if there are no interface members,
-   * in which case there must be a superclass member.
-   */
-  void set interfaceMembers(List<OverriddenMember> value) {
-    this._interfaceMembers = value;
-  }
-
-  Override(int offset, int length,
-      {OverriddenMember superclassMember,
-      List<OverriddenMember> interfaceMembers}) {
-    this.offset = offset;
-    this.length = length;
-    this.superclassMember = superclassMember;
-    this.interfaceMembers = interfaceMembers;
-  }
-
-  factory Override.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
-      }
-      int length;
-      if (json.containsKey("length")) {
-        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
-      }
-      OverriddenMember superclassMember;
-      if (json.containsKey("superclassMember")) {
-        superclassMember = new OverriddenMember.fromJson(jsonDecoder,
-            jsonPath + ".superclassMember", json["superclassMember"]);
-      }
-      List<OverriddenMember> interfaceMembers;
-      if (json.containsKey("interfaceMembers")) {
-        interfaceMembers = jsonDecoder.decodeList(
-            jsonPath + ".interfaceMembers",
-            json["interfaceMembers"],
-            (String jsonPath, Object json) =>
-                new OverriddenMember.fromJson(jsonDecoder, jsonPath, json));
-      }
-      return new Override(offset, length,
-          superclassMember: superclassMember,
-          interfaceMembers: interfaceMembers);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "Override", json);
-    }
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["offset"] = offset;
-    result["length"] = length;
-    if (superclassMember != null) {
-      result["superclassMember"] = superclassMember.toJson();
-    }
-    if (interfaceMembers != null) {
-      result["interfaceMembers"] = interfaceMembers
-          .map((OverriddenMember value) => value.toJson())
-          .toList();
-    }
-    return result;
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is Override) {
-      return offset == other.offset &&
-          length == other.length &&
-          superclassMember == other.superclassMember &&
-          listEqual(interfaceMembers, other.interfaceMembers,
-              (OverriddenMember a, OverriddenMember b) => a == b);
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    hash = JenkinsSmiHash.combine(hash, superclassMember.hashCode);
-    hash = JenkinsSmiHash.combine(hash, interfaceMembers.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * OverriddenMember
- *
- * {
- *   "element": Element
- *   "className": String
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class OverriddenMember implements HasToJson {
-  Element _element;
-
-  String _className;
-
-  /**
-   * The element that is being overridden.
-   */
-  Element get element => _element;
-
-  /**
-   * The element that is being overridden.
-   */
-  void set element(Element value) {
-    assert(value != null);
-    this._element = value;
-  }
-
-  /**
-   * The name of the class in which the member is defined.
-   */
-  String get className => _className;
-
-  /**
-   * The name of the class in which the member is defined.
-   */
-  void set className(String value) {
-    assert(value != null);
-    this._className = value;
-  }
-
-  OverriddenMember(Element element, String className) {
-    this.element = element;
-    this.className = className;
-  }
-
-  factory OverriddenMember.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      Element element;
-      if (json.containsKey("element")) {
-        element = new Element.fromJson(
-            jsonDecoder, jsonPath + ".element", json["element"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "element");
-      }
-      String className;
-      if (json.containsKey("className")) {
-        className = jsonDecoder.decodeString(
-            jsonPath + ".className", json["className"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "className");
-      }
-      return new OverriddenMember(element, className);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "OverriddenMember", json);
-    }
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["element"] = element.toJson();
-    result["className"] = className;
-    return result;
-  }
-
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is OverriddenMember) {
-      return element == other.element && className == other.className;
+    if (other is RefactoringMethodParameter) {
+      return id == other.id &&
+          kind == other.kind &&
+          type == other.type &&
+          name == other.name &&
+          parameters == other.parameters;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, element.hashCode);
-    hash = JenkinsSmiHash.combine(hash, className.hashCode);
+    hash = JenkinsSmiHash.combine(hash, id.hashCode);
+    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
+    hash = JenkinsSmiHash.combine(hash, type.hashCode);
+    hash = JenkinsSmiHash.combine(hash, name.hashCode);
+    hash = JenkinsSmiHash.combine(hash, parameters.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * Position
+ * RefactoringMethodParameterKind
  *
- * {
- *   "file": FilePath
- *   "offset": int
+ * enum {
+ *   REQUIRED
+ *   POSITIONAL
+ *   NAMED
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class Position implements HasToJson {
-  String _file;
+class RefactoringMethodParameterKind implements Enum {
+  static const RefactoringMethodParameterKind REQUIRED =
+      const RefactoringMethodParameterKind._("REQUIRED");
 
-  int _offset;
+  static const RefactoringMethodParameterKind POSITIONAL =
+      const RefactoringMethodParameterKind._("POSITIONAL");
+
+  static const RefactoringMethodParameterKind NAMED =
+      const RefactoringMethodParameterKind._("NAMED");
 
   /**
-   * The file containing the position.
+   * A list containing all of the enum values that are defined.
    */
-  String get file => _file;
+  static const List<RefactoringMethodParameterKind> VALUES =
+      const <RefactoringMethodParameterKind>[REQUIRED, POSITIONAL, NAMED];
 
-  /**
-   * The file containing the position.
-   */
-  void set file(String value) {
-    assert(value != null);
-    this._file = value;
+  @override
+  final String name;
+
+  const RefactoringMethodParameterKind._(this.name);
+
+  factory RefactoringMethodParameterKind(String name) {
+    switch (name) {
+      case "REQUIRED":
+        return REQUIRED;
+      case "POSITIONAL":
+        return POSITIONAL;
+      case "NAMED":
+        return NAMED;
+    }
+    throw new Exception('Illegal enum value: $name');
   }
 
-  /**
-   * The offset of the position.
-   */
-  int get offset => _offset;
-
-  /**
-   * The offset of the position.
-   */
-  void set offset(int value) {
-    assert(value != null);
-    this._offset = value;
+  factory RefactoringMethodParameterKind.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json is String) {
+      try {
+        return new RefactoringMethodParameterKind(json);
+      } catch (_) {
+        // Fall through
+      }
+    }
+    throw jsonDecoder.mismatch(
+        jsonPath, "RefactoringMethodParameterKind", json);
   }
 
-  Position(String file, int offset) {
-    this.file = file;
-    this.offset = offset;
+  @override
+  String toString() => "RefactoringMethodParameterKind.$name";
+
+  String toJson() => name;
+}
+
+/**
+ * RefactoringOptions
+ *
+ * {
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class RefactoringOptions implements HasToJson {
+  RefactoringOptions();
+
+  factory RefactoringOptions.fromJson(JsonDecoder jsonDecoder, String jsonPath,
+      Object json, RefactoringKind kind) {
+    return refactoringOptionsFromJson(jsonDecoder, jsonPath, json, kind);
   }
 
-  factory Position.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
-      }
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
-      }
-      return new Position(file, offset);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "Position", json);
-    }
-  }
-
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["file"] = file;
-    result["offset"] = offset;
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is Position) {
-      return file == other.file && offset == other.offset;
+    if (other is RefactoringOptions) {
+      return true;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * PubStatus
+ * RefactoringProblem
  *
  * {
- *   "isListingPackageDirs": bool
+ *   "severity": RefactoringProblemSeverity
+ *   "message": String
+ *   "location": optional Location
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class PubStatus implements HasToJson {
-  bool _isListingPackageDirs;
+class RefactoringProblem implements HasToJson {
+  RefactoringProblemSeverity _severity;
+
+  String _message;
+
+  Location _location;
 
   /**
-   * True if the server is currently running pub to produce a list of package
-   * directories.
+   * The severity of the problem being represented.
    */
-  bool get isListingPackageDirs => _isListingPackageDirs;
+  RefactoringProblemSeverity get severity => _severity;
 
   /**
-   * True if the server is currently running pub to produce a list of package
-   * directories.
+   * The severity of the problem being represented.
    */
-  void set isListingPackageDirs(bool value) {
+  void set severity(RefactoringProblemSeverity value) {
     assert(value != null);
-    this._isListingPackageDirs = value;
+    this._severity = value;
   }
 
-  PubStatus(bool isListingPackageDirs) {
-    this.isListingPackageDirs = isListingPackageDirs;
+  /**
+   * A human-readable description of the problem being represented.
+   */
+  String get message => _message;
+
+  /**
+   * A human-readable description of the problem being represented.
+   */
+  void set message(String value) {
+    assert(value != null);
+    this._message = value;
   }
 
-  factory PubStatus.fromJson(
+  /**
+   * The location of the problem being represented. This field is omitted
+   * unless there is a specific location associated with the problem (such as a
+   * location where an element being renamed will be shadowed).
+   */
+  Location get location => _location;
+
+  /**
+   * The location of the problem being represented. This field is omitted
+   * unless there is a specific location associated with the problem (such as a
+   * location where an element being renamed will be shadowed).
+   */
+  void set location(Location value) {
+    this._location = value;
+  }
+
+  RefactoringProblem(RefactoringProblemSeverity severity, String message,
+      {Location location}) {
+    this.severity = severity;
+    this.message = message;
+    this.location = location;
+  }
+
+  factory RefactoringProblem.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      bool isListingPackageDirs;
-      if (json.containsKey("isListingPackageDirs")) {
-        isListingPackageDirs = jsonDecoder.decodeBool(
-            jsonPath + ".isListingPackageDirs", json["isListingPackageDirs"]);
+      RefactoringProblemSeverity severity;
+      if (json.containsKey("severity")) {
+        severity = new RefactoringProblemSeverity.fromJson(
+            jsonDecoder, jsonPath + ".severity", json["severity"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "isListingPackageDirs");
+        throw jsonDecoder.mismatch(jsonPath, "severity");
       }
-      return new PubStatus(isListingPackageDirs);
+      String message;
+      if (json.containsKey("message")) {
+        message =
+            jsonDecoder.decodeString(jsonPath + ".message", json["message"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "message");
+      }
+      Location location;
+      if (json.containsKey("location")) {
+        location = new Location.fromJson(
+            jsonDecoder, jsonPath + ".location", json["location"]);
+      }
+      return new RefactoringProblem(severity, message, location: location);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "PubStatus", json);
+      throw jsonDecoder.mismatch(jsonPath, "RefactoringProblem", json);
     }
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["isListingPackageDirs"] = isListingPackageDirs;
+    result["severity"] = severity.toJson();
+    result["message"] = message;
+    if (location != null) {
+      result["location"] = location.toJson();
+    }
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is PubStatus) {
-      return isListingPackageDirs == other.isListingPackageDirs;
+    if (other is RefactoringProblem) {
+      return severity == other.severity &&
+          message == other.message &&
+          location == other.location;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, isListingPackageDirs.hashCode);
+    hash = JenkinsSmiHash.combine(hash, severity.hashCode);
+    hash = JenkinsSmiHash.combine(hash, message.hashCode);
+    hash = JenkinsSmiHash.combine(hash, location.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * RefactoringKind
+ * RefactoringProblemSeverity
  *
  * enum {
- *   CONVERT_GETTER_TO_METHOD
- *   CONVERT_METHOD_TO_GETTER
- *   EXTRACT_LOCAL_VARIABLE
- *   EXTRACT_METHOD
- *   INLINE_LOCAL_VARIABLE
- *   INLINE_METHOD
- *   MOVE_FILE
- *   RENAME
- *   SORT_MEMBERS
+ *   INFO
+ *   WARNING
+ *   ERROR
+ *   FATAL
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class RefactoringKind implements Enum {
-  static const RefactoringKind CONVERT_GETTER_TO_METHOD =
-      const RefactoringKind._("CONVERT_GETTER_TO_METHOD");
-
-  static const RefactoringKind CONVERT_METHOD_TO_GETTER =
-      const RefactoringKind._("CONVERT_METHOD_TO_GETTER");
-
-  static const RefactoringKind EXTRACT_LOCAL_VARIABLE =
-      const RefactoringKind._("EXTRACT_LOCAL_VARIABLE");
-
-  static const RefactoringKind EXTRACT_METHOD =
-      const RefactoringKind._("EXTRACT_METHOD");
-
-  static const RefactoringKind INLINE_LOCAL_VARIABLE =
-      const RefactoringKind._("INLINE_LOCAL_VARIABLE");
-
-  static const RefactoringKind INLINE_METHOD =
-      const RefactoringKind._("INLINE_METHOD");
-
-  static const RefactoringKind MOVE_FILE = const RefactoringKind._("MOVE_FILE");
-
-  static const RefactoringKind RENAME = const RefactoringKind._("RENAME");
-
-  static const RefactoringKind SORT_MEMBERS =
-      const RefactoringKind._("SORT_MEMBERS");
+class RefactoringProblemSeverity implements Enum {
+  /**
+   * A minor code problem. No example, because it is not used yet.
+   */
+  static const RefactoringProblemSeverity INFO =
+      const RefactoringProblemSeverity._("INFO");
+
+  /**
+   * A minor code problem. For example names of local variables should be camel
+   * case and start with a lower case letter. Staring the name of a variable
+   * with an upper case is OK from the language point of view, but it is nice
+   * to warn the user.
+   */
+  static const RefactoringProblemSeverity WARNING =
+      const RefactoringProblemSeverity._("WARNING");
+
+  /**
+   * The refactoring technically can be performed, but there is a logical
+   * problem. For example the name of a local variable being extracted
+   * conflicts with another name in the scope, or duplicate parameter names in
+   * the method being extracted, or a conflict between a parameter name and a
+   * local variable, etc. In some cases the location of the problem is also
+   * provided, so the IDE can show user the location and the problem, and let
+   * the user decide whether she wants to perform the refactoring. For example
+   * the name conflict might be expected, and the user wants to fix it
+   * afterwards.
+   */
+  static const RefactoringProblemSeverity ERROR =
+      const RefactoringProblemSeverity._("ERROR");
+
+  /**
+   * A fatal error, which prevents performing the refactoring. For example the
+   * name of a local variable being extracted is not a valid identifier, or
+   * selection is not a valid expression.
+   */
+  static const RefactoringProblemSeverity FATAL =
+      const RefactoringProblemSeverity._("FATAL");
 
   /**
    * A list containing all of the enum values that are defined.
    */
-  static const List<RefactoringKind> VALUES = const <RefactoringKind>[
-    CONVERT_GETTER_TO_METHOD,
-    CONVERT_METHOD_TO_GETTER,
-    EXTRACT_LOCAL_VARIABLE,
-    EXTRACT_METHOD,
-    INLINE_LOCAL_VARIABLE,
-    INLINE_METHOD,
-    MOVE_FILE,
-    RENAME,
-    SORT_MEMBERS
-  ];
-
+  static const List<RefactoringProblemSeverity> VALUES =
+      const <RefactoringProblemSeverity>[INFO, WARNING, ERROR, FATAL];
+
+  @override
   final String name;
 
-  const RefactoringKind._(this.name);
-
-  factory RefactoringKind(String name) {
+  const RefactoringProblemSeverity._(this.name);
+
+  factory RefactoringProblemSeverity(String name) {
     switch (name) {
-      case "CONVERT_GETTER_TO_METHOD":
-        return CONVERT_GETTER_TO_METHOD;
-      case "CONVERT_METHOD_TO_GETTER":
-        return CONVERT_METHOD_TO_GETTER;
-      case "EXTRACT_LOCAL_VARIABLE":
-        return EXTRACT_LOCAL_VARIABLE;
-      case "EXTRACT_METHOD":
-        return EXTRACT_METHOD;
-      case "INLINE_LOCAL_VARIABLE":
-        return INLINE_LOCAL_VARIABLE;
-      case "INLINE_METHOD":
-        return INLINE_METHOD;
-      case "MOVE_FILE":
-        return MOVE_FILE;
-      case "RENAME":
-        return RENAME;
-      case "SORT_MEMBERS":
-        return SORT_MEMBERS;
+      case "INFO":
+        return INFO;
+      case "WARNING":
+        return WARNING;
+      case "ERROR":
+        return ERROR;
+      case "FATAL":
+        return FATAL;
     }
     throw new Exception('Illegal enum value: $name');
   }
 
-  factory RefactoringKind.fromJson(
+  factory RefactoringProblemSeverity.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json is String) {
       try {
-        return new RefactoringKind(json);
+        return new RefactoringProblemSeverity(json);
       } catch (_) {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "RefactoringKind", json);
-  }
-
-  @override
-  String toString() => "RefactoringKind.$name";
+    throw jsonDecoder.mismatch(jsonPath, "RefactoringProblemSeverity", json);
+  }
+
+  /**
+   * Returns the [RefactoringProblemSeverity] with the maximal severity.
+   */
+  static RefactoringProblemSeverity max(
+          RefactoringProblemSeverity a, RefactoringProblemSeverity b) =>
+      maxRefactoringProblemSeverity(a, b);
+
+  @override
+  String toString() => "RefactoringProblemSeverity.$name";
 
   String toJson() => name;
 }
 
 /**
- * RefactoringMethodParameter
+ * RemoveContentOverlay
  *
  * {
- *   "id": optional String
- *   "kind": RefactoringMethodParameterKind
- *   "type": String
- *   "name": String
- *   "parameters": optional String
+ *   "type": "remove"
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class RefactoringMethodParameter implements HasToJson {
-  String _id;
-
-  RefactoringMethodParameterKind _kind;
-
-  String _type;
-
-  String _name;
-
-  String _parameters;
-
-  /**
-   * The unique identifier of the parameter. Clients may omit this field for
-   * the parameters they want to add.
-   */
-  String get id => _id;
-
-  /**
-   * The unique identifier of the parameter. Clients may omit this field for
-   * the parameters they want to add.
-   */
-  void set id(String value) {
-    this._id = value;
-  }
-
-  /**
-   * The kind of the parameter.
-   */
-  RefactoringMethodParameterKind get kind => _kind;
-
-  /**
-   * The kind of the parameter.
-   */
-  void set kind(RefactoringMethodParameterKind value) {
-    assert(value != null);
-    this._kind = value;
-  }
-
-  /**
-   * The type that should be given to the parameter, or the return type of the
-   * parameter's function type.
-   */
-  String get type => _type;
-
-  /**
-   * The type that should be given to the parameter, or the return type of the
-   * parameter's function type.
-   */
-  void set type(String value) {
-    assert(value != null);
-    this._type = value;
-  }
-
-  /**
-   * The name that should be given to the parameter.
-   */
-  String get name => _name;
-
-  /**
-   * The name that should be given to the parameter.
-   */
-  void set name(String value) {
-    assert(value != null);
-    this._name = value;
-  }
-
-  /**
-   * The parameter list of the parameter's function type. If the parameter is
-   * not of a function type, this field will not be defined. If the function
-   * type has zero parameters, this field will have a value of "()".
-   */
-  String get parameters => _parameters;
-
-  /**
-   * The parameter list of the parameter's function type. If the parameter is
-   * not of a function type, this field will not be defined. If the function
-   * type has zero parameters, this field will have a value of "()".
-   */
-  void set parameters(String value) {
-    this._parameters = value;
-  }
-
-  RefactoringMethodParameter(
-      RefactoringMethodParameterKind kind, String type, String name,
-      {String id, String parameters}) {
-    this.id = id;
-    this.kind = kind;
-    this.type = type;
-    this.name = name;
-    this.parameters = parameters;
-  }
-
-  factory RefactoringMethodParameter.fromJson(
+class RemoveContentOverlay implements HasToJson {
+  RemoveContentOverlay();
+
+  factory RemoveContentOverlay.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String id;
-      if (json.containsKey("id")) {
-        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
-      }
-      RefactoringMethodParameterKind kind;
-      if (json.containsKey("kind")) {
-        kind = new RefactoringMethodParameterKind.fromJson(
-            jsonDecoder, jsonPath + ".kind", json["kind"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "kind");
-      }
-      String type;
-      if (json.containsKey("type")) {
-        type = jsonDecoder.decodeString(jsonPath + ".type", json["type"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "type");
-      }
-      String name;
-      if (json.containsKey("name")) {
-        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "name");
-      }
-      String parameters;
-      if (json.containsKey("parameters")) {
-        parameters = jsonDecoder.decodeString(
-            jsonPath + ".parameters", json["parameters"]);
-      }
-      return new RefactoringMethodParameter(kind, type, name,
-          id: id, parameters: parameters);
+      if (json["type"] != "remove") {
+        throw jsonDecoder.mismatch(jsonPath, "equal " + "remove", json);
+      }
+      return new RemoveContentOverlay();
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "RefactoringMethodParameter", json);
-    }
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "RemoveContentOverlay", json);
+    }
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    if (id != null) {
-      result["id"] = id;
-    }
-    result["kind"] = kind.toJson();
-    result["type"] = type;
-    result["name"] = name;
-    if (parameters != null) {
-      result["parameters"] = parameters;
-    }
+    result["type"] = "remove";
     return result;
   }
 
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is RemoveContentOverlay) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, 114870849);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * rename feedback
+ *
+ * {
+ *   "offset": int
+ *   "length": int
+ *   "elementKindName": String
+ *   "oldName": String
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class RenameFeedback extends RefactoringFeedback {
+  int _offset;
+
+  int _length;
+
+  String _elementKindName;
+
+  String _oldName;
+
+  /**
+   * The offset to the beginning of the name selected to be renamed.
+   */
+  int get offset => _offset;
+
+  /**
+   * The offset to the beginning of the name selected to be renamed.
+   */
+  void set offset(int value) {
+    assert(value != null);
+    this._offset = value;
+  }
+
+  /**
+   * The length of the name selected to be renamed.
+   */
+  int get length => _length;
+
+  /**
+   * The length of the name selected to be renamed.
+   */
+  void set length(int value) {
+    assert(value != null);
+    this._length = value;
+  }
+
+  /**
+   * The human-readable description of the kind of element being renamed (such
+   * as "class" or "function type alias").
+   */
+  String get elementKindName => _elementKindName;
+
+  /**
+   * The human-readable description of the kind of element being renamed (such
+   * as "class" or "function type alias").
+   */
+  void set elementKindName(String value) {
+    assert(value != null);
+    this._elementKindName = value;
+  }
+
+  /**
+   * The old name of the element before the refactoring.
+   */
+  String get oldName => _oldName;
+
+  /**
+   * The old name of the element before the refactoring.
+   */
+  void set oldName(String value) {
+    assert(value != null);
+    this._oldName = value;
+  }
+
+  RenameFeedback(
+      int offset, int length, String elementKindName, String oldName) {
+    this.offset = offset;
+    this.length = length;
+    this.elementKindName = elementKindName;
+    this.oldName = oldName;
+  }
+
+  factory RenameFeedback.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offset");
+      }
+      int length;
+      if (json.containsKey("length")) {
+        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "length");
+      }
+      String elementKindName;
+      if (json.containsKey("elementKindName")) {
+        elementKindName = jsonDecoder.decodeString(
+            jsonPath + ".elementKindName", json["elementKindName"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "elementKindName");
+      }
+      String oldName;
+      if (json.containsKey("oldName")) {
+        oldName =
+            jsonDecoder.decodeString(jsonPath + ".oldName", json["oldName"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "oldName");
+      }
+      return new RenameFeedback(offset, length, elementKindName, oldName);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "rename feedback", json);
+    }
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["offset"] = offset;
+    result["length"] = length;
+    result["elementKindName"] = elementKindName;
+    result["oldName"] = oldName;
+    return result;
+  }
+
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is RefactoringMethodParameter) {
-      return id == other.id &&
-          kind == other.kind &&
-          type == other.type &&
-          name == other.name &&
-          parameters == other.parameters;
+    if (other is RenameFeedback) {
+      return offset == other.offset &&
+          length == other.length &&
+          elementKindName == other.elementKindName &&
+          oldName == other.oldName;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, id.hashCode);
-    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
-    hash = JenkinsSmiHash.combine(hash, type.hashCode);
-    hash = JenkinsSmiHash.combine(hash, name.hashCode);
-    hash = JenkinsSmiHash.combine(hash, parameters.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, length.hashCode);
+    hash = JenkinsSmiHash.combine(hash, elementKindName.hashCode);
+    hash = JenkinsSmiHash.combine(hash, oldName.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * RefactoringFeedback
+ * rename options
  *
  * {
+ *   "newName": String
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class RefactoringFeedback implements HasToJson {
-  RefactoringFeedback();
+class RenameOptions extends RefactoringOptions {
+  String _newName;
 
-  factory RefactoringFeedback.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json, Map responseJson) {
-    return refactoringFeedbackFromJson(
-        jsonDecoder, jsonPath, json, responseJson);
+  /**
+   * The name that the element should have after the refactoring.
+   */
+  String get newName => _newName;
+
+  /**
+   * The name that the element should have after the refactoring.
+   */
+  void set newName(String value) {
+    assert(value != null);
+    this._newName = value;
   }
 
+  RenameOptions(String newName) {
+    this.newName = newName;
+  }
+
+  factory RenameOptions.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String newName;
+      if (json.containsKey("newName")) {
+        newName =
+            jsonDecoder.decodeString(jsonPath + ".newName", json["newName"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "newName");
+      }
+      return new RenameOptions(newName);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "rename options", json);
+    }
+  }
+
+  factory RenameOptions.fromRefactoringParams(
+      EditGetRefactoringParams refactoringParams, Request request) {
+    return new RenameOptions.fromJson(
+        new RequestDecoder(request), "options", refactoringParams.options);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
+    result["newName"] = newName;
     return result;
   }
 
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is RefactoringFeedback) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * RefactoringOptions
- *
- * {
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class RefactoringOptions implements HasToJson {
-  RefactoringOptions();
-
-  factory RefactoringOptions.fromJson(JsonDecoder jsonDecoder, String jsonPath,
-      Object json, RefactoringKind kind) {
-    return refactoringOptionsFromJson(jsonDecoder, jsonPath, json, kind);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    return result;
-  }
-
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is RefactoringOptions) {
-      return true;
+    if (other is RenameOptions) {
+      return newName == other.newName;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, newName.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * RefactoringMethodParameterKind
+ * RequestError
  *
- * enum {
- *   REQUIRED
- *   POSITIONAL
- *   NAMED
+ * {
+ *   "code": RequestErrorCode
+ *   "message": String
+ *   "stackTrace": optional String
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class RefactoringMethodParameterKind implements Enum {
-  static const RefactoringMethodParameterKind REQUIRED =
-      const RefactoringMethodParameterKind._("REQUIRED");
-
-  static const RefactoringMethodParameterKind POSITIONAL =
-      const RefactoringMethodParameterKind._("POSITIONAL");
-
-  static const RefactoringMethodParameterKind NAMED =
-      const RefactoringMethodParameterKind._("NAMED");
-
-  /**
-   * A list containing all of the enum values that are defined.
-   */
-  static const List<RefactoringMethodParameterKind> VALUES =
-      const <RefactoringMethodParameterKind>[REQUIRED, POSITIONAL, NAMED];
-
-  final String name;
-
-  const RefactoringMethodParameterKind._(this.name);
-
-  factory RefactoringMethodParameterKind(String name) {
-    switch (name) {
-      case "REQUIRED":
-        return REQUIRED;
-      case "POSITIONAL":
-        return POSITIONAL;
-      case "NAMED":
-        return NAMED;
-    }
-    throw new Exception('Illegal enum value: $name');
-  }
-
-  factory RefactoringMethodParameterKind.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json is String) {
-      try {
-        return new RefactoringMethodParameterKind(json);
-      } catch (_) {
-        // Fall through
-      }
-    }
-    throw jsonDecoder.mismatch(
-        jsonPath, "RefactoringMethodParameterKind", json);
-  }
-
-  @override
-  String toString() => "RefactoringMethodParameterKind.$name";
-
-  String toJson() => name;
-}
-
-/**
- * RefactoringProblem
- *
- * {
- *   "severity": RefactoringProblemSeverity
- *   "message": String
- *   "location": optional Location
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class RefactoringProblem implements HasToJson {
-  RefactoringProblemSeverity _severity;
+class RequestError implements HasToJson {
+  RequestErrorCode _code;
 
   String _message;
 
-  Location _location;
+  String _stackTrace;
 
   /**
-   * The severity of the problem being represented.
+   * A code that uniquely identifies the error that occurred.
    */
-  RefactoringProblemSeverity get severity => _severity;
+  RequestErrorCode get code => _code;
 
   /**
-   * The severity of the problem being represented.
+   * A code that uniquely identifies the error that occurred.
    */
-  void set severity(RefactoringProblemSeverity value) {
+  void set code(RequestErrorCode value) {
     assert(value != null);
-    this._severity = value;
+    this._code = value;
   }
 
   /**
-   * A human-readable description of the problem being represented.
+   * A short description of the error.
    */
   String get message => _message;
 
   /**
-   * A human-readable description of the problem being represented.
+   * A short description of the error.
    */
   void set message(String value) {
     assert(value != null);
     this._message = value;
   }
 
   /**
-   * The location of the problem being represented. This field is omitted
-   * unless there is a specific location associated with the problem (such as a
-   * location where an element being renamed will be shadowed).
+   * The stack trace associated with processing the request, used for debugging
+   * the server.
    */
-  Location get location => _location;
+  String get stackTrace => _stackTrace;
 
   /**
-   * The location of the problem being represented. This field is omitted
-   * unless there is a specific location associated with the problem (such as a
-   * location where an element being renamed will be shadowed).
+   * The stack trace associated with processing the request, used for debugging
+   * the server.
    */
-  void set location(Location value) {
-    this._location = value;
+  void set stackTrace(String value) {
+    this._stackTrace = value;
   }
 
-  RefactoringProblem(RefactoringProblemSeverity severity, String message,
-      {Location location}) {
-    this.severity = severity;
+  RequestError(RequestErrorCode code, String message, {String stackTrace}) {
+    this.code = code;
     this.message = message;
-    this.location = location;
+    this.stackTrace = stackTrace;
   }
 
-  factory RefactoringProblem.fromJson(
+  factory RequestError.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      RefactoringProblemSeverity severity;
-      if (json.containsKey("severity")) {
-        severity = new RefactoringProblemSeverity.fromJson(
-            jsonDecoder, jsonPath + ".severity", json["severity"]);
+      RequestErrorCode code;
+      if (json.containsKey("code")) {
+        code = new RequestErrorCode.fromJson(
+            jsonDecoder, jsonPath + ".code", json["code"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "severity");
+        throw jsonDecoder.mismatch(jsonPath, "code");
       }
       String message;
       if (json.containsKey("message")) {
         message =
             jsonDecoder.decodeString(jsonPath + ".message", json["message"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "message");
+        throw jsonDecoder.mismatch(jsonPath, "message");
       }
-      Location location;
-      if (json.containsKey("location")) {
-        location = new Location.fromJson(
-            jsonDecoder, jsonPath + ".location", json["location"]);
+      String stackTrace;
+      if (json.containsKey("stackTrace")) {
+        stackTrace = jsonDecoder.decodeString(
+            jsonPath + ".stackTrace", json["stackTrace"]);
       }
-      return new RefactoringProblem(severity, message, location: location);
+      return new RequestError(code, message, stackTrace: stackTrace);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "RefactoringProblem", json);
+      throw jsonDecoder.mismatch(jsonPath, "RequestError", json);
     }
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["severity"] = severity.toJson();
+    result["code"] = code.toJson();
     result["message"] = message;
-    if (location != null) {
-      result["location"] = location.toJson();
+    if (stackTrace != null) {
+      result["stackTrace"] = stackTrace;
     }
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is RefactoringProblem) {
-      return severity == other.severity &&
+    if (other is RequestError) {
+      return code == other.code &&
           message == other.message &&
-          location == other.location;
+          stackTrace == other.stackTrace;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, severity.hashCode);
+    hash = JenkinsSmiHash.combine(hash, code.hashCode);
     hash = JenkinsSmiHash.combine(hash, message.hashCode);
-    hash = JenkinsSmiHash.combine(hash, location.hashCode);
+    hash = JenkinsSmiHash.combine(hash, stackTrace.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * RefactoringProblemSeverity
+ * RequestErrorCode
  *
  * enum {
- *   INFO
- *   WARNING
- *   ERROR
- *   FATAL
+ *   CONTENT_MODIFIED
+ *   DEBUG_PORT_COULD_NOT_BE_OPENED
+ *   FILE_NOT_ANALYZED
+ *   FORMAT_INVALID_FILE
+ *   FORMAT_WITH_ERRORS
+ *   GET_ERRORS_INVALID_FILE
+ *   GET_NAVIGATION_INVALID_FILE
+ *   GET_REACHABLE_SOURCES_INVALID_FILE
+ *   INVALID_ANALYSIS_ROOT
+ *   INVALID_EXECUTION_CONTEXT
+ *   INVALID_FILE_PATH_FORMAT
+ *   INVALID_OVERLAY_CHANGE
+ *   INVALID_PARAMETER
+ *   INVALID_REQUEST
+ *   NO_INDEX_GENERATED
+ *   ORGANIZE_DIRECTIVES_ERROR
+ *   REFACTORING_REQUEST_CANCELLED
+ *   SERVER_ALREADY_STARTED
+ *   SERVER_ERROR
+ *   SORT_MEMBERS_INVALID_FILE
+ *   SORT_MEMBERS_PARSE_ERRORS
+ *   UNANALYZED_PRIORITY_FILES
+ *   UNKNOWN_REQUEST
+ *   UNKNOWN_SOURCE
+ *   UNSUPPORTED_FEATURE
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class RefactoringProblemSeverity implements Enum {
-  /**
-   * A minor code problem. No example, because it is not used yet.
-   */
-  static const RefactoringProblemSeverity INFO =
-      const RefactoringProblemSeverity._("INFO");
-
-  /**
-   * A minor code problem. For example names of local variables should be camel
-   * case and start with a lower case letter. Staring the name of a variable
-   * with an upper case is OK from the language point of view, but it is nice
-   * to warn the user.
-   */
-  static const RefactoringProblemSeverity WARNING =
-      const RefactoringProblemSeverity._("WARNING");
-
-  /**
-   * The refactoring technically can be performed, but there is a logical
-   * problem. For example the name of a local variable being extracted
-   * conflicts with another name in the scope, or duplicate parameter names in
-   * the method being extracted, or a conflict between a parameter name and a
-   * local variable, etc. In some cases the location of the problem is also
-   * provided, so the IDE can show user the location and the problem, and let
-   * the user decide whether she wants to perform the refactoring. For example
-   * the name conflict might be expected, and the user wants to fix it
-   * afterwards.
-   */
-  static const RefactoringProblemSeverity ERROR =
-      const RefactoringProblemSeverity._("ERROR");
-
-  /**
-   * A fatal error, which prevents performing the refactoring. For example the
-   * name of a local variable being extracted is not a valid identifier, or
-   * selection is not a valid expression.
-   */
-  static const RefactoringProblemSeverity FATAL =
-      const RefactoringProblemSeverity._("FATAL");
+class RequestErrorCode implements Enum {
+  /**
+   * An "analysis.getErrors" or "analysis.getNavigation" request could not be
+   * satisfied because the content of the file changed before the requested
+   * results could be computed.
+   */
+  static const RequestErrorCode CONTENT_MODIFIED =
+      const RequestErrorCode._("CONTENT_MODIFIED");
+
+  /**
+   * The server was unable to open a port for the diagnostic server.
+   */
+  static const RequestErrorCode DEBUG_PORT_COULD_NOT_BE_OPENED =
+      const RequestErrorCode._("DEBUG_PORT_COULD_NOT_BE_OPENED");
+
+  /**
+   * A request specified a FilePath which does not match a file in an analysis
+   * root, or the requested operation is not available for the file.
+   */
+  static const RequestErrorCode FILE_NOT_ANALYZED =
+      const RequestErrorCode._("FILE_NOT_ANALYZED");
+
+  /**
+   * An "edit.format" request specified a FilePath which does not match a Dart
+   * file in an analysis root.
+   */
+  static const RequestErrorCode FORMAT_INVALID_FILE =
+      const RequestErrorCode._("FORMAT_INVALID_FILE");
+
+  /**
+   * An "edit.format" request specified a file that contains syntax errors.
+   */
+  static const RequestErrorCode FORMAT_WITH_ERRORS =
+      const RequestErrorCode._("FORMAT_WITH_ERRORS");
+
+  /**
+   * An "analysis.getErrors" request specified a FilePath which does not match
+   * a file currently subject to analysis.
+   */
+  static const RequestErrorCode GET_ERRORS_INVALID_FILE =
+      const RequestErrorCode._("GET_ERRORS_INVALID_FILE");
+
+  /**
+   * An "analysis.getNavigation" request specified a FilePath which does not
+   * match a file currently subject to analysis.
+   */
+  static const RequestErrorCode GET_NAVIGATION_INVALID_FILE =
+      const RequestErrorCode._("GET_NAVIGATION_INVALID_FILE");
+
+  /**
+   * An "analysis.getReachableSources" request specified a FilePath which does
+   * not match a file currently subject to analysis.
+   */
+  static const RequestErrorCode GET_REACHABLE_SOURCES_INVALID_FILE =
+      const RequestErrorCode._("GET_REACHABLE_SOURCES_INVALID_FILE");
+
+  /**
+   * A path passed as an argument to a request (such as analysis.reanalyze) is
+   * required to be an analysis root, but isn't.
+   */
+  static const RequestErrorCode INVALID_ANALYSIS_ROOT =
+      const RequestErrorCode._("INVALID_ANALYSIS_ROOT");
+
+  /**
+   * The context root used to create an execution context does not exist.
+   */
+  static const RequestErrorCode INVALID_EXECUTION_CONTEXT =
+      const RequestErrorCode._("INVALID_EXECUTION_CONTEXT");
+
+  /**
+   * The format of the given file path is invalid, e.g. is not absolute and
+   * normalized.
+   */
+  static const RequestErrorCode INVALID_FILE_PATH_FORMAT =
+      const RequestErrorCode._("INVALID_FILE_PATH_FORMAT");
+
+  /**
+   * An "analysis.updateContent" request contained a ChangeContentOverlay
+   * object which can't be applied, due to an edit having an offset or length
+   * that is out of range.
+   */
+  static const RequestErrorCode INVALID_OVERLAY_CHANGE =
+      const RequestErrorCode._("INVALID_OVERLAY_CHANGE");
+
+  /**
+   * One of the method parameters was invalid.
+   */
+  static const RequestErrorCode INVALID_PARAMETER =
+      const RequestErrorCode._("INVALID_PARAMETER");
+
+  /**
+   * A malformed request was received.
+   */
+  static const RequestErrorCode INVALID_REQUEST =
+      const RequestErrorCode._("INVALID_REQUEST");
+
+  /**
+   * The "--no-index" flag was passed when the analysis server created, but
+   * this API call requires an index to have been generated.
+   */
+  static const RequestErrorCode NO_INDEX_GENERATED =
+      const RequestErrorCode._("NO_INDEX_GENERATED");
+
+  /**
+   * An "edit.organizeDirectives" request specified a Dart file that cannot be
+   * analyzed. The reason is described in the message.
+   */
+  static const RequestErrorCode ORGANIZE_DIRECTIVES_ERROR =
+      const RequestErrorCode._("ORGANIZE_DIRECTIVES_ERROR");
+
+  /**
+   * Another refactoring request was received during processing of this one.
+   */
+  static const RequestErrorCode REFACTORING_REQUEST_CANCELLED =
+      const RequestErrorCode._("REFACTORING_REQUEST_CANCELLED");
+
+  /**
+   * The analysis server has already been started (and hence won't accept new
+   * connections).
+   *
+   * This error is included for future expansion; at present the analysis
+   * server can only speak to one client at a time so this error will never
+   * occur.
+   */
+  static const RequestErrorCode SERVER_ALREADY_STARTED =
+      const RequestErrorCode._("SERVER_ALREADY_STARTED");
+
+  /**
+   * An internal error occurred in the analysis server. Also see the
+   * server.error notification.
+   */
+  static const RequestErrorCode SERVER_ERROR =
+      const RequestErrorCode._("SERVER_ERROR");
+
+  /**
+   * An "edit.sortMembers" request specified a FilePath which does not match a
+   * Dart file in an analysis root.
+   */
+  static const RequestErrorCode SORT_MEMBERS_INVALID_FILE =
+      const RequestErrorCode._("SORT_MEMBERS_INVALID_FILE");
+
+  /**
+   * An "edit.sortMembers" request specified a Dart file that has scan or parse
+   * errors.
+   */
+  static const RequestErrorCode SORT_MEMBERS_PARSE_ERRORS =
+      const RequestErrorCode._("SORT_MEMBERS_PARSE_ERRORS");
+
+  /**
+   * An "analysis.setPriorityFiles" request includes one or more files that are
+   * not being analyzed.
+   *
+   * This is a legacy error; it will be removed before the API reaches version
+   * 1.0.
+   */
+  static const RequestErrorCode UNANALYZED_PRIORITY_FILES =
+      const RequestErrorCode._("UNANALYZED_PRIORITY_FILES");
+
+  /**
+   * A request was received which the analysis server does not recognize, or
+   * cannot handle in its current configuration.
+   */
+  static const RequestErrorCode UNKNOWN_REQUEST =
+      const RequestErrorCode._("UNKNOWN_REQUEST");
+
+  /**
+   * The analysis server was requested to perform an action on a source that
+   * does not exist.
+   */
+  static const RequestErrorCode UNKNOWN_SOURCE =
+      const RequestErrorCode._("UNKNOWN_SOURCE");
+
+  /**
+   * The analysis server was requested to perform an action which is not
+   * supported.
+   *
+   * This is a legacy error; it will be removed before the API reaches version
+   * 1.0.
+   */
+  static const RequestErrorCode UNSUPPORTED_FEATURE =
+      const RequestErrorCode._("UNSUPPORTED_FEATURE");
 
   /**
    * A list containing all of the enum values that are defined.
    */
-  static const List<RefactoringProblemSeverity> VALUES =
-      const <RefactoringProblemSeverity>[INFO, WARNING, ERROR, FATAL];
-
+  static const List<RequestErrorCode> VALUES = const <RequestErrorCode>[
+    CONTENT_MODIFIED,
+    DEBUG_PORT_COULD_NOT_BE_OPENED,
+    FILE_NOT_ANALYZED,
+    FORMAT_INVALID_FILE,
+    FORMAT_WITH_ERRORS,
+    GET_ERRORS_INVALID_FILE,
+    GET_NAVIGATION_INVALID_FILE,
+    GET_REACHABLE_SOURCES_INVALID_FILE,
+    INVALID_ANALYSIS_ROOT,
+    INVALID_EXECUTION_CONTEXT,
+    INVALID_FILE_PATH_FORMAT,
+    INVALID_OVERLAY_CHANGE,
+    INVALID_PARAMETER,
+    INVALID_REQUEST,
+    NO_INDEX_GENERATED,
+    ORGANIZE_DIRECTIVES_ERROR,
+    REFACTORING_REQUEST_CANCELLED,
+    SERVER_ALREADY_STARTED,
+    SERVER_ERROR,
+    SORT_MEMBERS_INVALID_FILE,
+    SORT_MEMBERS_PARSE_ERRORS,
+    UNANALYZED_PRIORITY_FILES,
+    UNKNOWN_REQUEST,
+    UNKNOWN_SOURCE,
+    UNSUPPORTED_FEATURE
+  ];
+
+  @override
   final String name;
 
-  const RefactoringProblemSeverity._(this.name);
-
-  factory RefactoringProblemSeverity(String name) {
+  const RequestErrorCode._(this.name);
+
+  factory RequestErrorCode(String name) {
     switch (name) {
-      case "INFO":
-        return INFO;
-      case "WARNING":
-        return WARNING;
-      case "ERROR":
-        return ERROR;
-      case "FATAL":
-        return FATAL;
+      case "CONTENT_MODIFIED":
+        return CONTENT_MODIFIED;
+      case "DEBUG_PORT_COULD_NOT_BE_OPENED":
+        return DEBUG_PORT_COULD_NOT_BE_OPENED;
+      case "FILE_NOT_ANALYZED":
+        return FILE_NOT_ANALYZED;
+      case "FORMAT_INVALID_FILE":
+        return FORMAT_INVALID_FILE;
+      case "FORMAT_WITH_ERRORS":
+        return FORMAT_WITH_ERRORS;
+      case "GET_ERRORS_INVALID_FILE":
+        return GET_ERRORS_INVALID_FILE;
+      case "GET_NAVIGATION_INVALID_FILE":
+        return GET_NAVIGATION_INVALID_FILE;
+      case "GET_REACHABLE_SOURCES_INVALID_FILE":
+        return GET_REACHABLE_SOURCES_INVALID_FILE;
+      case "INVALID_ANALYSIS_ROOT":
+        return INVALID_ANALYSIS_ROOT;
+      case "INVALID_EXECUTION_CONTEXT":
+        return INVALID_EXECUTION_CONTEXT;
+      case "INVALID_FILE_PATH_FORMAT":
+        return INVALID_FILE_PATH_FORMAT;
+      case "INVALID_OVERLAY_CHANGE":
+        return INVALID_OVERLAY_CHANGE;
+      case "INVALID_PARAMETER":
+        return INVALID_PARAMETER;
+      case "INVALID_REQUEST":
+        return INVALID_REQUEST;
+      case "NO_INDEX_GENERATED":
+        return NO_INDEX_GENERATED;
+      case "ORGANIZE_DIRECTIVES_ERROR":
+        return ORGANIZE_DIRECTIVES_ERROR;
+      case "REFACTORING_REQUEST_CANCELLED":
+        return REFACTORING_REQUEST_CANCELLED;
+      case "SERVER_ALREADY_STARTED":
+        return SERVER_ALREADY_STARTED;
+      case "SERVER_ERROR":
+        return SERVER_ERROR;
+      case "SORT_MEMBERS_INVALID_FILE":
+        return SORT_MEMBERS_INVALID_FILE;
+      case "SORT_MEMBERS_PARSE_ERRORS":
+        return SORT_MEMBERS_PARSE_ERRORS;
+      case "UNANALYZED_PRIORITY_FILES":
+        return UNANALYZED_PRIORITY_FILES;
+      case "UNKNOWN_REQUEST":
+        return UNKNOWN_REQUEST;
+      case "UNKNOWN_SOURCE":
+        return UNKNOWN_SOURCE;
+      case "UNSUPPORTED_FEATURE":
+        return UNSUPPORTED_FEATURE;
     }
     throw new Exception('Illegal enum value: $name');
   }
 
-  factory RefactoringProblemSeverity.fromJson(
+  factory RequestErrorCode.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json is String) {
       try {
-        return new RefactoringProblemSeverity(json);
+        return new RequestErrorCode(json);
       } catch (_) {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "RefactoringProblemSeverity", json);
-  }
-
-  /**
-   * Returns the [RefactoringProblemSeverity] with the maximal severity.
-   */
-  static RefactoringProblemSeverity max(
-          RefactoringProblemSeverity a, RefactoringProblemSeverity b) =>
-      maxRefactoringProblemSeverity(a, b);
-
-  @override
-  String toString() => "RefactoringProblemSeverity.$name";
+    throw jsonDecoder.mismatch(jsonPath, "RequestErrorCode", json);
+  }
+
+  @override
+  String toString() => "RequestErrorCode.$name";
 
   String toJson() => name;
 }
 
 /**
- * RemoveContentOverlay
+ * search.findElementReferences params
  *
  * {
- *   "type": "remove"
+ *   "file": FilePath
+ *   "offset": int
+ *   "includePotential": bool
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class RemoveContentOverlay implements HasToJson {
-  RemoveContentOverlay();
-
-  factory RemoveContentOverlay.fromJson(
+class SearchFindElementReferencesParams implements RequestParams {
+  String _file;
+
+  int _offset;
+
+  bool _includePotential;
+
+  /**
+   * The file containing the declaration of or reference to the element used to
+   * define the search.
+   */
+  String get file => _file;
+
+  /**
+   * The file containing the declaration of or reference to the element used to
+   * define the search.
+   */
+  void set file(String value) {
+    assert(value != null);
+    this._file = value;
+  }
+
+  /**
+   * The offset within the file of the declaration of or reference to the
+   * element.
+   */
+  int get offset => _offset;
+
+  /**
+   * The offset within the file of the declaration of or reference to the
+   * element.
+   */
+  void set offset(int value) {
+    assert(value != null);
+    this._offset = value;
+  }
+
+  /**
+   * True if potential matches are to be included in the results.
+   */
+  bool get includePotential => _includePotential;
+
+  /**
+   * True if potential matches are to be included in the results.
+   */
+  void set includePotential(bool value) {
+    assert(value != null);
+    this._includePotential = value;
+  }
+
+  SearchFindElementReferencesParams(
+      String file, int offset, bool includePotential) {
+    this.file = file;
+    this.offset = offset;
+    this.includePotential = includePotential;
+  }
+
+  factory SearchFindElementReferencesParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      if (json["type"] != "remove") {
-        throw jsonDecoder.mismatch(jsonPath, "equal " + "remove", json);
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      return new RemoveContentOverlay();
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "offset");
+      }
+      bool includePotential;
+      if (json.containsKey("includePotential")) {
+        includePotential = jsonDecoder.decodeBool(
+            jsonPath + ".includePotential", json["includePotential"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "includePotential");
+      }
+      return new SearchFindElementReferencesParams(
+          file, offset, includePotential);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "RemoveContentOverlay", json);
+      throw jsonDecoder.mismatch(
+          jsonPath, "search.findElementReferences params", json);
     }
   }
 
+  factory SearchFindElementReferencesParams.fromRequest(Request request) {
+    return new SearchFindElementReferencesParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["type"] = "remove";
+    result["file"] = file;
+    result["offset"] = offset;
+    result["includePotential"] = includePotential;
     return result;
   }
 
   @override
+  Request toRequest(String id) {
+    return new Request(id, "search.findElementReferences", toJson());
+  }
+
+  @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is RemoveContentOverlay) {
-      return true;
+    if (other is SearchFindElementReferencesParams) {
+      return file == other.file &&
+          offset == other.offset &&
+          includePotential == other.includePotential;
     }
     return false;
   }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, 114870849);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * RequestError
- *
- * {
- *   "code": RequestErrorCode
- *   "message": String
- *   "stackTrace": optional String
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class RequestError implements HasToJson {
-  RequestErrorCode _code;
-
-  String _message;
-
-  String _stackTrace;
-
-  /**
-   * A code that uniquely identifies the error that occurred.
-   */
-  RequestErrorCode get code => _code;
-
-  /**
-   * A code that uniquely identifies the error that occurred.
-   */
-  void set code(RequestErrorCode value) {
-    assert(value != null);
-    this._code = value;
-  }
-
-  /**
-   * A short description of the error.
-   */
-  String get message => _message;
-
-  /**
-   * A short description of the error.
-   */
-  void set message(String value) {
-    assert(value != null);
-    this._message = value;
-  }
-
-  /**
-   * The stack trace associated with processing the request, used for debugging
-   * the server.
-   */
-  String get stackTrace => _stackTrace;
-
-  /**
-   * The stack trace associated with processing the request, used for debugging
-   * the server.
-   */
-  void set stackTrace(String value) {
-    this._stackTrace = value;
-  }
-
-  RequestError(RequestErrorCode code, String message, {String stackTrace}) {
-    this.code = code;
-    this.message = message;
-    this.stackTrace = stackTrace;
-  }
-
-  factory RequestError.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      RequestErrorCode code;
-      if (json.containsKey("code")) {
-        code = new RequestErrorCode.fromJson(
-            jsonDecoder, jsonPath + ".code", json["code"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "code");
-      }
-      String message;
-      if (json.containsKey("message")) {
-        message =
-            jsonDecoder.decodeString(jsonPath + ".message", json["message"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "message");
-      }
-      String stackTrace;
-      if (json.containsKey("stackTrace")) {
-        stackTrace = jsonDecoder.decodeString(
-            jsonPath + ".stackTrace", json["stackTrace"]);
-      }
-      return new RequestError(code, message, stackTrace: stackTrace);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "RequestError", json);
-    }
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["code"] = code.toJson();
-    result["message"] = message;
-    if (stackTrace != null) {
-      result["stackTrace"] = stackTrace;
-    }
-    return result;
-  }
-
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is RequestError) {
-      return code == other.code &&
-          message == other.message &&
-          stackTrace == other.stackTrace;
-    }
-    return false;
-  }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, code.hashCode);
-    hash = JenkinsSmiHash.combine(hash, message.hashCode);
-    hash = JenkinsSmiHash.combine(hash, stackTrace.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, includePotential.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * RequestErrorCode
- *
- * enum {
- *   CONTENT_MODIFIED
- *   DEBUG_PORT_COULD_NOT_BE_OPENED
- *   FILE_NOT_ANALYZED
- *   FORMAT_INVALID_FILE
- *   FORMAT_WITH_ERRORS
- *   GET_ERRORS_INVALID_FILE
- *   GET_NAVIGATION_INVALID_FILE
- *   GET_REACHABLE_SOURCES_INVALID_FILE
- *   INVALID_ANALYSIS_ROOT
- *   INVALID_EXECUTION_CONTEXT
- *   INVALID_FILE_PATH_FORMAT
- *   INVALID_OVERLAY_CHANGE
- *   INVALID_PARAMETER
- *   INVALID_REQUEST
- *   NO_INDEX_GENERATED
- *   ORGANIZE_DIRECTIVES_ERROR
- *   REFACTORING_REQUEST_CANCELLED
- *   SERVER_ALREADY_STARTED
- *   SERVER_ERROR
- *   SORT_MEMBERS_INVALID_FILE
- *   SORT_MEMBERS_PARSE_ERRORS
- *   UNANALYZED_PRIORITY_FILES
- *   UNKNOWN_REQUEST
- *   UNKNOWN_SOURCE
- *   UNSUPPORTED_FEATURE
+ * search.findElementReferences result
+ *
+ * {
+ *   "id": optional SearchId
+ *   "element": optional Element
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class RequestErrorCode implements Enum {
-  /**
-   * An "analysis.getErrors" or "analysis.getNavigation" request could not be
-   * satisfied because the content of the file changed before the requested
-   * results could be computed.
-   */
-  static const RequestErrorCode CONTENT_MODIFIED =
-      const RequestErrorCode._("CONTENT_MODIFIED");
-
-  /**
-   * The server was unable to open a port for the diagnostic server.
-   */
-  static const RequestErrorCode DEBUG_PORT_COULD_NOT_BE_OPENED =
-      const RequestErrorCode._("DEBUG_PORT_COULD_NOT_BE_OPENED");
-
-  /**
-   * A request specified a FilePath which does not match a file in an analysis
-   * root, or the requested operation is not available for the file.
-   */
-  static const RequestErrorCode FILE_NOT_ANALYZED =
-      const RequestErrorCode._("FILE_NOT_ANALYZED");
-
-  /**
-   * An "edit.format" request specified a FilePath which does not match a Dart
-   * file in an analysis root.
-   */
-  static const RequestErrorCode FORMAT_INVALID_FILE =
-      const RequestErrorCode._("FORMAT_INVALID_FILE");
-
-  /**
-   * An "edit.format" request specified a file that contains syntax errors.
-   */
-  static const RequestErrorCode FORMAT_WITH_ERRORS =
-      const RequestErrorCode._("FORMAT_WITH_ERRORS");
-
-  /**
-   * An "analysis.getErrors" request specified a FilePath which does not match
-   * a file currently subject to analysis.
-   */
-  static const RequestErrorCode GET_ERRORS_INVALID_FILE =
-      const RequestErrorCode._("GET_ERRORS_INVALID_FILE");
-
-  /**
-   * An "analysis.getNavigation" request specified a FilePath which does not
-   * match a file currently subject to analysis.
-   */
-  static const RequestErrorCode GET_NAVIGATION_INVALID_FILE =
-      const RequestErrorCode._("GET_NAVIGATION_INVALID_FILE");
-
-  /**
-   * An "analysis.getReachableSources" request specified a FilePath which does
-   * not match a file currently subject to analysis.
-   */
-  static const RequestErrorCode GET_REACHABLE_SOURCES_INVALID_FILE =
-      const RequestErrorCode._("GET_REACHABLE_SOURCES_INVALID_FILE");
-
-  /**
-   * A path passed as an argument to a request (such as analysis.reanalyze) is
-   * required to be an analysis root, but isn't.
-   */
-  static const RequestErrorCode INVALID_ANALYSIS_ROOT =
-      const RequestErrorCode._("INVALID_ANALYSIS_ROOT");
-
-  /**
-   * The context root used to create an execution context does not exist.
-   */
-  static const RequestErrorCode INVALID_EXECUTION_CONTEXT =
-      const RequestErrorCode._("INVALID_EXECUTION_CONTEXT");
-
-  /**
-   * The format of the given file path is invalid, e.g. is not absolute and
-   * normalized.
-   */
-  static const RequestErrorCode INVALID_FILE_PATH_FORMAT =
-      const RequestErrorCode._("INVALID_FILE_PATH_FORMAT");
-
-  /**
-   * An "analysis.updateContent" request contained a ChangeContentOverlay
-   * object which can't be applied, due to an edit having an offset or length
-   * that is out of range.
-   */
-  static const RequestErrorCode INVALID_OVERLAY_CHANGE =
-      const RequestErrorCode._("INVALID_OVERLAY_CHANGE");
-
-  /**
-   * One of the method parameters was invalid.
-   */
-  static const RequestErrorCode INVALID_PARAMETER =
-      const RequestErrorCode._("INVALID_PARAMETER");
-
-  /**
-   * A malformed request was received.
-   */
-  static const RequestErrorCode INVALID_REQUEST =
-      const RequestErrorCode._("INVALID_REQUEST");
-
-  /**
-   * The "--no-index" flag was passed when the analysis server created, but
-   * this API call requires an index to have been generated.
-   */
-  static const RequestErrorCode NO_INDEX_GENERATED =
-      const RequestErrorCode._("NO_INDEX_GENERATED");
-
-  /**
-   * An "edit.organizeDirectives" request specified a Dart file that cannot be
-   * analyzed. The reason is described in the message.
-   */
-  static const RequestErrorCode ORGANIZE_DIRECTIVES_ERROR =
-      const RequestErrorCode._("ORGANIZE_DIRECTIVES_ERROR");
-
-  /**
-   * Another refactoring request was received during processing of this one.
-   */
-  static const RequestErrorCode REFACTORING_REQUEST_CANCELLED =
-      const RequestErrorCode._("REFACTORING_REQUEST_CANCELLED");
-
-  /**
-   * The analysis server has already been started (and hence won't accept new
-   * connections).
-   *
-   * This error is included for future expansion; at present the analysis
-   * server can only speak to one client at a time so this error will never
-   * occur.
-   */
-  static const RequestErrorCode SERVER_ALREADY_STARTED =
-      const RequestErrorCode._("SERVER_ALREADY_STARTED");
-
-  /**
-   * An internal error occurred in the analysis server. Also see the
-   * server.error notification.
-   */
-  static const RequestErrorCode SERVER_ERROR =
-      const RequestErrorCode._("SERVER_ERROR");
-
-  /**
-   * An "edit.sortMembers" request specified a FilePath which does not match a
-   * Dart file in an analysis root.
-   */
-  static const RequestErrorCode SORT_MEMBERS_INVALID_FILE =
-      const RequestErrorCode._("SORT_MEMBERS_INVALID_FILE");
-
-  /**
-   * An "edit.sortMembers" request specified a Dart file that has scan or parse
-   * errors.
-   */
-  static const RequestErrorCode SORT_MEMBERS_PARSE_ERRORS =
-      const RequestErrorCode._("SORT_MEMBERS_PARSE_ERRORS");
-
-  /**
-   * An "analysis.setPriorityFiles" request includes one or more files that are
-   * not being analyzed.
-   *
-   * This is a legacy error; it will be removed before the API reaches version
-   * 1.0.
-   */
-  static const RequestErrorCode UNANALYZED_PRIORITY_FILES =
-      const RequestErrorCode._("UNANALYZED_PRIORITY_FILES");
-
-  /**
-   * A request was received which the analysis server does not recognize, or
-   * cannot handle in its current configuration.
-   */
-  static const RequestErrorCode UNKNOWN_REQUEST =
-      const RequestErrorCode._("UNKNOWN_REQUEST");
-
-  /**
-   * The analysis server was requested to perform an action on a source that
-   * does not exist.
-   */
-  static const RequestErrorCode UNKNOWN_SOURCE =
-      const RequestErrorCode._("UNKNOWN_SOURCE");
-
-  /**
-   * The analysis server was requested to perform an action which is not
-   * supported.
-   *
-   * This is a legacy error; it will be removed before the API reaches version
-   * 1.0.
-   */
-  static const RequestErrorCode UNSUPPORTED_FEATURE =
-      const RequestErrorCode._("UNSUPPORTED_FEATURE");
-
-  /**
-   * A list containing all of the enum values that are defined.
-   */
-  static const List<RequestErrorCode> VALUES = const <RequestErrorCode>[
-    CONTENT_MODIFIED,
-    DEBUG_PORT_COULD_NOT_BE_OPENED,
-    FILE_NOT_ANALYZED,
-    FORMAT_INVALID_FILE,
-    FORMAT_WITH_ERRORS,
-    GET_ERRORS_INVALID_FILE,
-    GET_NAVIGATION_INVALID_FILE,
-    GET_REACHABLE_SOURCES_INVALID_FILE,
-    INVALID_ANALYSIS_ROOT,
-    INVALID_EXECUTION_CONTEXT,
-    INVALID_FILE_PATH_FORMAT,
-    INVALID_OVERLAY_CHANGE,
-    INVALID_PARAMETER,
-    INVALID_REQUEST,
-    NO_INDEX_GENERATED,
-    ORGANIZE_DIRECTIVES_ERROR,
-    REFACTORING_REQUEST_CANCELLED,
-    SERVER_ALREADY_STARTED,
-    SERVER_ERROR,
-    SORT_MEMBERS_INVALID_FILE,
-    SORT_MEMBERS_PARSE_ERRORS,
-    UNANALYZED_PRIORITY_FILES,
-    UNKNOWN_REQUEST,
-    UNKNOWN_SOURCE,
-    UNSUPPORTED_FEATURE
-  ];
-
-  final String name;
-
-  const RequestErrorCode._(this.name);
-
-  factory RequestErrorCode(String name) {
-    switch (name) {
-      case "CONTENT_MODIFIED":
-        return CONTENT_MODIFIED;
-      case "DEBUG_PORT_COULD_NOT_BE_OPENED":
-        return DEBUG_PORT_COULD_NOT_BE_OPENED;
-      case "FILE_NOT_ANALYZED":
-        return FILE_NOT_ANALYZED;
-      case "FORMAT_INVALID_FILE":
-        return FORMAT_INVALID_FILE;
-      case "FORMAT_WITH_ERRORS":
-        return FORMAT_WITH_ERRORS;
-      case "GET_ERRORS_INVALID_FILE":
-        return GET_ERRORS_INVALID_FILE;
-      case "GET_NAVIGATION_INVALID_FILE":
-        return GET_NAVIGATION_INVALID_FILE;
-      case "GET_REACHABLE_SOURCES_INVALID_FILE":
-        return GET_REACHABLE_SOURCES_INVALID_FILE;
-      case "INVALID_ANALYSIS_ROOT":
-        return INVALID_ANALYSIS_ROOT;
-      case "INVALID_EXECUTION_CONTEXT":
-        return INVALID_EXECUTION_CONTEXT;
-      case "INVALID_FILE_PATH_FORMAT":
-        return INVALID_FILE_PATH_FORMAT;
-      case "INVALID_OVERLAY_CHANGE":
-        return INVALID_OVERLAY_CHANGE;
-      case "INVALID_PARAMETER":
-        return INVALID_PARAMETER;
-      case "INVALID_REQUEST":
-        return INVALID_REQUEST;
-      case "NO_INDEX_GENERATED":
-        return NO_INDEX_GENERATED;
-      case "ORGANIZE_DIRECTIVES_ERROR":
-        return ORGANIZE_DIRECTIVES_ERROR;
-      case "REFACTORING_REQUEST_CANCELLED":
-        return REFACTORING_REQUEST_CANCELLED;
-      case "SERVER_ALREADY_STARTED":
-        return SERVER_ALREADY_STARTED;
-      case "SERVER_ERROR":
-        return SERVER_ERROR;
-      case "SORT_MEMBERS_INVALID_FILE":
-        return SORT_MEMBERS_INVALID_FILE;
-      case "SORT_MEMBERS_PARSE_ERRORS":
-        return SORT_MEMBERS_PARSE_ERRORS;
-      case "UNANALYZED_PRIORITY_FILES":
-        return UNANALYZED_PRIORITY_FILES;
-      case "UNKNOWN_REQUEST":
-        return UNKNOWN_REQUEST;
-      case "UNKNOWN_SOURCE":
-        return UNKNOWN_SOURCE;
-      case "UNSUPPORTED_FEATURE":
-        return UNSUPPORTED_FEATURE;
-    }
-    throw new Exception('Illegal enum value: $name');
-  }
-
-  factory RequestErrorCode.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json is String) {
-      try {
-        return new RequestErrorCode(json);
-      } catch (_) {
-        // Fall through
-      }
-    }
-    throw jsonDecoder.mismatch(jsonPath, "RequestErrorCode", json);
-  }
-
-  @override
-  String toString() => "RequestErrorCode.$name";
-
-  String toJson() => name;
-}
-
-/**
- * SearchResult
- *
- * {
- *   "location": Location
- *   "kind": SearchResultKind
- *   "isPotential": bool
- *   "path": List<Element>
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class SearchResult implements HasToJson {
-  Location _location;
-
-  SearchResultKind _kind;
-
-  bool _isPotential;
-
-  List<Element> _path;
-
-  /**
-   * The location of the code that matched the search criteria.
-   */
-  Location get location => _location;
-
-  /**
-   * The location of the code that matched the search criteria.
-   */
-  void set location(Location value) {
-    assert(value != null);
-    this._location = value;
-  }
-
-  /**
-   * The kind of element that was found or the kind of reference that was
-   * found.
-   */
-  SearchResultKind get kind => _kind;
-
-  /**
-   * The kind of element that was found or the kind of reference that was
-   * found.
-   */
-  void set kind(SearchResultKind value) {
-    assert(value != null);
-    this._kind = value;
-  }
-
-  /**
-   * True if the result is a potential match but cannot be confirmed to be a
-   * match. For example, if all references to a method m defined in some class
-   * were requested, and a reference to a method m from an unknown class were
-   * found, it would be marked as being a potential match.
-   */
-  bool get isPotential => _isPotential;
-
-  /**
-   * True if the result is a potential match but cannot be confirmed to be a
-   * match. For example, if all references to a method m defined in some class
-   * were requested, and a reference to a method m from an unknown class were
-   * found, it would be marked as being a potential match.
-   */
-  void set isPotential(bool value) {
-    assert(value != null);
-    this._isPotential = value;
-  }
-
-  /**
-   * The elements that contain the result, starting with the most immediately
-   * enclosing ancestor and ending with the library.
-   */
-  List<Element> get path => _path;
-
-  /**
-   * The elements that contain the result, starting with the most immediately
-   * enclosing ancestor and ending with the library.
-   */
-  void set path(List<Element> value) {
-    assert(value != null);
-    this._path = value;
-  }
-
-  SearchResult(Location location, SearchResultKind kind, bool isPotential,
-      List<Element> path) {
-    this.location = location;
-    this.kind = kind;
-    this.isPotential = isPotential;
-    this.path = path;
-  }
-
-  factory SearchResult.fromJson(
+class SearchFindElementReferencesResult implements ResponseResult {
+  String _id;
+
+  Element _element;
+
+  /**
+   * The identifier used to associate results with this search request.
+   *
+   * If no element was found at the given location, this field will be absent,
+   * and no results will be reported via the search.results notification.
+   */
+  String get id => _id;
+
+  /**
+   * The identifier used to associate results with this search request.
+   *
+   * If no element was found at the given location, this field will be absent,
+   * and no results will be reported via the search.results notification.
+   */
+  void set id(String value) {
+    this._id = value;
+  }
+
+  /**
+   * The element referenced or defined at the given offset and whose references
+   * will be returned in the search results.
+   *
+   * If no element was found at the given location, this field will be absent.
+   */
+  Element get element => _element;
+
+  /**
+   * The element referenced or defined at the given offset and whose references
+   * will be returned in the search results.
+   *
+   * If no element was found at the given location, this field will be absent.
+   */
+  void set element(Element value) {
+    this._element = value;
+  }
+
+  SearchFindElementReferencesResult({String id, Element element}) {
+    this.id = id;
+    this.element = element;
+  }
+
+  factory SearchFindElementReferencesResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      Location location;
-      if (json.containsKey("location")) {
-        location = new Location.fromJson(
-            jsonDecoder, jsonPath + ".location", json["location"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "location");
-      }
-      SearchResultKind kind;
-      if (json.containsKey("kind")) {
-        kind = new SearchResultKind.fromJson(
-            jsonDecoder, jsonPath + ".kind", json["kind"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "kind");
-      }
-      bool isPotential;
-      if (json.containsKey("isPotential")) {
-        isPotential = jsonDecoder.decodeBool(
-            jsonPath + ".isPotential", json["isPotential"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "isPotential");
-      }
-      List<Element> path;
-      if (json.containsKey("path")) {
-        path = jsonDecoder.decodeList(
-            jsonPath + ".path",
-            json["path"],
-            (String jsonPath, Object json) =>
-                new Element.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "path");
-      }
-      return new SearchResult(location, kind, isPotential, path);
+      String id;
+      if (json.containsKey("id")) {
+        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      }
+      Element element;
+      if (json.containsKey("element")) {
+        element = new Element.fromJson(
+            jsonDecoder, jsonPath + ".element", json["element"]);
+      }
+      return new SearchFindElementReferencesResult(id: id, element: element);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "SearchResult", json);
-    }
-  }
-
+      throw jsonDecoder.mismatch(
+          jsonPath, "search.findElementReferences result", json);
+    }
+  }
+
+  factory SearchFindElementReferencesResult.fromResponse(Response response) {
+    return new SearchFindElementReferencesResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["location"] = location.toJson();
-    result["kind"] = kind.toJson();
-    result["isPotential"] = isPotential;
-    result["path"] = path.map((Element value) => value.toJson()).toList();
+    if (id != null) {
+      result["id"] = id;
+    }
+    if (element != null) {
+      result["element"] = element.toJson();
+    }
     return result;
   }
 
   @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
+  }
+
+  @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is SearchResult) {
-      return location == other.location &&
-          kind == other.kind &&
-          isPotential == other.isPotential &&
-          listEqual(path, other.path, (Element a, Element b) => a == b);
+    if (other is SearchFindElementReferencesResult) {
+      return id == other.id && element == other.element;
     }
     return false;
   }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, id.hashCode);
+    hash = JenkinsSmiHash.combine(hash, element.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * search.findMemberDeclarations params
+ *
+ * {
+ *   "name": String
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class SearchFindMemberDeclarationsParams implements RequestParams {
+  String _name;
+
+  /**
+   * The name of the declarations to be found.
+   */
+  String get name => _name;
+
+  /**
+   * The name of the declarations to be found.
+   */
+  void set name(String value) {
+    assert(value != null);
+    this._name = value;
+  }
+
+  SearchFindMemberDeclarationsParams(String name) {
+    this.name = name;
+  }
+
+  factory SearchFindMemberDeclarationsParams.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String name;
+      if (json.containsKey("name")) {
+        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "name");
+      }
+      return new SearchFindMemberDeclarationsParams(name);
+    } else {
+      throw jsonDecoder.mismatch(
+          jsonPath, "search.findMemberDeclarations params", json);
+    }
+  }
+
+  factory SearchFindMemberDeclarationsParams.fromRequest(Request request) {
+    return new SearchFindMemberDeclarationsParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["name"] = name;
+    return result;
+  }
+
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "search.findMemberDeclarations", toJson());
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is SearchFindMemberDeclarationsParams) {
+      return name == other.name;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, name.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * search.findMemberDeclarations result
+ *
+ * {
+ *   "id": SearchId
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class SearchFindMemberDeclarationsResult implements ResponseResult {
+  String _id;
+
+  /**
+   * The identifier used to associate results with this search request.
+   */
+  String get id => _id;
+
+  /**
+   * The identifier used to associate results with this search request.
+   */
+  void set id(String value) {
+    assert(value != null);
+    this._id = value;
+  }
+
+  SearchFindMemberDeclarationsResult(String id) {
+    this.id = id;
+  }
+
+  factory SearchFindMemberDeclarationsResult.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String id;
+      if (json.containsKey("id")) {
+        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "id");
+      }
+      return new SearchFindMemberDeclarationsResult(id);
+    } else {
+      throw jsonDecoder.mismatch(
+          jsonPath, "search.findMemberDeclarations result", json);
+    }
+  }
+
+  factory SearchFindMemberDeclarationsResult.fromResponse(Response response) {
+    return new SearchFindMemberDeclarationsResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["id"] = id;
+    return result;
+  }
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is SearchFindMemberDeclarationsResult) {
+      return id == other.id;
+    }
+    return false;
+  }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, location.hashCode);
-    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
-    hash = JenkinsSmiHash.combine(hash, isPotential.hashCode);
-    hash = JenkinsSmiHash.combine(hash, path.hashCode);
+    hash = JenkinsSmiHash.combine(hash, id.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * SearchResultKind
- *
- * enum {
- *   DECLARATION
- *   INVOCATION
- *   READ
- *   READ_WRITE
- *   REFERENCE
- *   UNKNOWN
- *   WRITE
+ * search.findMemberReferences params
+ *
+ * {
+ *   "name": String
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class SearchResultKind implements Enum {
-  /**
-   * The declaration of an element.
-   */
-  static const SearchResultKind DECLARATION =
-      const SearchResultKind._("DECLARATION");
-
-  /**
-   * The invocation of a function or method.
-   */
-  static const SearchResultKind INVOCATION =
-      const SearchResultKind._("INVOCATION");
-
-  /**
-   * A reference to a field, parameter or variable where it is being read.
-   */
-  static const SearchResultKind READ = const SearchResultKind._("READ");
-
-  /**
-   * A reference to a field, parameter or variable where it is being read and
-   * written.
-   */
-  static const SearchResultKind READ_WRITE =
-      const SearchResultKind._("READ_WRITE");
-
-  /**
-   * A reference to an element.
-   */
-  static const SearchResultKind REFERENCE =
-      const SearchResultKind._("REFERENCE");
-
-  /**
-   * Some other kind of search result.
-   */
-  static const SearchResultKind UNKNOWN = const SearchResultKind._("UNKNOWN");
-
-  /**
-   * A reference to a field, parameter or variable where it is being written.
-   */
-  static const SearchResultKind WRITE = const SearchResultKind._("WRITE");
-
-  /**
-   * A list containing all of the enum values that are defined.
-   */
-  static const List<SearchResultKind> VALUES = const <SearchResultKind>[
-    DECLARATION,
-    INVOCATION,
-    READ,
-    READ_WRITE,
-    REFERENCE,
-    UNKNOWN,
-    WRITE
-  ];
-
-  final String name;
-
-  const SearchResultKind._(this.name);
-
-  factory SearchResultKind(String name) {
-    switch (name) {
-      case "DECLARATION":
-        return DECLARATION;
-      case "INVOCATION":
-        return INVOCATION;
-      case "READ":
-        return READ;
-      case "READ_WRITE":
-        return READ_WRITE;
-      case "REFERENCE":
-        return REFERENCE;
-      case "UNKNOWN":
-        return UNKNOWN;
-      case "WRITE":
-        return WRITE;
-    }
-    throw new Exception('Illegal enum value: $name');
-  }
-
-  factory SearchResultKind.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json is String) {
-      try {
-        return new SearchResultKind(json);
-      } catch (_) {
-        // Fall through
-      }
-    }
-    throw jsonDecoder.mismatch(jsonPath, "SearchResultKind", json);
-  }
-
-  @override
-  String toString() => "SearchResultKind.$name";
-
-  String toJson() => name;
-}
-
-/**
- * ServerService
- *
- * enum {
- *   STATUS
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ServerService implements Enum {
-  static const ServerService STATUS = const ServerService._("STATUS");
-
-  /**
-   * A list containing all of the enum values that are defined.
-   */
-  static const List<ServerService> VALUES = const <ServerService>[STATUS];
-
-  final String name;
-
-  const ServerService._(this.name);
-
-  factory ServerService(String name) {
-    switch (name) {
-      case "STATUS":
-        return STATUS;
-    }
-    throw new Exception('Illegal enum value: $name');
-  }
-
-  factory ServerService.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json is String) {
-      try {
-        return new ServerService(json);
-      } catch (_) {
-        // Fall through
-      }
-    }
-    throw jsonDecoder.mismatch(jsonPath, "ServerService", json);
-  }
-
-  @override
-  String toString() => "ServerService.$name";
-
-  String toJson() => name;
-}
-
-/**
- * SourceChange
- *
- * {
- *   "message": String
- *   "edits": List<SourceFileEdit>
- *   "linkedEditGroups": List<LinkedEditGroup>
- *   "selection": optional Position
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class SourceChange implements HasToJson {
-  String _message;
-
-  List<SourceFileEdit> _edits;
-
-  List<LinkedEditGroup> _linkedEditGroups;
-
-  Position _selection;
-
-  /**
-   * A human-readable description of the change to be applied.
-   */
-  String get message => _message;
-
-  /**
-   * A human-readable description of the change to be applied.
-   */
-  void set message(String value) {
+class SearchFindMemberReferencesParams implements RequestParams {
+  String _name;
+
+  /**
+   * The name of the references to be found.
+   */
+  String get name => _name;
+
+  /**
+   * The name of the references to be found.
+   */
+  void set name(String value) {
     assert(value != null);
-    this._message = value;
-  }
-
-  /**
-   * A list of the edits used to effect the change, grouped by file.
-   */
-  List<SourceFileEdit> get edits => _edits;
-
-  /**
-   * A list of the edits used to effect the change, grouped by file.
-   */
-  void set edits(List<SourceFileEdit> value) {
-    assert(value != null);
-    this._edits = value;
-  }
-
-  /**
-   * A list of the linked editing groups used to customize the changes that
-   * were made.
-   */
-  List<LinkedEditGroup> get linkedEditGroups => _linkedEditGroups;
-
-  /**
-   * A list of the linked editing groups used to customize the changes that
-   * were made.
-   */
-  void set linkedEditGroups(List<LinkedEditGroup> value) {
-    assert(value != null);
-    this._linkedEditGroups = value;
-  }
-
-  /**
-   * The position that should be selected after the edits have been applied.
-   */
-  Position get selection => _selection;
-
-  /**
-   * The position that should be selected after the edits have been applied.
-   */
-  void set selection(Position value) {
-    this._selection = value;
-  }
-
-  SourceChange(String message,
-      {List<SourceFileEdit> edits,
-      List<LinkedEditGroup> linkedEditGroups,
-      Position selection}) {
-    this.message = message;
-    if (edits == null) {
-      this.edits = <SourceFileEdit>[];
-    } else {
-      this.edits = edits;
-    }
-    if (linkedEditGroups == null) {
-      this.linkedEditGroups = <LinkedEditGroup>[];
-    } else {
-      this.linkedEditGroups = linkedEditGroups;
-    }
-    this.selection = selection;
-  }
-
-  factory SourceChange.fromJson(
+    this._name = value;
+  }
+
+  SearchFindMemberReferencesParams(String name) {
+    this.name = name;
+  }
+
+  factory SearchFindMemberReferencesParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String message;
-      if (json.containsKey("message")) {
-        message =
-            jsonDecoder.decodeString(jsonPath + ".message", json["message"]);
+      String name;
+      if (json.containsKey("name")) {
+        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "message");
+        throw jsonDecoder.mismatch(jsonPath, "name");
       }
-      List<SourceFileEdit> edits;
-      if (json.containsKey("edits")) {
-        edits = jsonDecoder.decodeList(
-            jsonPath + ".edits",
-            json["edits"],
-            (String jsonPath, Object json) =>
-                new SourceFileEdit.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "edits");
-      }
-      List<LinkedEditGroup> linkedEditGroups;
-      if (json.containsKey("linkedEditGroups")) {
-        linkedEditGroups = jsonDecoder.decodeList(
-            jsonPath + ".linkedEditGroups",
-            json["linkedEditGroups"],
-            (String jsonPath, Object json) =>
-                new LinkedEditGroup.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "linkedEditGroups");
-      }
-      Position selection;
-      if (json.containsKey("selection")) {
-        selection = new Position.fromJson(
-            jsonDecoder, jsonPath + ".selection", json["selection"]);
-      }
-      return new SourceChange(message,
-          edits: edits,
-          linkedEditGroups: linkedEditGroups,
-          selection: selection);
+      return new SearchFindMemberReferencesParams(name);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "SourceChange", json);
-    }
-  }
-
+      throw jsonDecoder.mismatch(
+          jsonPath, "search.findMemberReferences params", json);
+    }
+  }
+
+  factory SearchFindMemberReferencesParams.fromRequest(Request request) {
+    return new SearchFindMemberReferencesParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["message"] = message;
-    result["edits"] =
-        edits.map((SourceFileEdit value) => value.toJson()).toList();
-    result["linkedEditGroups"] = linkedEditGroups
-        .map((LinkedEditGroup value) => value.toJson())
-        .toList();
-    if (selection != null) {
-      result["selection"] = selection.toJson();
-    }
+    result["name"] = name;
     return result;
   }
 
-  /**
-   * Adds [edit] to the [FileEdit] for the given [file].
-   */
-  void addEdit(String file, int fileStamp, SourceEdit edit) =>
-      addEditToSourceChange(this, file, fileStamp, edit);
-
-  /**
-   * Adds the given [FileEdit].
-   */
-  void addFileEdit(SourceFileEdit edit) {
-    edits.add(edit);
-  }
-
-  /**
-   * Adds the given [LinkedEditGroup].
-   */
-  void addLinkedEditGroup(LinkedEditGroup linkedEditGroup) {
-    linkedEditGroups.add(linkedEditGroup);
-  }
-
-  /**
-   * Returns the [FileEdit] for the given [file], maybe `null`.
-   */
-  SourceFileEdit getFileEdit(String file) => getChangeFileEdit(this, file);
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "search.findMemberReferences", toJson());
+  }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is SourceChange) {
-      return message == other.message &&
-          listEqual(edits, other.edits,
-              (SourceFileEdit a, SourceFileEdit b) => a == b) &&
-          listEqual(linkedEditGroups, other.linkedEditGroups,
-              (LinkedEditGroup a, LinkedEditGroup b) => a == b) &&
-          selection == other.selection;
+    if (other is SearchFindMemberReferencesParams) {
+      return name == other.name;
     }
     return false;
   }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, name.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * search.findMemberReferences result
+ *
+ * {
+ *   "id": SearchId
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class SearchFindMemberReferencesResult implements ResponseResult {
+  String _id;
+
+  /**
+   * The identifier used to associate results with this search request.
+   */
+  String get id => _id;
+
+  /**
+   * The identifier used to associate results with this search request.
+   */
+  void set id(String value) {
+    assert(value != null);
+    this._id = value;
+  }
+
+  SearchFindMemberReferencesResult(String id) {
+    this.id = id;
+  }
+
+  factory SearchFindMemberReferencesResult.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String id;
+      if (json.containsKey("id")) {
+        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "id");
+      }
+      return new SearchFindMemberReferencesResult(id);
+    } else {
+      throw jsonDecoder.mismatch(
+          jsonPath, "search.findMemberReferences result", json);
+    }
+  }
+
+  factory SearchFindMemberReferencesResult.fromResponse(Response response) {
+    return new SearchFindMemberReferencesResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["id"] = id;
+    return result;
+  }
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is SearchFindMemberReferencesResult) {
+      return id == other.id;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, id.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * search.findTopLevelDeclarations params
+ *
+ * {
+ *   "pattern": String
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class SearchFindTopLevelDeclarationsParams implements RequestParams {
+  String _pattern;
+
+  /**
+   * The regular expression used to match the names of the declarations to be
+   * found.
+   */
+  String get pattern => _pattern;
+
+  /**
+   * The regular expression used to match the names of the declarations to be
+   * found.
+   */
+  void set pattern(String value) {
+    assert(value != null);
+    this._pattern = value;
+  }
+
+  SearchFindTopLevelDeclarationsParams(String pattern) {
+    this.pattern = pattern;
+  }
+
+  factory SearchFindTopLevelDeclarationsParams.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String pattern;
+      if (json.containsKey("pattern")) {
+        pattern =
+            jsonDecoder.decodeString(jsonPath + ".pattern", json["pattern"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "pattern");
+      }
+      return new SearchFindTopLevelDeclarationsParams(pattern);
+    } else {
+      throw jsonDecoder.mismatch(
+          jsonPath, "search.findTopLevelDeclarations params", json);
+    }
+  }
+
+  factory SearchFindTopLevelDeclarationsParams.fromRequest(Request request) {
+    return new SearchFindTopLevelDeclarationsParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["pattern"] = pattern;
+    return result;
+  }
+
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "search.findTopLevelDeclarations", toJson());
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is SearchFindTopLevelDeclarationsParams) {
+      return pattern == other.pattern;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, pattern.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * search.findTopLevelDeclarations result
+ *
+ * {
+ *   "id": SearchId
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class SearchFindTopLevelDeclarationsResult implements ResponseResult {
+  String _id;
+
+  /**
+   * The identifier used to associate results with this search request.
+   */
+  String get id => _id;
+
+  /**
+   * The identifier used to associate results with this search request.
+   */
+  void set id(String value) {
+    assert(value != null);
+    this._id = value;
+  }
+
+  SearchFindTopLevelDeclarationsResult(String id) {
+    this.id = id;
+  }
+
+  factory SearchFindTopLevelDeclarationsResult.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String id;
+      if (json.containsKey("id")) {
+        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "id");
+      }
+      return new SearchFindTopLevelDeclarationsResult(id);
+    } else {
+      throw jsonDecoder.mismatch(
+          jsonPath, "search.findTopLevelDeclarations result", json);
+    }
+  }
+
+  factory SearchFindTopLevelDeclarationsResult.fromResponse(Response response) {
+    return new SearchFindTopLevelDeclarationsResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["id"] = id;
+    return result;
+  }
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is SearchFindTopLevelDeclarationsResult) {
+      return id == other.id;
+    }
+    return false;
+  }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, message.hashCode);
-    hash = JenkinsSmiHash.combine(hash, edits.hashCode);
-    hash = JenkinsSmiHash.combine(hash, linkedEditGroups.hashCode);
-    hash = JenkinsSmiHash.combine(hash, selection.hashCode);
+    hash = JenkinsSmiHash.combine(hash, id.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * SourceEdit
+ * search.getTypeHierarchy params
  *
  * {
+ *   "file": FilePath
  *   "offset": int
- *   "length": int
- *   "replacement": String
- *   "id": optional String
+ *   "superOnly": optional bool
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class SourceEdit implements HasToJson {
-  /**
-   * Get the result of applying a set of [edits] to the given [code]. Edits are
-   * applied in the order they appear in [edits].
-   */
-  static String applySequence(String code, Iterable<SourceEdit> edits) =>
-      applySequenceOfEdits(code, edits);
+class SearchGetTypeHierarchyParams implements RequestParams {
+  String _file;
 
   int _offset;
 
-  int _length;
-
-  String _replacement;
-
-  String _id;
+  bool _superOnly;
 
   /**
-   * The offset of the region to be modified.
+   * The file containing the declaration or reference to the type for which a
+   * hierarchy is being requested.
+   */
+  String get file => _file;
+
+  /**
+   * The file containing the declaration or reference to the type for which a
+   * hierarchy is being requested.
+   */
+  void set file(String value) {
+    assert(value != null);
+    this._file = value;
+  }
+
+  /**
+   * The offset of the name of the type within the file.
    */
   int get offset => _offset;
 
   /**
-   * The offset of the region to be modified.
+   * The offset of the name of the type within the file.
    */
   void set offset(int value) {
     assert(value != null);
     this._offset = value;
   }
 
   /**
-   * The length of the region to be modified.
+   * True if the client is only requesting superclasses and interfaces
+   * hierarchy.
    */
-  int get length => _length;
+  bool get superOnly => _superOnly;
 
   /**
-   * The length of the region to be modified.
+   * True if the client is only requesting superclasses and interfaces
+   * hierarchy.
    */
-  void set length(int value) {
-    assert(value != null);
-    this._length = value;
+  void set superOnly(bool value) {
+    this._superOnly = value;
   }
 
-  /**
-   * The code that is to replace the specified region in the original code.
-   */
-  String get replacement => _replacement;
-
-  /**
-   * The code that is to replace the specified region in the original code.
-   */
-  void set replacement(String value) {
-    assert(value != null);
-    this._replacement = value;
+  SearchGetTypeHierarchyParams(String file, int offset, {bool superOnly}) {
+    this.file = file;
+    this.offset = offset;
+    this.superOnly = superOnly;
   }
 
-  /**
-   * An identifier that uniquely identifies this source edit from other edits
-   * in the same response. This field is omitted unless a containing structure
-   * needs to be able to identify the edit for some reason.
-   *
-   * For example, some refactoring operations can produce edits that might not
-   * be appropriate (referred to as potential edits). Such edits will have an
-   * id so that they can be referenced. Edits in the same response that do not
-   * need to be referenced will not have an id.
-   */
-  String get id => _id;
-
-  /**
-   * An identifier that uniquely identifies this source edit from other edits
-   * in the same response. This field is omitted unless a containing structure
-   * needs to be able to identify the edit for some reason.
-   *
-   * For example, some refactoring operations can produce edits that might not
-   * be appropriate (referred to as potential edits). Such edits will have an
-   * id so that they can be referenced. Edits in the same response that do not
-   * need to be referenced will not have an id.
-   */
-  void set id(String value) {
-    this._id = value;
-  }
-
-  SourceEdit(int offset, int length, String replacement, {String id}) {
-    this.offset = offset;
-    this.length = length;
-    this.replacement = replacement;
-    this.id = id;
-  }
-
-  factory SourceEdit.fromJson(
+  factory SearchGetTypeHierarchyParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "file");
+      }
       int offset;
       if (json.containsKey("offset")) {
         offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
+        throw jsonDecoder.mismatch(jsonPath, "offset");
       }
-      int length;
-      if (json.containsKey("length")) {
-        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
+      bool superOnly;
+      if (json.containsKey("superOnly")) {
+        superOnly =
+            jsonDecoder.decodeBool(jsonPath + ".superOnly", json["superOnly"]);
       }
-      String replacement;
-      if (json.containsKey("replacement")) {
-        replacement = jsonDecoder.decodeString(
-            jsonPath + ".replacement", json["replacement"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "replacement");
-      }
-      String id;
-      if (json.containsKey("id")) {
-        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
-      }
-      return new SourceEdit(offset, length, replacement, id: id);
+      return new SearchGetTypeHierarchyParams(file, offset,
+          superOnly: superOnly);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "SourceEdit", json);
+      throw jsonDecoder.mismatch(
+          jsonPath, "search.getTypeHierarchy params", json);
     }
   }
 
-  /**
-   * The end of the region to be modified.
-   */
-  int get end => offset + length;
+  factory SearchGetTypeHierarchyParams.fromRequest(Request request) {
+    return new SearchGetTypeHierarchyParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
+  }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
+    result["file"] = file;
     result["offset"] = offset;
-    result["length"] = length;
-    result["replacement"] = replacement;
-    if (id != null) {
-      result["id"] = id;
+    if (superOnly != null) {
+      result["superOnly"] = superOnly;
     }
     return result;
   }
 
-  /**
-   * Get the result of applying the edit to the given [code].
-   */
-  String apply(String code) => applyEdit(code, this);
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "search.getTypeHierarchy", toJson());
+  }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is SourceEdit) {
-      return offset == other.offset &&
-          length == other.length &&
-          replacement == other.replacement &&
-          id == other.id;
+    if (other is SearchGetTypeHierarchyParams) {
+      return file == other.file &&
+          offset == other.offset &&
+          superOnly == other.superOnly;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
     hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    hash = JenkinsSmiHash.combine(hash, replacement.hashCode);
-    hash = JenkinsSmiHash.combine(hash, id.hashCode);
+    hash = JenkinsSmiHash.combine(hash, superOnly.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * SourceFileEdit
+ * search.getTypeHierarchy result
  *
  * {
- *   "file": FilePath
- *   "fileStamp": long
- *   "edits": List<SourceEdit>
+ *   "hierarchyItems": optional List<TypeHierarchyItem>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class SourceFileEdit implements HasToJson {
-  String _file;
-
-  int _fileStamp;
-
-  List<SourceEdit> _edits;
+class SearchGetTypeHierarchyResult implements ResponseResult {
+  List<TypeHierarchyItem> _hierarchyItems;
 
   /**
-   * The file containing the code to be modified.
+   * A list of the types in the requested hierarchy. The first element of the
+   * list is the item representing the type for which the hierarchy was
+   * requested. The index of other elements of the list is unspecified, but
+   * correspond to the integers used to reference supertype and subtype items
+   * within the items.
+   *
+   * This field will be absent if the code at the given file and offset does
+   * not represent a type, or if the file has not been sufficiently analyzed to
+   * allow a type hierarchy to be produced.
    */
-  String get file => _file;
+  List<TypeHierarchyItem> get hierarchyItems => _hierarchyItems;
 
   /**
-   * The file containing the code to be modified.
+   * A list of the types in the requested hierarchy. The first element of the
+   * list is the item representing the type for which the hierarchy was
+   * requested. The index of other elements of the list is unspecified, but
+   * correspond to the integers used to reference supertype and subtype items
+   * within the items.
+   *
+   * This field will be absent if the code at the given file and offset does
+   * not represent a type, or if the file has not been sufficiently analyzed to
+   * allow a type hierarchy to be produced.
    */
-  void set file(String value) {
-    assert(value != null);
-    this._file = value;
+  void set hierarchyItems(List<TypeHierarchyItem> value) {
+    this._hierarchyItems = value;
   }
 
-  /**
-   * The modification stamp of the file at the moment when the change was
-   * created, in milliseconds since the "Unix epoch". Will be -1 if the file
-   * did not exist and should be created. The client may use this field to make
-   * sure that the file was not changed since then, so it is safe to apply the
-   * change.
-   */
-  int get fileStamp => _fileStamp;
-
-  /**
-   * The modification stamp of the file at the moment when the change was
-   * created, in milliseconds since the "Unix epoch". Will be -1 if the file
-   * did not exist and should be created. The client may use this field to make
-   * sure that the file was not changed since then, so it is safe to apply the
-   * change.
-   */
-  void set fileStamp(int value) {
-    assert(value != null);
-    this._fileStamp = value;
+  SearchGetTypeHierarchyResult({List<TypeHierarchyItem> hierarchyItems}) {
+    this.hierarchyItems = hierarchyItems;
   }
 
-  /**
-   * A list of the edits used to effect the change.
-   */
-  List<SourceEdit> get edits => _edits;
-
-  /**
-   * A list of the edits used to effect the change.
-   */
-  void set edits(List<SourceEdit> value) {
-    assert(value != null);
-    this._edits = value;
-  }
-
-  SourceFileEdit(String file, int fileStamp, {List<SourceEdit> edits}) {
-    this.file = file;
-    this.fileStamp = fileStamp;
-    if (edits == null) {
-      this.edits = <SourceEdit>[];
-    } else {
-      this.edits = edits;
-    }
-  }
-
-  factory SourceFileEdit.fromJson(
+  factory SearchGetTypeHierarchyResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String file;
-      if (json.containsKey("file")) {
-        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "file");
+      List<TypeHierarchyItem> hierarchyItems;
+      if (json.containsKey("hierarchyItems")) {
+        hierarchyItems = jsonDecoder.decodeList(
+            jsonPath + ".hierarchyItems",
+            json["hierarchyItems"],
+            (String jsonPath, Object json) =>
+                new TypeHierarchyItem.fromJson(jsonDecoder, jsonPath, json));
       }
-      int fileStamp;
-      if (json.containsKey("fileStamp")) {
-        fileStamp =
-            jsonDecoder.decodeInt(jsonPath + ".fileStamp", json["fileStamp"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "fileStamp");
-      }
-      List<SourceEdit> edits;
-      if (json.containsKey("edits")) {
-        edits = jsonDecoder.decodeList(
-            jsonPath + ".edits",
-            json["edits"],
-            (String jsonPath, Object json) =>
-                new SourceEdit.fromJson(jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "edits");
-      }
-      return new SourceFileEdit(file, fileStamp, edits: edits);
+      return new SearchGetTypeHierarchyResult(hierarchyItems: hierarchyItems);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "SourceFileEdit", json);
+      throw jsonDecoder.mismatch(
+          jsonPath, "search.getTypeHierarchy result", json);
     }
   }
 
+  factory SearchGetTypeHierarchyResult.fromResponse(Response response) {
+    return new SearchGetTypeHierarchyResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["file"] = file;
-    result["fileStamp"] = fileStamp;
-    result["edits"] = edits.map((SourceEdit value) => value.toJson()).toList();
+    if (hierarchyItems != null) {
+      result["hierarchyItems"] = hierarchyItems
+          .map((TypeHierarchyItem value) => value.toJson())
+          .toList();
+    }
     return result;
   }
 
-  /**
-   * Adds the given [Edit] to the list.
-   */
-  void add(SourceEdit edit) => addEditForSource(this, edit);
-
-  /**
-   * Adds the given [Edit]s.
-   */
-  void addAll(Iterable<SourceEdit> edits) => addAllEditsForSource(this, edits);
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
+  }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is SourceFileEdit) {
-      return file == other.file &&
-          fileStamp == other.fileStamp &&
-          listEqual(edits, other.edits, (SourceEdit a, SourceEdit b) => a == b);
+    if (other is SearchGetTypeHierarchyResult) {
+      return listEqual(hierarchyItems, other.hierarchyItems,
+          (TypeHierarchyItem a, TypeHierarchyItem b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, file.hashCode);
-    hash = JenkinsSmiHash.combine(hash, fileStamp.hashCode);
-    hash = JenkinsSmiHash.combine(hash, edits.hashCode);
+    hash = JenkinsSmiHash.combine(hash, hierarchyItems.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * TypeHierarchyItem
+ * SearchResult
  *
  * {
- *   "classElement": Element
- *   "displayName": optional String
- *   "memberElement": optional Element
- *   "superclass": optional int
- *   "interfaces": List<int>
- *   "mixins": List<int>
- *   "subclasses": List<int>
+ *   "location": Location
+ *   "kind": SearchResultKind
+ *   "isPotential": bool
+ *   "path": List<Element>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class TypeHierarchyItem implements HasToJson {
-  Element _classElement;
+class SearchResult implements HasToJson {
+  Location _location;
 
-  String _displayName;
+  SearchResultKind _kind;
 
-  Element _memberElement;
+  bool _isPotential;
 
-  int _superclass;
-
-  List<int> _interfaces;
-
-  List<int> _mixins;
-
-  List<int> _subclasses;
+  List<Element> _path;
 
   /**
-   * The class element represented by this item.
+   * The location of the code that matched the search criteria.
    */
-  Element get classElement => _classElement;
+  Location get location => _location;
 
   /**
-   * The class element represented by this item.
+   * The location of the code that matched the search criteria.
    */
-  void set classElement(Element value) {
+  void set location(Location value) {
     assert(value != null);
-    this._classElement = value;
+    this._location = value;
   }
 
   /**
-   * The name to be displayed for the class. This field will be omitted if the
-   * display name is the same as the name of the element. The display name is
-   * different if there is additional type information to be displayed, such as
-   * type arguments.
+   * The kind of element that was found or the kind of reference that was
+   * found.
    */
-  String get displayName => _displayName;
+  SearchResultKind get kind => _kind;
 
   /**
-   * The name to be displayed for the class. This field will be omitted if the
-   * display name is the same as the name of the element. The display name is
-   * different if there is additional type information to be displayed, such as
-   * type arguments.
+   * The kind of element that was found or the kind of reference that was
+   * found.
    */
-  void set displayName(String value) {
-    this._displayName = value;
+  void set kind(SearchResultKind value) {
+    assert(value != null);
+    this._kind = value;
   }
 
   /**
-   * The member in the class corresponding to the member on which the hierarchy
-   * was requested. This field will be omitted if the hierarchy was not
-   * requested for a member or if the class does not have a corresponding
-   * member.
+   * True if the result is a potential match but cannot be confirmed to be a
+   * match. For example, if all references to a method m defined in some class
+   * were requested, and a reference to a method m from an unknown class were
+   * found, it would be marked as being a potential match.
    */
-  Element get memberElement => _memberElement;
+  bool get isPotential => _isPotential;
 
   /**
-   * The member in the class corresponding to the member on which the hierarchy
-   * was requested. This field will be omitted if the hierarchy was not
-   * requested for a member or if the class does not have a corresponding
-   * member.
+   * True if the result is a potential match but cannot be confirmed to be a
+   * match. For example, if all references to a method m defined in some class
+   * were requested, and a reference to a method m from an unknown class were
+   * found, it would be marked as being a potential match.
    */
-  void set memberElement(Element value) {
-    this._memberElement = value;
+  void set isPotential(bool value) {
+    assert(value != null);
+    this._isPotential = value;
   }
 
   /**
-   * The index of the item representing the superclass of this class. This
-   * field will be omitted if this item represents the class Object.
+   * The elements that contain the result, starting with the most immediately
+   * enclosing ancestor and ending with the library.
    */
-  int get superclass => _superclass;
+  List<Element> get path => _path;
 
   /**
-   * The index of the item representing the superclass of this class. This
-   * field will be omitted if this item represents the class Object.
+   * The elements that contain the result, starting with the most immediately
+   * enclosing ancestor and ending with the library.
    */
-  void set superclass(int value) {
-    this._superclass = value;
+  void set path(List<Element> value) {
+    assert(value != null);
+    this._path = value;
   }
 
-  /**
-   * The indexes of the items representing the interfaces implemented by this
-   * class. The list will be empty if there are no implemented interfaces.
-   */
-  List<int> get interfaces => _interfaces;
-
-  /**
-   * The indexes of the items representing the interfaces implemented by this
-   * class. The list will be empty if there are no implemented interfaces.
-   */
-  void set interfaces(List<int> value) {
-    assert(value != null);
-    this._interfaces = value;
+  SearchResult(Location location, SearchResultKind kind, bool isPotential,
+      List<Element> path) {
+    this.location = location;
+    this.kind = kind;
+    this.isPotential = isPotential;
+    this.path = path;
   }
 
-  /**
-   * The indexes of the items representing the mixins referenced by this class.
-   * The list will be empty if there are no classes mixed in to this class.
-   */
-  List<int> get mixins => _mixins;
-
-  /**
-   * The indexes of the items representing the mixins referenced by this class.
-   * The list will be empty if there are no classes mixed in to this class.
-   */
-  void set mixins(List<int> value) {
-    assert(value != null);
-    this._mixins = value;
-  }
-
-  /**
-   * The indexes of the items representing the subtypes of this class. The list
-   * will be empty if there are no subtypes or if this item represents a
-   * supertype of the pivot type.
-   */
-  List<int> get subclasses => _subclasses;
-
-  /**
-   * The indexes of the items representing the subtypes of this class. The list
-   * will be empty if there are no subtypes or if this item represents a
-   * supertype of the pivot type.
-   */
-  void set subclasses(List<int> value) {
-    assert(value != null);
-    this._subclasses = value;
-  }
-
-  TypeHierarchyItem(Element classElement,
-      {String displayName,
-      Element memberElement,
-      int superclass,
-      List<int> interfaces,
-      List<int> mixins,
-      List<int> subclasses}) {
-    this.classElement = classElement;
-    this.displayName = displayName;
-    this.memberElement = memberElement;
-    this.superclass = superclass;
-    if (interfaces == null) {
-      this.interfaces = <int>[];
-    } else {
-      this.interfaces = interfaces;
-    }
-    if (mixins == null) {
-      this.mixins = <int>[];
-    } else {
-      this.mixins = mixins;
-    }
-    if (subclasses == null) {
-      this.subclasses = <int>[];
-    } else {
-      this.subclasses = subclasses;
-    }
-  }
-
-  factory TypeHierarchyItem.fromJson(
+  factory SearchResult.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      Element classElement;
-      if (json.containsKey("classElement")) {
-        classElement = new Element.fromJson(
-            jsonDecoder, jsonPath + ".classElement", json["classElement"]);
+      Location location;
+      if (json.containsKey("location")) {
+        location = new Location.fromJson(
+            jsonDecoder, jsonPath + ".location", json["location"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "classElement");
+        throw jsonDecoder.mismatch(jsonPath, "location");
       }
-      String displayName;
-      if (json.containsKey("displayName")) {
-        displayName = jsonDecoder.decodeString(
-            jsonPath + ".displayName", json["displayName"]);
+      SearchResultKind kind;
+      if (json.containsKey("kind")) {
+        kind = new SearchResultKind.fromJson(
+            jsonDecoder, jsonPath + ".kind", json["kind"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "kind");
       }
-      Element memberElement;
-      if (json.containsKey("memberElement")) {
-        memberElement = new Element.fromJson(
-            jsonDecoder, jsonPath + ".memberElement", json["memberElement"]);
+      bool isPotential;
+      if (json.containsKey("isPotential")) {
+        isPotential = jsonDecoder.decodeBool(
+            jsonPath + ".isPotential", json["isPotential"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "isPotential");
       }
-      int superclass;
-      if (json.containsKey("superclass")) {
-        superclass =
-            jsonDecoder.decodeInt(jsonPath + ".superclass", json["superclass"]);
+      List<Element> path;
+      if (json.containsKey("path")) {
+        path = jsonDecoder.decodeList(
+            jsonPath + ".path",
+            json["path"],
+            (String jsonPath, Object json) =>
+                new Element.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "path");
       }
-      List<int> interfaces;
-      if (json.containsKey("interfaces")) {
-        interfaces = jsonDecoder.decodeList(jsonPath + ".interfaces",
-            json["interfaces"], jsonDecoder.decodeInt);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "interfaces");
-      }
-      List<int> mixins;
-      if (json.containsKey("mixins")) {
-        mixins = jsonDecoder.decodeList(
-            jsonPath + ".mixins", json["mixins"], jsonDecoder.decodeInt);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "mixins");
-      }
-      List<int> subclasses;
-      if (json.containsKey("subclasses")) {
-        subclasses = jsonDecoder.decodeList(jsonPath + ".subclasses",
-            json["subclasses"], jsonDecoder.decodeInt);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "subclasses");
-      }
-      return new TypeHierarchyItem(classElement,
-          displayName: displayName,
-          memberElement: memberElement,
-          superclass: superclass,
-          interfaces: interfaces,
-          mixins: mixins,
-          subclasses: subclasses);
+      return new SearchResult(location, kind, isPotential, path);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "TypeHierarchyItem", json);
+      throw jsonDecoder.mismatch(jsonPath, "SearchResult", json);
     }
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["classElement"] = classElement.toJson();
-    if (displayName != null) {
-      result["displayName"] = displayName;
-    }
-    if (memberElement != null) {
-      result["memberElement"] = memberElement.toJson();
-    }
-    if (superclass != null) {
-      result["superclass"] = superclass;
-    }
-    result["interfaces"] = interfaces;
-    result["mixins"] = mixins;
-    result["subclasses"] = subclasses;
+    result["location"] = location.toJson();
+    result["kind"] = kind.toJson();
+    result["isPotential"] = isPotential;
+    result["path"] = path.map((Element value) => value.toJson()).toList();
     return result;
   }
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is TypeHierarchyItem) {
-      return classElement == other.classElement &&
-          displayName == other.displayName &&
-          memberElement == other.memberElement &&
-          superclass == other.superclass &&
-          listEqual(interfaces, other.interfaces, (int a, int b) => a == b) &&
-          listEqual(mixins, other.mixins, (int a, int b) => a == b) &&
-          listEqual(subclasses, other.subclasses, (int a, int b) => a == b);
+    if (other is SearchResult) {
+      return location == other.location &&
+          kind == other.kind &&
+          isPotential == other.isPotential &&
+          listEqual(path, other.path, (Element a, Element b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, classElement.hashCode);
-    hash = JenkinsSmiHash.combine(hash, displayName.hashCode);
-    hash = JenkinsSmiHash.combine(hash, memberElement.hashCode);
-    hash = JenkinsSmiHash.combine(hash, superclass.hashCode);
-    hash = JenkinsSmiHash.combine(hash, interfaces.hashCode);
-    hash = JenkinsSmiHash.combine(hash, mixins.hashCode);
-    hash = JenkinsSmiHash.combine(hash, subclasses.hashCode);
+    hash = JenkinsSmiHash.combine(hash, location.hashCode);
+    hash = JenkinsSmiHash.combine(hash, kind.hashCode);
+    hash = JenkinsSmiHash.combine(hash, isPotential.hashCode);
+    hash = JenkinsSmiHash.combine(hash, path.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * convertGetterToMethod feedback
+ * SearchResultKind
+ *
+ * enum {
+ *   DECLARATION
+ *   INVOCATION
+ *   READ
+ *   READ_WRITE
+ *   REFERENCE
+ *   UNKNOWN
+ *   WRITE
+ * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ConvertGetterToMethodFeedback extends RefactoringFeedback {
-  @override
-  bool operator ==(other) {
-    if (other is ConvertGetterToMethodFeedback) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 616032599;
-  }
+class SearchResultKind implements Enum {
+  /**
+   * The declaration of an element.
+   */
+  static const SearchResultKind DECLARATION =
+      const SearchResultKind._("DECLARATION");
+
+  /**
+   * The invocation of a function or method.
+   */
+  static const SearchResultKind INVOCATION =
+      const SearchResultKind._("INVOCATION");
+
+  /**
+   * A reference to a field, parameter or variable where it is being read.
+   */
+  static const SearchResultKind READ = const SearchResultKind._("READ");
+
+  /**
+   * A reference to a field, parameter or variable where it is being read and
+   * written.
+   */
+  static const SearchResultKind READ_WRITE =
+      const SearchResultKind._("READ_WRITE");
+
+  /**
+   * A reference to an element.
+   */
+  static const SearchResultKind REFERENCE =
+      const SearchResultKind._("REFERENCE");
+
+  /**
+   * Some other kind of search result.
+   */
+  static const SearchResultKind UNKNOWN = const SearchResultKind._("UNKNOWN");
+
+  /**
+   * A reference to a field, parameter or variable where it is being written.
+   */
+  static const SearchResultKind WRITE = const SearchResultKind._("WRITE");
+
+  /**
+   * A list containing all of the enum values that are defined.
+   */
+  static const List<SearchResultKind> VALUES = const <SearchResultKind>[
+    DECLARATION,
+    INVOCATION,
+    READ,
+    READ_WRITE,
+    REFERENCE,
+    UNKNOWN,
+    WRITE
+  ];
+
+  @override
+  final String name;
+
+  const SearchResultKind._(this.name);
+
+  factory SearchResultKind(String name) {
+    switch (name) {
+      case "DECLARATION":
+        return DECLARATION;
+      case "INVOCATION":
+        return INVOCATION;
+      case "READ":
+        return READ;
+      case "READ_WRITE":
+        return READ_WRITE;
+      case "REFERENCE":
+        return REFERENCE;
+      case "UNKNOWN":
+        return UNKNOWN;
+      case "WRITE":
+        return WRITE;
+    }
+    throw new Exception('Illegal enum value: $name');
+  }
+
+  factory SearchResultKind.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json is String) {
+      try {
+        return new SearchResultKind(json);
+      } catch (_) {
+        // Fall through
+      }
+    }
+    throw jsonDecoder.mismatch(jsonPath, "SearchResultKind", json);
+  }
+
+  @override
+  String toString() => "SearchResultKind.$name";
+
+  String toJson() => name;
 }
 
 /**
- * convertGetterToMethod options
+ * search.results params
+ *
+ * {
+ *   "id": SearchId
+ *   "results": List<SearchResult>
+ *   "isLast": bool
+ * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ConvertGetterToMethodOptions extends RefactoringOptions {
-  @override
-  bool operator ==(other) {
-    if (other is ConvertGetterToMethodOptions) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 488848400;
-  }
-}
-
-/**
- * convertMethodToGetter feedback
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ConvertMethodToGetterFeedback extends RefactoringFeedback {
-  @override
-  bool operator ==(other) {
-    if (other is ConvertMethodToGetterFeedback) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 165291526;
-  }
-}
-
-/**
- * convertMethodToGetter options
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ConvertMethodToGetterOptions extends RefactoringOptions {
-  @override
-  bool operator ==(other) {
-    if (other is ConvertMethodToGetterOptions) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 27952290;
-  }
-}
-
-/**
- * extractLocalVariable feedback
- *
- * {
- *   "coveringExpressionOffsets": optional List<int>
- *   "coveringExpressionLengths": optional List<int>
- *   "names": List<String>
- *   "offsets": List<int>
- *   "lengths": List<int>
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class ExtractLocalVariableFeedback extends RefactoringFeedback {
-  List<int> _coveringExpressionOffsets;
-
-  List<int> _coveringExpressionLengths;
-
-  List<String> _names;
-
-  List<int> _offsets;
-
-  List<int> _lengths;
-
-  /**
-   * The offsets of the expressions that cover the specified selection, from
-   * the down most to the up most.
-   */
-  List<int> get coveringExpressionOffsets => _coveringExpressionOffsets;
-
-  /**
-   * The offsets of the expressions that cover the specified selection, from
-   * the down most to the up most.
-   */
-  void set coveringExpressionOffsets(List<int> value) {
-    this._coveringExpressionOffsets = value;
-  }
-
-  /**
-   * The lengths of the expressions that cover the specified selection, from
-   * the down most to the up most.
-   */
-  List<int> get coveringExpressionLengths => _coveringExpressionLengths;
-
-  /**
-   * The lengths of the expressions that cover the specified selection, from
-   * the down most to the up most.
-   */
-  void set coveringExpressionLengths(List<int> value) {
-    this._coveringExpressionLengths = value;
-  }
-
-  /**
-   * The proposed names for the local variable.
-   */
-  List<String> get names => _names;
-
-  /**
-   * The proposed names for the local variable.
-   */
-  void set names(List<String> value) {
+class SearchResultsParams implements HasToJson {
+  String _id;
+
+  List<SearchResult> _results;
+
+  bool _isLast;
+
+  /**
+   * The id associated with the search.
+   */
+  String get id => _id;
+
+  /**
+   * The id associated with the search.
+   */
+  void set id(String value) {
     assert(value != null);
-    this._names = value;
-  }
-
-  /**
-   * The offsets of the expressions that would be replaced by a reference to
-   * the variable.
-   */
-  List<int> get offsets => _offsets;
-
-  /**
-   * The offsets of the expressions that would be replaced by a reference to
-   * the variable.
-   */
-  void set offsets(List<int> value) {
+    this._id = value;
+  }
+
+  /**
+   * The search results being reported.
+   */
+  List<SearchResult> get results => _results;
+
+  /**
+   * The search results being reported.
+   */
+  void set results(List<SearchResult> value) {
     assert(value != null);
-    this._offsets = value;
-  }
-
-  /**
-   * The lengths of the expressions that would be replaced by a reference to
-   * the variable. The lengths correspond to the offsets. In other words, for a
-   * given expression, if the offset of that expression is offsets[i], then the
-   * length of that expression is lengths[i].
-   */
-  List<int> get lengths => _lengths;
-
-  /**
-   * The lengths of the expressions that would be replaced by a reference to
-   * the variable. The lengths correspond to the offsets. In other words, for a
-   * given expression, if the offset of that expression is offsets[i], then the
-   * length of that expression is lengths[i].
-   */
-  void set lengths(List<int> value) {
+    this._results = value;
+  }
+
+  /**
+   * True if this is that last set of results that will be returned for the
+   * indicated search.
+   */
+  bool get isLast => _isLast;
+
+  /**
+   * True if this is that last set of results that will be returned for the
+   * indicated search.
+   */
+  void set isLast(bool value) {
     assert(value != null);
-    this._lengths = value;
-  }
-
-  ExtractLocalVariableFeedback(
-      List<String> names, List<int> offsets, List<int> lengths,
-      {List<int> coveringExpressionOffsets,
-      List<int> coveringExpressionLengths}) {
-    this.coveringExpressionOffsets = coveringExpressionOffsets;
-    this.coveringExpressionLengths = coveringExpressionLengths;
-    this.names = names;
-    this.offsets = offsets;
-    this.lengths = lengths;
-  }
-
-  factory ExtractLocalVariableFeedback.fromJson(
+    this._isLast = value;
+  }
+
+  SearchResultsParams(String id, List<SearchResult> results, bool isLast) {
+    this.id = id;
+    this.results = results;
+    this.isLast = isLast;
+  }
+
+  factory SearchResultsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      List<int> coveringExpressionOffsets;
-      if (json.containsKey("coveringExpressionOffsets")) {
-        coveringExpressionOffsets = jsonDecoder.decodeList(
-            jsonPath + ".coveringExpressionOffsets",
-            json["coveringExpressionOffsets"],
-            jsonDecoder.decodeInt);
-      }
-      List<int> coveringExpressionLengths;
-      if (json.containsKey("coveringExpressionLengths")) {
-        coveringExpressionLengths = jsonDecoder.decodeList(
-            jsonPath + ".coveringExpressionLengths",
-            json["coveringExpressionLengths"],
-            jsonDecoder.decodeInt);
-      }
-      List<String> names;
-      if (json.containsKey("names")) {
-        names = jsonDecoder.decodeList(
-            jsonPath + ".names", json["names"], jsonDecoder.decodeString);
+      String id;
+      if (json.containsKey("id")) {
+        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "names");
-      }
-      List<int> offsets;
-      if (json.containsKey("offsets")) {
-        offsets = jsonDecoder.decodeList(
-            jsonPath + ".offsets", json["offsets"], jsonDecoder.decodeInt);
+        throw jsonDecoder.mismatch(jsonPath, "id");
+      }
+      List<SearchResult> results;
+      if (json.containsKey("results")) {
+        results = jsonDecoder.decodeList(
+            jsonPath + ".results",
+            json["results"],
+            (String jsonPath, Object json) =>
+                new SearchResult.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "offsets");
-      }
-      List<int> lengths;
-      if (json.containsKey("lengths")) {
-        lengths = jsonDecoder.decodeList(
-            jsonPath + ".lengths", json["lengths"], jsonDecoder.decodeInt);
+        throw jsonDecoder.mismatch(jsonPath, "results");
+      }
+      bool isLast;
+      if (json.containsKey("isLast")) {
+        isLast = jsonDecoder.decodeBool(jsonPath + ".isLast", json["isLast"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "lengths");
-      }
-      return new ExtractLocalVariableFeedback(names, offsets, lengths,
-          coveringExpressionOffsets: coveringExpressionOffsets,
-          coveringExpressionLengths: coveringExpressionLengths);
+        throw jsonDecoder.mismatch(jsonPath, "isLast");
+      }
+      return new SearchResultsParams(id, results, isLast);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "extractLocalVariable feedback", json);
-    }
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "search.results params", json);
+    }
+  }
+
+  factory SearchResultsParams.fromNotification(Notification notification) {
+    return new SearchResultsParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    if (coveringExpressionOffsets != null) {
-      result["coveringExpressionOffsets"] = coveringExpressionOffsets;
-    }
-    if (coveringExpressionLengths != null) {
-      result["coveringExpressionLengths"] = coveringExpressionLengths;
-    }
-    result["names"] = names;
-    result["offsets"] = offsets;
-    result["lengths"] = lengths;
+    result["id"] = id;
+    result["results"] =
+        results.map((SearchResult value) => value.toJson()).toList();
+    result["isLast"] = isLast;
     return result;
   }
 
-  @override
+  Notification toNotification() {
+    return new Notification("search.results", toJson());
+  }
+
+  @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ExtractLocalVariableFeedback) {
-      return listEqual(coveringExpressionOffsets,
-              other.coveringExpressionOffsets, (int a, int b) => a == b) &&
-          listEqual(coveringExpressionLengths, other.coveringExpressionLengths,
-              (int a, int b) => a == b) &&
-          listEqual(names, other.names, (String a, String b) => a == b) &&
-          listEqual(offsets, other.offsets, (int a, int b) => a == b) &&
-          listEqual(lengths, other.lengths, (int a, int b) => a == b);
+    if (other is SearchResultsParams) {
+      return id == other.id &&
+          listEqual(results, other.results,
+              (SearchResult a, SearchResult b) => a == b) &&
+          isLast == other.isLast;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, coveringExpressionOffsets.hashCode);
-    hash = JenkinsSmiHash.combine(hash, coveringExpressionLengths.hashCode);
-    hash = JenkinsSmiHash.combine(hash, names.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offsets.hashCode);
-    hash = JenkinsSmiHash.combine(hash, lengths.hashCode);
+    hash = JenkinsSmiHash.combine(hash, id.hashCode);
+    hash = JenkinsSmiHash.combine(hash, results.hashCode);
+    hash = JenkinsSmiHash.combine(hash, isLast.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * extractLocalVariable options
+ * server.connected params
  *
  * {
- *   "name": String
- *   "extractAll": bool
+ *   "version": String
+ *   "pid": int
+ *   "sessionId": optional String
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ExtractLocalVariableOptions extends RefactoringOptions {
-  String _name;
+class ServerConnectedParams implements HasToJson {
+  String _version;
 
-  bool _extractAll;
+  int _pid;
+
+  String _sessionId;
 
   /**
-   * The name that the local variable should be given.
+   * The version number of the analysis server.
    */
-  String get name => _name;
+  String get version => _version;
 
   /**
-   * The name that the local variable should be given.
+   * The version number of the analysis server.
    */
-  void set name(String value) {
+  void set version(String value) {
     assert(value != null);
-    this._name = value;
+    this._version = value;
   }
 
   /**
-   * True if all occurrences of the expression within the scope in which the
-   * variable will be defined should be replaced by a reference to the local
-   * variable. The expression used to initiate the refactoring will always be
-   * replaced.
+   * The process id of the analysis server process.
    */
-  bool get extractAll => _extractAll;
+  int get pid => _pid;
 
   /**
-   * True if all occurrences of the expression within the scope in which the
-   * variable will be defined should be replaced by a reference to the local
-   * variable. The expression used to initiate the refactoring will always be
-   * replaced.
+   * The process id of the analysis server process.
    */
-  void set extractAll(bool value) {
+  void set pid(int value) {
     assert(value != null);
-    this._extractAll = value;
+    this._pid = value;
   }
 
-  ExtractLocalVariableOptions(String name, bool extractAll) {
-    this.name = name;
-    this.extractAll = extractAll;
+  /**
+   * The session id for this session.
+   */
+  String get sessionId => _sessionId;
+
+  /**
+   * The session id for this session.
+   */
+  void set sessionId(String value) {
+    this._sessionId = value;
   }
 
-  factory ExtractLocalVariableOptions.fromJson(
+  ServerConnectedParams(String version, int pid, {String sessionId}) {
+    this.version = version;
+    this.pid = pid;
+    this.sessionId = sessionId;
+  }
+
+  factory ServerConnectedParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String name;
-      if (json.containsKey("name")) {
-        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
+      String version;
+      if (json.containsKey("version")) {
+        version =
+            jsonDecoder.decodeString(jsonPath + ".version", json["version"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "name");
+        throw jsonDecoder.mismatch(jsonPath, "version");
       }
-      bool extractAll;
-      if (json.containsKey("extractAll")) {
-        extractAll = jsonDecoder.decodeBool(
-            jsonPath + ".extractAll", json["extractAll"]);
+      int pid;
+      if (json.containsKey("pid")) {
+        pid = jsonDecoder.decodeInt(jsonPath + ".pid", json["pid"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "extractAll");
+        throw jsonDecoder.mismatch(jsonPath, "pid");
       }
-      return new ExtractLocalVariableOptions(name, extractAll);
+      String sessionId;
+      if (json.containsKey("sessionId")) {
+        sessionId = jsonDecoder.decodeString(
+            jsonPath + ".sessionId", json["sessionId"]);
+      }
+      return new ServerConnectedParams(version, pid, sessionId: sessionId);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "extractLocalVariable options", json);
+      throw jsonDecoder.mismatch(jsonPath, "server.connected params", json);
     }
   }
 
-  factory ExtractLocalVariableOptions.fromRefactoringParams(
-      EditGetRefactoringParams refactoringParams, Request request) {
-    return new ExtractLocalVariableOptions.fromJson(
-        new RequestDecoder(request), "options", refactoringParams.options);
+  factory ServerConnectedParams.fromNotification(Notification notification) {
+    return new ServerConnectedParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
   }
 
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["name"] = name;
-    result["extractAll"] = extractAll;
+    result["version"] = version;
+    result["pid"] = pid;
+    if (sessionId != null) {
+      result["sessionId"] = sessionId;
+    }
     return result;
   }
 
+  Notification toNotification() {
+    return new Notification("server.connected", toJson());
+  }
+
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ExtractLocalVariableOptions) {
-      return name == other.name && extractAll == other.extractAll;
+    if (other is ServerConnectedParams) {
+      return version == other.version &&
+          pid == other.pid &&
+          sessionId == other.sessionId;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, name.hashCode);
-    hash = JenkinsSmiHash.combine(hash, extractAll.hashCode);
+    hash = JenkinsSmiHash.combine(hash, version.hashCode);
+    hash = JenkinsSmiHash.combine(hash, pid.hashCode);
+    hash = JenkinsSmiHash.combine(hash, sessionId.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * extractMethod feedback
+ * server.error params
  *
  * {
- *   "offset": int
- *   "length": int
- *   "returnType": String
- *   "names": List<String>
- *   "canCreateGetter": bool
- *   "parameters": List<RefactoringMethodParameter>
- *   "offsets": List<int>
- *   "lengths": List<int>
+ *   "isFatal": bool
+ *   "message": String
+ *   "stackTrace": String
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ExtractMethodFeedback extends RefactoringFeedback {
-  int _offset;
-
-  int _length;
-
-  String _returnType;
-
-  List<String> _names;
-
-  bool _canCreateGetter;
-
-  List<RefactoringMethodParameter> _parameters;
-
-  List<int> _offsets;
-
-  List<int> _lengths;
-
-  /**
-   * The offset to the beginning of the expression or statements that will be
-   * extracted.
-   */
-  int get offset => _offset;
-
-  /**
-   * The offset to the beginning of the expression or statements that will be
-   * extracted.
-   */
-  void set offset(int value) {
-    assert(value != null);
-    this._offset = value;
-  }
-
-  /**
-   * The length of the expression or statements that will be extracted.
-   */
-  int get length => _length;
-
-  /**
-   * The length of the expression or statements that will be extracted.
-   */
-  void set length(int value) {
-    assert(value != null);
-    this._length = value;
-  }
-
-  /**
-   * The proposed return type for the method. If the returned element does not
-   * have a declared return type, this field will contain an empty string.
-   */
-  String get returnType => _returnType;
-
-  /**
-   * The proposed return type for the method. If the returned element does not
-   * have a declared return type, this field will contain an empty string.
-   */
-  void set returnType(String value) {
-    assert(value != null);
-    this._returnType = value;
-  }
-
-  /**
-   * The proposed names for the method.
-   */
-  List<String> get names => _names;
-
-  /**
-   * The proposed names for the method.
-   */
-  void set names(List<String> value) {
-    assert(value != null);
-    this._names = value;
-  }
-
-  /**
-   * True if a getter could be created rather than a method.
-   */
-  bool get canCreateGetter => _canCreateGetter;
-
-  /**
-   * True if a getter could be created rather than a method.
-   */
-  void set canCreateGetter(bool value) {
-    assert(value != null);
-    this._canCreateGetter = value;
-  }
-
-  /**
-   * The proposed parameters for the method.
-   */
-  List<RefactoringMethodParameter> get parameters => _parameters;
-
-  /**
-   * The proposed parameters for the method.
-   */
-  void set parameters(List<RefactoringMethodParameter> value) {
-    assert(value != null);
-    this._parameters = value;
-  }
-
-  /**
-   * The offsets of the expressions or statements that would be replaced by an
-   * invocation of the method.
-   */
-  List<int> get offsets => _offsets;
-
-  /**
-   * The offsets of the expressions or statements that would be replaced by an
-   * invocation of the method.
-   */
-  void set offsets(List<int> value) {
-    assert(value != null);
-    this._offsets = value;
-  }
-
-  /**
-   * The lengths of the expressions or statements that would be replaced by an
-   * invocation of the method. The lengths correspond to the offsets. In other
-   * words, for a given expression (or block of statements), if the offset of
-   * that expression is offsets[i], then the length of that expression is
-   * lengths[i].
-   */
-  List<int> get lengths => _lengths;
-
-  /**
-   * The lengths of the expressions or statements that would be replaced by an
-   * invocation of the method. The lengths correspond to the offsets. In other
-   * words, for a given expression (or block of statements), if the offset of
-   * that expression is offsets[i], then the length of that expression is
-   * lengths[i].
-   */
-  void set lengths(List<int> value) {
-    assert(value != null);
-    this._lengths = value;
-  }
-
-  ExtractMethodFeedback(
-      int offset,
-      int length,
-      String returnType,
-      List<String> names,
-      bool canCreateGetter,
-      List<RefactoringMethodParameter> parameters,
-      List<int> offsets,
-      List<int> lengths) {
-    this.offset = offset;
-    this.length = length;
-    this.returnType = returnType;
-    this.names = names;
-    this.canCreateGetter = canCreateGetter;
-    this.parameters = parameters;
-    this.offsets = offsets;
-    this.lengths = lengths;
-  }
-
-  factory ExtractMethodFeedback.fromJson(
+class ServerErrorParams implements HasToJson {
+  bool _isFatal;
+
+  String _message;
+
+  String _stackTrace;
+
+  /**
+   * True if the error is a fatal error, meaning that the server will shutdown
+   * automatically after sending this notification.
+   */
+  bool get isFatal => _isFatal;
+
+  /**
+   * True if the error is a fatal error, meaning that the server will shutdown
+   * automatically after sending this notification.
+   */
+  void set isFatal(bool value) {
+    assert(value != null);
+    this._isFatal = value;
+  }
+
+  /**
+   * The error message indicating what kind of error was encountered.
+   */
+  String get message => _message;
+
+  /**
+   * The error message indicating what kind of error was encountered.
+   */
+  void set message(String value) {
+    assert(value != null);
+    this._message = value;
+  }
+
+  /**
+   * The stack trace associated with the generation of the error, used for
+   * debugging the server.
+   */
+  String get stackTrace => _stackTrace;
+
+  /**
+   * The stack trace associated with the generation of the error, used for
+   * debugging the server.
+   */
+  void set stackTrace(String value) {
+    assert(value != null);
+    this._stackTrace = value;
+  }
+
+  ServerErrorParams(bool isFatal, String message, String stackTrace) {
+    this.isFatal = isFatal;
+    this.message = message;
+    this.stackTrace = stackTrace;
+  }
+
+  factory ServerErrorParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
-      }
-      int length;
-      if (json.containsKey("length")) {
-        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
-      }
-      String returnType;
-      if (json.containsKey("returnType")) {
-        returnType = jsonDecoder.decodeString(
-            jsonPath + ".returnType", json["returnType"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "returnType");
-      }
-      List<String> names;
-      if (json.containsKey("names")) {
-        names = jsonDecoder.decodeList(
-            jsonPath + ".names", json["names"], jsonDecoder.decodeString);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "names");
-      }
-      bool canCreateGetter;
-      if (json.containsKey("canCreateGetter")) {
-        canCreateGetter = jsonDecoder.decodeBool(
-            jsonPath + ".canCreateGetter", json["canCreateGetter"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "canCreateGetter");
-      }
-      List<RefactoringMethodParameter> parameters;
-      if (json.containsKey("parameters")) {
-        parameters = jsonDecoder.decodeList(
-            jsonPath + ".parameters",
-            json["parameters"],
-            (String jsonPath, Object json) =>
-                new RefactoringMethodParameter.fromJson(
-                    jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "parameters");
-      }
-      List<int> offsets;
-      if (json.containsKey("offsets")) {
-        offsets = jsonDecoder.decodeList(
-            jsonPath + ".offsets", json["offsets"], jsonDecoder.decodeInt);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "offsets");
-      }
-      List<int> lengths;
-      if (json.containsKey("lengths")) {
-        lengths = jsonDecoder.decodeList(
-            jsonPath + ".lengths", json["lengths"], jsonDecoder.decodeInt);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "lengths");
-      }
-      return new ExtractMethodFeedback(offset, length, returnType, names,
-          canCreateGetter, parameters, offsets, lengths);
+      bool isFatal;
+      if (json.containsKey("isFatal")) {
+        isFatal =
+            jsonDecoder.decodeBool(jsonPath + ".isFatal", json["isFatal"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "isFatal");
+      }
+      String message;
+      if (json.containsKey("message")) {
+        message =
+            jsonDecoder.decodeString(jsonPath + ".message", json["message"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "message");
+      }
+      String stackTrace;
+      if (json.containsKey("stackTrace")) {
+        stackTrace = jsonDecoder.decodeString(
+            jsonPath + ".stackTrace", json["stackTrace"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "stackTrace");
+      }
+      return new ServerErrorParams(isFatal, message, stackTrace);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "extractMethod feedback", json);
-    }
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "server.error params", json);
+    }
+  }
+
+  factory ServerErrorParams.fromNotification(Notification notification) {
+    return new ServerErrorParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["offset"] = offset;
-    result["length"] = length;
-    result["returnType"] = returnType;
-    result["names"] = names;
-    result["canCreateGetter"] = canCreateGetter;
-    result["parameters"] = parameters
-        .map((RefactoringMethodParameter value) => value.toJson())
-        .toList();
-    result["offsets"] = offsets;
-    result["lengths"] = lengths;
+    result["isFatal"] = isFatal;
+    result["message"] = message;
+    result["stackTrace"] = stackTrace;
     return result;
   }
 
+  Notification toNotification() {
+    return new Notification("server.error", toJson());
+  }
+
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ExtractMethodFeedback) {
-      return offset == other.offset &&
-          length == other.length &&
-          returnType == other.returnType &&
-          listEqual(names, other.names, (String a, String b) => a == b) &&
-          canCreateGetter == other.canCreateGetter &&
-          listEqual(
-              parameters,
-              other.parameters,
-              (RefactoringMethodParameter a, RefactoringMethodParameter b) =>
-                  a == b) &&
-          listEqual(offsets, other.offsets, (int a, int b) => a == b) &&
-          listEqual(lengths, other.lengths, (int a, int b) => a == b);
+    if (other is ServerErrorParams) {
+      return isFatal == other.isFatal &&
+          message == other.message &&
+          stackTrace == other.stackTrace;
     }
     return false;
   }
+
+  @override
+  int get hashCode {
+    int hash = 0;
+    hash = JenkinsSmiHash.combine(hash, isFatal.hashCode);
+    hash = JenkinsSmiHash.combine(hash, message.hashCode);
+    hash = JenkinsSmiHash.combine(hash, stackTrace.hashCode);
+    return JenkinsSmiHash.finish(hash);
+  }
+}
+
+/**
+ * server.getVersion params
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ServerGetVersionParams implements RequestParams {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "server.getVersion", null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is ServerGetVersionParams) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 55877452;
+  }
+}
+
+/**
+ * server.getVersion result
+ *
+ * {
+ *   "version": String
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ServerGetVersionResult implements ResponseResult {
+  String _version;
+
+  /**
+   * The version number of the analysis server.
+   */
+  String get version => _version;
+
+  /**
+   * The version number of the analysis server.
+   */
+  void set version(String value) {
+    assert(value != null);
+    this._version = value;
+  }
+
+  ServerGetVersionResult(String version) {
+    this.version = version;
+  }
+
+  factory ServerGetVersionResult.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json == null) {
+      json = {};
+    }
+    if (json is Map) {
+      String version;
+      if (json.containsKey("version")) {
+        version =
+            jsonDecoder.decodeString(jsonPath + ".version", json["version"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "version");
+      }
+      return new ServerGetVersionResult(version);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "server.getVersion result", json);
+    }
+  }
+
+  factory ServerGetVersionResult.fromResponse(Response response) {
+    return new ServerGetVersionResult.fromJson(
+        new ResponseDecoder(REQUEST_ID_REFACTORING_KINDS.remove(response.id)),
+        "result",
+        response.result);
+  }
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["version"] = version;
+    return result;
+  }
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: toJson());
+  }
+
+  @override
+  String toString() => JSON.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is ServerGetVersionResult) {
+      return version == other.version;
+    }
+    return false;
+  }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    hash = JenkinsSmiHash.combine(hash, returnType.hashCode);
-    hash = JenkinsSmiHash.combine(hash, names.hashCode);
-    hash = JenkinsSmiHash.combine(hash, canCreateGetter.hashCode);
-    hash = JenkinsSmiHash.combine(hash, parameters.hashCode);
-    hash = JenkinsSmiHash.combine(hash, offsets.hashCode);
-    hash = JenkinsSmiHash.combine(hash, lengths.hashCode);
+    hash = JenkinsSmiHash.combine(hash, version.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * extractMethod options
+ * ServerService
+ *
+ * enum {
+ *   STATUS
+ * }
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ServerService implements Enum {
+  static const ServerService STATUS = const ServerService._("STATUS");
+
+  /**
+   * A list containing all of the enum values that are defined.
+   */
+  static const List<ServerService> VALUES = const <ServerService>[STATUS];
+
+  @override
+  final String name;
+
+  const ServerService._(this.name);
+
+  factory ServerService(String name) {
+    switch (name) {
+      case "STATUS":
+        return STATUS;
+    }
+    throw new Exception('Illegal enum value: $name');
+  }
+
+  factory ServerService.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object json) {
+    if (json is String) {
+      try {
+        return new ServerService(json);
+      } catch (_) {
+        // Fall through
+      }
+    }
+    throw jsonDecoder.mismatch(jsonPath, "ServerService", json);
+  }
+
+  @override
+  String toString() => "ServerService.$name";
+
+  String toJson() => name;
+}
+
+/**
+ * server.setSubscriptions params
  *
  * {
- *   "returnType": String
- *   "createGetter": bool
- *   "name": String
- *   "parameters": List<RefactoringMethodParameter>
- *   "extractAll": bool
+ *   "subscriptions": List<ServerService>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class ExtractMethodOptions extends RefactoringOptions {
-  String _returnType;
-
-  bool _createGetter;
-
-  String _name;
-
-  List<RefactoringMethodParameter> _parameters;
-
-  bool _extractAll;
-
-  /**
-   * The return type that should be defined for the method.
-   */
-  String get returnType => _returnType;
-
-  /**
-   * The return type that should be defined for the method.
-   */
-  void set returnType(String value) {
+class ServerSetSubscriptionsParams implements RequestParams {
+  List<ServerService> _subscriptions;
+
+  /**
+   * A list of the services being subscribed to.
+   */
+  List<ServerService> get subscriptions => _subscriptions;
+
+  /**
+   * A list of the services being subscribed to.
+   */
+  void set subscriptions(List<ServerService> value) {
     assert(value != null);
-    this._returnType = value;
-  }
-
-  /**
-   * True if a getter should be created rather than a method. It is an error if
-   * this field is true and the list of parameters is non-empty.
-   */
-  bool get createGetter => _createGetter;
-
-  /**
-   * True if a getter should be created rather than a method. It is an error if
-   * this field is true and the list of parameters is non-empty.
-   */
-  void set createGetter(bool value) {
-    assert(value != null);
-    this._createGetter = value;
-  }
-
-  /**
-   * The name that the method should be given.
-   */
-  String get name => _name;
-
-  /**
-   * The name that the method should be given.
-   */
-  void set name(String value) {
-    assert(value != null);
-    this._name = value;
-  }
-
-  /**
-   * The parameters that should be defined for the method.
-   *
-   * It is an error if a REQUIRED or NAMED parameter follows a POSITIONAL
-   * parameter. It is an error if a REQUIRED or POSITIONAL parameter follows a
-   * NAMED parameter.
-   *
-   * - To change the order and/or update proposed parameters, add parameters
-   *   with the same identifiers as proposed.
-   * - To add new parameters, omit their identifier.
-   * - To remove some parameters, omit them in this list.
-   */
-  List<RefactoringMethodParameter> get parameters => _parameters;
-
-  /**
-   * The parameters that should be defined for the method.
-   *
-   * It is an error if a REQUIRED or NAMED parameter follows a POSITIONAL
-   * parameter. It is an error if a REQUIRED or POSITIONAL parameter follows a
-   * NAMED parameter.
-   *
-   * - To change the order and/or update proposed parameters, add parameters
-   *   with the same identifiers as proposed.
-   * - To add new parameters, omit their identifier.
-   * - To remove some parameters, omit them in this list.
-   */
-  void set parameters(List<RefactoringMethodParameter> value) {
-    assert(value != null);
-    this._parameters = value;
-  }
-
-  /**
-   * True if all occurrences of the expression or statements should be replaced
-   * by an invocation of the method. The expression or statements used to
-   * initiate the refactoring will always be replaced.
-   */
-  bool get extractAll => _extractAll;
-
-  /**
-   * True if all occurrences of the expression or statements should be replaced
-   * by an invocation of the method. The expression or statements used to
-   * initiate the refactoring will always be replaced.
-   */
-  void set extractAll(bool value) {
-    assert(value != null);
-    this._extractAll = value;
-  }
-
-  ExtractMethodOptions(String returnType, bool createGetter, String name,
-      List<RefactoringMethodParameter> parameters, bool extractAll) {
-    this.returnType = returnType;
-    this.createGetter = createGetter;
-    this.name = name;
-    this.parameters = parameters;
-    this.extractAll = extractAll;
-  }
-
-  factory ExtractMethodOptions.fromJson(
+    this._subscriptions = value;
+  }
+
+  ServerSetSubscriptionsParams(List<ServerService> subscriptions) {
+    this.subscriptions = subscriptions;
+  }
+
+  factory ServerSetSubscriptionsParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String returnType;
-      if (json.containsKey("returnType")) {
-        returnType = jsonDecoder.decodeString(
-            jsonPath + ".returnType", json["returnType"]);
+      List<ServerService> subscriptions;
+      if (json.containsKey("subscriptions")) {
+        subscriptions = jsonDecoder.decodeList(
+            jsonPath + ".subscriptions",
+            json["subscriptions"],
+            (String jsonPath, Object json) =>
+                new ServerService.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "returnType");
+        throw jsonDecoder.mismatch(jsonPath, "subscriptions");
       }
-      bool createGetter;
-      if (json.containsKey("createGetter")) {
-        createGetter = jsonDecoder.decodeBool(
-            jsonPath + ".createGetter", json["createGetter"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "createGetter");
-      }
-      String name;
-      if (json.containsKey("name")) {
-        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "name");
-      }
-      List<RefactoringMethodParameter> parameters;
-      if (json.containsKey("parameters")) {
-        parameters = jsonDecoder.decodeList(
-            jsonPath + ".parameters",
-            json["parameters"],
-            (String jsonPath, Object json) =>
-                new RefactoringMethodParameter.fromJson(
-                    jsonDecoder, jsonPath, json));
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "parameters");
-      }
-      bool extractAll;
-      if (json.containsKey("extractAll")) {
-        extractAll = jsonDecoder.decodeBool(
-            jsonPath + ".extractAll", json["extractAll"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "extractAll");
-      }
-      return new ExtractMethodOptions(
-          returnType, createGetter, name, parameters, extractAll);
+      return new ServerSetSubscriptionsParams(subscriptions);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "extractMethod options", json);
-    }
-  }
-
-  factory ExtractMethodOptions.fromRefactoringParams(
-      EditGetRefactoringParams refactoringParams, Request request) {
-    return new ExtractMethodOptions.fromJson(
-        new RequestDecoder(request), "options", refactoringParams.options);
-  }
-
+      throw jsonDecoder.mismatch(
+          jsonPath, "server.setSubscriptions params", json);
+    }
+  }
+
+  factory ServerSetSubscriptionsParams.fromRequest(Request request) {
+    return new ServerSetSubscriptionsParams.fromJson(
+        new RequestDecoder(request), "params", request.params);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["returnType"] = returnType;
-    result["createGetter"] = createGetter;
-    result["name"] = name;
-    result["parameters"] = parameters
-        .map((RefactoringMethodParameter value) => value.toJson())
-        .toList();
-    result["extractAll"] = extractAll;
+    result["subscriptions"] =
+        subscriptions.map((ServerService value) => value.toJson()).toList();
     return result;
   }
 
   @override
+  Request toRequest(String id) {
+    return new Request(id, "server.setSubscriptions", toJson());
+  }
+
+  @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is ExtractMethodOptions) {
-      return returnType == other.returnType &&
-          createGetter == other.createGetter &&
-          name == other.name &&
-          listEqual(
-              parameters,
-              other.parameters,
-              (RefactoringMethodParameter a, RefactoringMethodParameter b) =>
-                  a == b) &&
-          extractAll == other.extractAll;
+    if (other is ServerSetSubscriptionsParams) {
+      return listEqual(subscriptions, other.subscriptions,
+          (ServerService a, ServerService b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, returnType.hashCode);
-    hash = JenkinsSmiHash.combine(hash, createGetter.hashCode);
-    hash = JenkinsSmiHash.combine(hash, name.hashCode);
-    hash = JenkinsSmiHash.combine(hash, parameters.hashCode);
-    hash = JenkinsSmiHash.combine(hash, extractAll.hashCode);
+    hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * inlineLocalVariable feedback
+ * server.setSubscriptions result
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ServerSetSubscriptionsResult implements ResponseResult {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is ServerSetSubscriptionsResult) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 748820900;
+  }
+}
+
+/**
+ * server.shutdown params
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ServerShutdownParams implements RequestParams {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Request toRequest(String id) {
+    return new Request(id, "server.shutdown", null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is ServerShutdownParams) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 366630911;
+  }
+}
+
+/**
+ * server.shutdown result
+ *
+ * Clients may not extend, implement or mix-in this class.
+ */
+class ServerShutdownResult implements ResponseResult {
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{};
+
+  @override
+  Response toResponse(String id) {
+    return new Response(id, result: null);
+  }
+
+  @override
+  bool operator ==(other) {
+    if (other is ServerShutdownResult) {
+      return true;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode {
+    return 193626532;
+  }
+}
+
+/**
+ * server.status params
  *
  * {
- *   "name": String
- *   "occurrences": int
+ *   "analysis": optional AnalysisStatus
+ *   "pub": optional PubStatus
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class InlineLocalVariableFeedback extends RefactoringFeedback {
-  String _name;
-
-  int _occurrences;
-
-  /**
-   * The name of the variable being inlined.
-   */
-  String get name => _name;
-
-  /**
-   * The name of the variable being inlined.
-   */
-  void set name(String value) {
-    assert(value != null);
-    this._name = value;
-  }
-
-  /**
-   * The number of times the variable occurs.
-   */
-  int get occurrences => _occurrences;
-
-  /**
-   * The number of times the variable occurs.
-   */
-  void set occurrences(int value) {
-    assert(value != null);
-    this._occurrences = value;
-  }
-
-  InlineLocalVariableFeedback(String name, int occurrences) {
-    this.name = name;
-    this.occurrences = occurrences;
-  }
-
-  factory InlineLocalVariableFeedback.fromJson(
+class ServerStatusParams implements HasToJson {
+  AnalysisStatus _analysis;
+
+  PubStatus _pub;
+
+  /**
+   * The current status of analysis, including whether analysis is being
+   * performed and if so what is being analyzed.
+   */
+  AnalysisStatus get analysis => _analysis;
+
+  /**
+   * The current status of analysis, including whether analysis is being
+   * performed and if so what is being analyzed.
+   */
+  void set analysis(AnalysisStatus value) {
+    this._analysis = value;
+  }
+
+  /**
+   * The current status of pub execution, indicating whether we are currently
+   * running pub.
+   */
+  PubStatus get pub => _pub;
+
+  /**
+   * The current status of pub execution, indicating whether we are currently
+   * running pub.
+   */
+  void set pub(PubStatus value) {
+    this._pub = value;
+  }
+
+  ServerStatusParams({AnalysisStatus analysis, PubStatus pub}) {
+    this.analysis = analysis;
+    this.pub = pub;
+  }
+
+  factory ServerStatusParams.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String name;
-      if (json.containsKey("name")) {
-        name = jsonDecoder.decodeString(jsonPath + ".name", json["name"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "name");
+      AnalysisStatus analysis;
+      if (json.containsKey("analysis")) {
+        analysis = new AnalysisStatus.fromJson(
+            jsonDecoder, jsonPath + ".analysis", json["analysis"]);
       }
-      int occurrences;
-      if (json.containsKey("occurrences")) {
-        occurrences = jsonDecoder.decodeInt(
-            jsonPath + ".occurrences", json["occurrences"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "occurrences");
+      PubStatus pub;
+      if (json.containsKey("pub")) {
+        pub =
+            new PubStatus.fromJson(jsonDecoder, jsonPath + ".pub", json["pub"]);
       }
-      return new InlineLocalVariableFeedback(name, occurrences);
+      return new ServerStatusParams(analysis: analysis, pub: pub);
     } else {
-      throw jsonDecoder.mismatch(
-          jsonPath, "inlineLocalVariable feedback", json);
-    }
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "server.status params", json);
+    }
+  }
+
+  factory ServerStatusParams.fromNotification(Notification notification) {
+    return new ServerStatusParams.fromJson(
+        new ResponseDecoder(null), "params", notification.params);
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["name"] = name;
-    result["occurrences"] = occurrences;
+    if (analysis != null) {
+      result["analysis"] = analysis.toJson();
+    }
+    if (pub != null) {
+      result["pub"] = pub.toJson();
+    }
     return result;
   }
 
+  Notification toNotification() {
+    return new Notification("server.status", toJson());
+  }
+
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is InlineLocalVariableFeedback) {
-      return name == other.name && occurrences == other.occurrences;
-    }
-    return false;
-  }
+    if (other is ServerStatusParams) {
+      return analysis == other.analysis && pub == other.pub;
+    }
+    return false;
+  }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, name.hashCode);
-    hash = JenkinsSmiHash.combine(hash, occurrences.hashCode);
+    hash = JenkinsSmiHash.combine(hash, analysis.hashCode);
+    hash = JenkinsSmiHash.combine(hash, pub.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * inlineLocalVariable options
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class InlineLocalVariableOptions extends RefactoringOptions {
-  @override
-  bool operator ==(other) {
-    if (other is InlineLocalVariableOptions) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 540364977;
-  }
-}
-
-/**
- * inlineMethod feedback
+ * SourceChange
  *
  * {
- *   "className": optional String
- *   "methodName": String
- *   "isDeclaration": bool
+ *   "message": String
+ *   "edits": List<SourceFileEdit>
+ *   "linkedEditGroups": List<LinkedEditGroup>
+ *   "selection": optional Position
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class InlineMethodFeedback extends RefactoringFeedback {
-  String _className;
-
-  String _methodName;
-
-  bool _isDeclaration;
-
-  /**
-   * The name of the class enclosing the method being inlined. If not a class
-   * member is being inlined, this field will be absent.
-   */
-  String get className => _className;
-
-  /**
-   * The name of the class enclosing the method being inlined. If not a class
-   * member is being inlined, this field will be absent.
-   */
-  void set className(String value) {
-    this._className = value;
-  }
-
-  /**
-   * The name of the method (or function) being inlined.
-   */
-  String get methodName => _methodName;
-
-  /**
-   * The name of the method (or function) being inlined.
-   */
-  void set methodName(String value) {
+class SourceChange implements HasToJson {
+  String _message;
+
+  List<SourceFileEdit> _edits;
+
+  List<LinkedEditGroup> _linkedEditGroups;
+
+  Position _selection;
+
+  /**
+   * A human-readable description of the change to be applied.
+   */
+  String get message => _message;
+
+  /**
+   * A human-readable description of the change to be applied.
+   */
+  void set message(String value) {
     assert(value != null);
-    this._methodName = value;
-  }
-
-  /**
-   * True if the declaration of the method is selected. So all references
-   * should be inlined.
-   */
-  bool get isDeclaration => _isDeclaration;
-
-  /**
-   * True if the declaration of the method is selected. So all references
-   * should be inlined.
-   */
-  void set isDeclaration(bool value) {
+    this._message = value;
+  }
+
+  /**
+   * A list of the edits used to effect the change, grouped by file.
+   */
+  List<SourceFileEdit> get edits => _edits;
+
+  /**
+   * A list of the edits used to effect the change, grouped by file.
+   */
+  void set edits(List<SourceFileEdit> value) {
     assert(value != null);
-    this._isDeclaration = value;
-  }
-
-  InlineMethodFeedback(String methodName, bool isDeclaration,
-      {String className}) {
-    this.className = className;
-    this.methodName = methodName;
-    this.isDeclaration = isDeclaration;
-  }
-
-  factory InlineMethodFeedback.fromJson(
+    this._edits = value;
+  }
+
+  /**
+   * A list of the linked editing groups used to customize the changes that
+   * were made.
+   */
+  List<LinkedEditGroup> get linkedEditGroups => _linkedEditGroups;
+
+  /**
+   * A list of the linked editing groups used to customize the changes that
+   * were made.
+   */
+  void set linkedEditGroups(List<LinkedEditGroup> value) {
+    assert(value != null);
+    this._linkedEditGroups = value;
+  }
+
+  /**
+   * The position that should be selected after the edits have been applied.
+   */
+  Position get selection => _selection;
+
+  /**
+   * The position that should be selected after the edits have been applied.
+   */
+  void set selection(Position value) {
+    this._selection = value;
+  }
+
+  SourceChange(String message,
+      {List<SourceFileEdit> edits,
+      List<LinkedEditGroup> linkedEditGroups,
+      Position selection}) {
+    this.message = message;
+    if (edits == null) {
+      this.edits = <SourceFileEdit>[];
+    } else {
+      this.edits = edits;
+    }
+    if (linkedEditGroups == null) {
+      this.linkedEditGroups = <LinkedEditGroup>[];
+    } else {
+      this.linkedEditGroups = linkedEditGroups;
+    }
+    this.selection = selection;
+  }
+
+  factory SourceChange.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String className;
-      if (json.containsKey("className")) {
-        className = jsonDecoder.decodeString(
-            jsonPath + ".className", json["className"]);
-      }
-      String methodName;
-      if (json.containsKey("methodName")) {
-        methodName = jsonDecoder.decodeString(
-            jsonPath + ".methodName", json["methodName"]);
+      String message;
+      if (json.containsKey("message")) {
+        message =
+            jsonDecoder.decodeString(jsonPath + ".message", json["message"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "methodName");
-      }
-      bool isDeclaration;
-      if (json.containsKey("isDeclaration")) {
-        isDeclaration = jsonDecoder.decodeBool(
-            jsonPath + ".isDeclaration", json["isDeclaration"]);
+        throw jsonDecoder.mismatch(jsonPath, "message");
+      }
+      List<SourceFileEdit> edits;
+      if (json.containsKey("edits")) {
+        edits = jsonDecoder.decodeList(
+            jsonPath + ".edits",
+            json["edits"],
+            (String jsonPath, Object json) =>
+                new SourceFileEdit.fromJson(jsonDecoder, jsonPath, json));
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "isDeclaration");
-      }
-      return new InlineMethodFeedback(methodName, isDeclaration,
-          className: className);
+        throw jsonDecoder.mismatch(jsonPath, "edits");
+      }
+      List<LinkedEditGroup> linkedEditGroups;
+      if (json.containsKey("linkedEditGroups")) {
+        linkedEditGroups = jsonDecoder.decodeList(
+            jsonPath + ".linkedEditGroups",
+            json["linkedEditGroups"],
+            (String jsonPath, Object json) =>
+                new LinkedEditGroup.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "linkedEditGroups");
+      }
+      Position selection;
+      if (json.containsKey("selection")) {
+        selection = new Position.fromJson(
+            jsonDecoder, jsonPath + ".selection", json["selection"]);
+      }
+      return new SourceChange(message,
+          edits: edits,
+          linkedEditGroups: linkedEditGroups,
+          selection: selection);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "inlineMethod feedback", json);
-    }
-  }
-
+      throw jsonDecoder.mismatch(jsonPath, "SourceChange", json);
+    }
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    if (className != null) {
-      result["className"] = className;
-    }
-    result["methodName"] = methodName;
-    result["isDeclaration"] = isDeclaration;
+    result["message"] = message;
+    result["edits"] =
+        edits.map((SourceFileEdit value) => value.toJson()).toList();
+    result["linkedEditGroups"] = linkedEditGroups
+        .map((LinkedEditGroup value) => value.toJson())
+        .toList();
+    if (selection != null) {
+      result["selection"] = selection.toJson();
+    }
     return result;
   }
 
+  /**
+   * Adds [edit] to the [FileEdit] for the given [file].
+   */
+  void addEdit(String file, int fileStamp, SourceEdit edit) =>
+      addEditToSourceChange(this, file, fileStamp, edit);
+
+  /**
+   * Adds the given [FileEdit].
+   */
+  void addFileEdit(SourceFileEdit edit) {
+    edits.add(edit);
+  }
+
+  /**
+   * Adds the given [LinkedEditGroup].
+   */
+  void addLinkedEditGroup(LinkedEditGroup linkedEditGroup) {
+    linkedEditGroups.add(linkedEditGroup);
+  }
+
+  /**
+   * Returns the [FileEdit] for the given [file], maybe `null`.
+   */
+  SourceFileEdit getFileEdit(String file) => getChangeFileEdit(this, file);
+
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is InlineMethodFeedback) {
-      return className == other.className &&
-          methodName == other.methodName &&
-          isDeclaration == other.isDeclaration;
+    if (other is SourceChange) {
+      return message == other.message &&
+          listEqual(edits, other.edits,
+              (SourceFileEdit a, SourceFileEdit b) => a == b) &&
+          listEqual(linkedEditGroups, other.linkedEditGroups,
+              (LinkedEditGroup a, LinkedEditGroup b) => a == b) &&
+          selection == other.selection;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, className.hashCode);
-    hash = JenkinsSmiHash.combine(hash, methodName.hashCode);
-    hash = JenkinsSmiHash.combine(hash, isDeclaration.hashCode);
+    hash = JenkinsSmiHash.combine(hash, message.hashCode);
+    hash = JenkinsSmiHash.combine(hash, edits.hashCode);
+    hash = JenkinsSmiHash.combine(hash, linkedEditGroups.hashCode);
+    hash = JenkinsSmiHash.combine(hash, selection.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * inlineMethod options
+ * SourceEdit
  *
  * {
- *   "deleteSource": bool
- *   "inlineAll": bool
+ *   "offset": int
+ *   "length": int
+ *   "replacement": String
+ *   "id": optional String
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class InlineMethodOptions extends RefactoringOptions {
-  bool _deleteSource;
+class SourceEdit implements HasToJson {
+  /**
+   * Get the result of applying a set of [edits] to the given [code]. Edits are
+   * applied in the order they appear in [edits].
+   */
+  static String applySequence(String code, Iterable<SourceEdit> edits) =>
+      applySequenceOfEdits(code, edits);
 
-  bool _inlineAll;
+  int _offset;
+
+  int _length;
+
+  String _replacement;
+
+  String _id;
 
   /**
-   * True if the method being inlined should be removed. It is an error if this
-   * field is true and inlineAll is false.
+   * The offset of the region to be modified.
    */
-  bool get deleteSource => _deleteSource;
+  int get offset => _offset;
 
   /**
-   * True if the method being inlined should be removed. It is an error if this
-   * field is true and inlineAll is false.
+   * The offset of the region to be modified.
    */
-  void set deleteSource(bool value) {
+  void set offset(int value) {
     assert(value != null);
-    this._deleteSource = value;
+    this._offset = value;
   }
 
   /**
-   * True if all invocations of the method should be inlined, or false if only
-   * the invocation site used to create this refactoring should be inlined.
+   * The length of the region to be modified.
    */
-  bool get inlineAll => _inlineAll;
+  int get length => _length;
 
   /**
-   * True if all invocations of the method should be inlined, or false if only
-   * the invocation site used to create this refactoring should be inlined.
+   * The length of the region to be modified.
    */
-  void set inlineAll(bool value) {
+  void set length(int value) {
     assert(value != null);
-    this._inlineAll = value;
+    this._length = value;
   }
 
-  InlineMethodOptions(bool deleteSource, bool inlineAll) {
-    this.deleteSource = deleteSource;
-    this.inlineAll = inlineAll;
+  /**
+   * The code that is to replace the specified region in the original code.
+   */
+  String get replacement => _replacement;
+
+  /**
+   * The code that is to replace the specified region in the original code.
+   */
+  void set replacement(String value) {
+    assert(value != null);
+    this._replacement = value;
   }
 
-  factory InlineMethodOptions.fromJson(
+  /**
+   * An identifier that uniquely identifies this source edit from other edits
+   * in the same response. This field is omitted unless a containing structure
+   * needs to be able to identify the edit for some reason.
+   *
+   * For example, some refactoring operations can produce edits that might not
+   * be appropriate (referred to as potential edits). Such edits will have an
+   * id so that they can be referenced. Edits in the same response that do not
+   * need to be referenced will not have an id.
+   */
+  String get id => _id;
+
+  /**
+   * An identifier that uniquely identifies this source edit from other edits
+   * in the same response. This field is omitted unless a containing structure
+   * needs to be able to identify the edit for some reason.
+   *
+   * For example, some refactoring operations can produce edits that might not
+   * be appropriate (referred to as potential edits). Such edits will have an
+   * id so that they can be referenced. Edits in the same response that do not
+   * need to be referenced will not have an id.
+   */
+  void set id(String value) {
+    this._id = value;
+  }
+
+  SourceEdit(int offset, int length, String replacement, {String id}) {
+    this.offset = offset;
+    this.length = length;
+    this.replacement = replacement;
+    this.id = id;
+  }
+
+  factory SourceEdit.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      bool deleteSource;
-      if (json.containsKey("deleteSource")) {
-        deleteSource = jsonDecoder.decodeBool(
-            jsonPath + ".deleteSource", json["deleteSource"]);
+      int offset;
+      if (json.containsKey("offset")) {
+        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "deleteSource");
+        throw jsonDecoder.mismatch(jsonPath, "offset");
       }
-      bool inlineAll;
-      if (json.containsKey("inlineAll")) {
-        inlineAll =
-            jsonDecoder.decodeBool(jsonPath + ".inlineAll", json["inlineAll"]);
+      int length;
+      if (json.containsKey("length")) {
+        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "inlineAll");
+        throw jsonDecoder.mismatch(jsonPath, "length");
       }
-      return new InlineMethodOptions(deleteSource, inlineAll);
+      String replacement;
+      if (json.containsKey("replacement")) {
+        replacement = jsonDecoder.decodeString(
+            jsonPath + ".replacement", json["replacement"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "replacement");
+      }
+      String id;
+      if (json.containsKey("id")) {
+        id = jsonDecoder.decodeString(jsonPath + ".id", json["id"]);
+      }
+      return new SourceEdit(offset, length, replacement, id: id);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "inlineMethod options", json);
+      throw jsonDecoder.mismatch(jsonPath, "SourceEdit", json);
     }
   }
 
-  factory InlineMethodOptions.fromRefactoringParams(
-      EditGetRefactoringParams refactoringParams, Request request) {
-    return new InlineMethodOptions.fromJson(
-        new RequestDecoder(request), "options", refactoringParams.options);
+  /**
+   * The end of the region to be modified.
+   */
+  int get end => offset + length;
+
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["offset"] = offset;
+    result["length"] = length;
+    result["replacement"] = replacement;
+    if (id != null) {
+      result["id"] = id;
+    }
+    return result;
   }
 
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["deleteSource"] = deleteSource;
-    result["inlineAll"] = inlineAll;
-    return result;
-  }
+  /**
+   * Get the result of applying the edit to the given [code].
+   */
+  String apply(String code) => applyEdit(code, this);
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is InlineMethodOptions) {
-      return deleteSource == other.deleteSource && inlineAll == other.inlineAll;
+    if (other is SourceEdit) {
+      return offset == other.offset &&
+          length == other.length &&
+          replacement == other.replacement &&
+          id == other.id;
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, deleteSource.hashCode);
-    hash = JenkinsSmiHash.combine(hash, inlineAll.hashCode);
+    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
+    hash = JenkinsSmiHash.combine(hash, length.hashCode);
+    hash = JenkinsSmiHash.combine(hash, replacement.hashCode);
+    hash = JenkinsSmiHash.combine(hash, id.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * moveFile feedback
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class MoveFileFeedback extends RefactoringFeedback {
-  @override
-  bool operator ==(other) {
-    if (other is MoveFileFeedback) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    return 438975893;
-  }
-}
-
-/**
- * moveFile options
+ * SourceFileEdit
  *
  * {
- *   "newFile": FilePath
+ *   "file": FilePath
+ *   "fileStamp": long
+ *   "edits": List<SourceEdit>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class MoveFileOptions extends RefactoringOptions {
-  String _newFile;
+class SourceFileEdit implements HasToJson {
+  String _file;
+
+  int _fileStamp;
+
+  List<SourceEdit> _edits;
 
   /**
-   * The new file path to which the given file is being moved.
+   * The file containing the code to be modified.
    */
-  String get newFile => _newFile;
+  String get file => _file;
 
   /**
-   * The new file path to which the given file is being moved.
+   * The file containing the code to be modified.
    */
-  void set newFile(String value) {
+  void set file(String value) {
     assert(value != null);
-    this._newFile = value;
+    this._file = value;
   }
 
-  MoveFileOptions(String newFile) {
-    this.newFile = newFile;
+  /**
+   * The modification stamp of the file at the moment when the change was
+   * created, in milliseconds since the "Unix epoch". Will be -1 if the file
+   * did not exist and should be created. The client may use this field to make
+   * sure that the file was not changed since then, so it is safe to apply the
+   * change.
+   */
+  int get fileStamp => _fileStamp;
+
+  /**
+   * The modification stamp of the file at the moment when the change was
+   * created, in milliseconds since the "Unix epoch". Will be -1 if the file
+   * did not exist and should be created. The client may use this field to make
+   * sure that the file was not changed since then, so it is safe to apply the
+   * change.
+   */
+  void set fileStamp(int value) {
+    assert(value != null);
+    this._fileStamp = value;
   }
 
-  factory MoveFileOptions.fromJson(
+  /**
+   * A list of the edits used to effect the change.
+   */
+  List<SourceEdit> get edits => _edits;
+
+  /**
+   * A list of the edits used to effect the change.
+   */
+  void set edits(List<SourceEdit> value) {
+    assert(value != null);
+    this._edits = value;
+  }
+
+  SourceFileEdit(String file, int fileStamp, {List<SourceEdit> edits}) {
+    this.file = file;
+    this.fileStamp = fileStamp;
+    if (edits == null) {
+      this.edits = <SourceEdit>[];
+    } else {
+      this.edits = edits;
+    }
+  }
+
+  factory SourceFileEdit.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      String newFile;
-      if (json.containsKey("newFile")) {
-        newFile =
-            jsonDecoder.decodeString(jsonPath + ".newFile", json["newFile"]);
+      String file;
+      if (json.containsKey("file")) {
+        file = jsonDecoder.decodeString(jsonPath + ".file", json["file"]);
       } else {
-        throw jsonDecoder.missingKey(jsonPath, "newFile");
+        throw jsonDecoder.mismatch(jsonPath, "file");
       }
-      return new MoveFileOptions(newFile);
+      int fileStamp;
+      if (json.containsKey("fileStamp")) {
+        fileStamp =
+            jsonDecoder.decodeInt(jsonPath + ".fileStamp", json["fileStamp"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "fileStamp");
+      }
+      List<SourceEdit> edits;
+      if (json.containsKey("edits")) {
+        edits = jsonDecoder.decodeList(
+            jsonPath + ".edits",
+            json["edits"],
+            (String jsonPath, Object json) =>
+                new SourceEdit.fromJson(jsonDecoder, jsonPath, json));
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "edits");
+      }
+      return new SourceFileEdit(file, fileStamp, edits: edits);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "moveFile options", json);
+      throw jsonDecoder.mismatch(jsonPath, "SourceFileEdit", json);
     }
   }
 
-  factory MoveFileOptions.fromRefactoringParams(
-      EditGetRefactoringParams refactoringParams, Request request) {
-    return new MoveFileOptions.fromJson(
-        new RequestDecoder(request), "options", refactoringParams.options);
+  @override
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> result = {};
+    result["file"] = file;
+    result["fileStamp"] = fileStamp;
+    result["edits"] = edits.map((SourceEdit value) => value.toJson()).toList();
+    return result;
   }
 
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["newFile"] = newFile;
-    return result;
-  }
+  /**
+   * Adds the given [Edit] to the list.
+   */
+  void add(SourceEdit edit) => addEditForSource(this, edit);
+
+  /**
+   * Adds the given [Edit]s.
+   */
+  void addAll(Iterable<SourceEdit> edits) => addAllEditsForSource(this, edits);
 
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is MoveFileOptions) {
-      return newFile == other.newFile;
+    if (other is SourceFileEdit) {
+      return file == other.file &&
+          fileStamp == other.fileStamp &&
+          listEqual(edits, other.edits, (SourceEdit a, SourceEdit b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, newFile.hashCode);
+    hash = JenkinsSmiHash.combine(hash, file.hashCode);
+    hash = JenkinsSmiHash.combine(hash, fileStamp.hashCode);
+    hash = JenkinsSmiHash.combine(hash, edits.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }
 
 /**
- * rename feedback
+ * TypeHierarchyItem
  *
  * {
- *   "offset": int
- *   "length": int
- *   "elementKindName": String
- *   "oldName": String
+ *   "classElement": Element
+ *   "displayName": optional String
+ *   "memberElement": optional Element
+ *   "superclass": optional int
+ *   "interfaces": List<int>
+ *   "mixins": List<int>
+ *   "subclasses": List<int>
  * }
  *
  * Clients may not extend, implement or mix-in this class.
  */
-class RenameFeedback extends RefactoringFeedback {
-  int _offset;
-
-  int _length;
-
-  String _elementKindName;
-
-  String _oldName;
-
-  /**
-   * The offset to the beginning of the name selected to be renamed.
-   */
-  int get offset => _offset;
-
-  /**
-   * The offset to the beginning of the name selected to be renamed.
-   */
-  void set offset(int value) {
-    assert(value != null);
-    this._offset = value;
-  }
-
-  /**
-   * The length of the name selected to be renamed.
-   */
-  int get length => _length;
-
-  /**
-   * The length of the name selected to be renamed.
-   */
-  void set length(int value) {
-    assert(value != null);
-    this._length = value;
-  }
-
-  /**
-   * The human-readable description of the kind of element being renamed (such
-   * as "class" or "function type alias").
-   */
-  String get elementKindName => _elementKindName;
-
-  /**
-   * The human-readable description of the kind of element being renamed (such
-   * as "class" or "function type alias").
-   */
-  void set elementKindName(String value) {
-    assert(value != null);
-    this._elementKindName = value;
-  }
-
-  /**
-   * The old name of the element before the refactoring.
-   */
-  String get oldName => _oldName;
-
-  /**
-   * The old name of the element before the refactoring.
-   */
-  void set oldName(String value) {
-    assert(value != null);
-    this._oldName = value;
-  }
-
-  RenameFeedback(
-      int offset, int length, String elementKindName, String oldName) {
-    this.offset = offset;
-    this.length = length;
-    this.elementKindName = elementKindName;
-    this.oldName = oldName;
-  }
-
-  factory RenameFeedback.fromJson(
+class TypeHierarchyItem implements HasToJson {
+  Element _classElement;
+
+  String _displayName;
+
+  Element _memberElement;
+
+  int _superclass;
+
+  List<int> _interfaces;
+
+  List<int> _mixins;
+
+  List<int> _subclasses;
+
+  /**
+   * The class element represented by this item.
+   */
+  Element get classElement => _classElement;
+
+  /**
+   * The class element represented by this item.
+   */
+  void set classElement(Element value) {
+    assert(value != null);
+    this._classElement = value;
+  }
+
+  /**
+   * The name to be displayed for the class. This field will be omitted if the
+   * display name is the same as the name of the element. The display name is
+   * different if there is additional type information to be displayed, such as
+   * type arguments.
+   */
+  String get displayName => _displayName;
+
+  /**
+   * The name to be displayed for the class. This field will be omitted if the
+   * display name is the same as the name of the element. The display name is
+   * different if there is additional type information to be displayed, such as
+   * type arguments.
+   */
+  void set displayName(String value) {
+    this._displayName = value;
+  }
+
+  /**
+   * The member in the class corresponding to the member on which the hierarchy
+   * was requested. This field will be omitted if the hierarchy was not
+   * requested for a member or if the class does not have a corresponding
+   * member.
+   */
+  Element get memberElement => _memberElement;
+
+  /**
+   * The member in the class corresponding to the member on which the hierarchy
+   * was requested. This field will be omitted if the hierarchy was not
+   * requested for a member or if the class does not have a corresponding
+   * member.
+   */
+  void set memberElement(Element value) {
+    this._memberElement = value;
+  }
+
+  /**
+   * The index of the item representing the superclass of this class. This
+   * field will be omitted if this item represents the class Object.
+   */
+  int get superclass => _superclass;
+
+  /**
+   * The index of the item representing the superclass of this class. This
+   * field will be omitted if this item represents the class Object.
+   */
+  void set superclass(int value) {
+    this._superclass = value;
+  }
+
+  /**
+   * The indexes of the items representing the interfaces implemented by this
+   * class. The list will be empty if there are no implemented interfaces.
+   */
+  List<int> get interfaces => _interfaces;
+
+  /**
+   * The indexes of the items representing the interfaces implemented by this
+   * class. The list will be empty if there are no implemented interfaces.
+   */
+  void set interfaces(List<int> value) {
+    assert(value != null);
+    this._interfaces = value;
+  }
+
+  /**
+   * The indexes of the items representing the mixins referenced by this class.
+   * The list will be empty if there are no classes mixed in to this class.
+   */
+  List<int> get mixins => _mixins;
+
+  /**
+   * The indexes of the items representing the mixins referenced by this class.
+   * The list will be empty if there are no classes mixed in to this class.
+   */
+  void set mixins(List<int> value) {
+    assert(value != null);
+    this._mixins = value;
+  }
+
+  /**
+   * The indexes of the items representing the subtypes of this class. The list
+   * will be empty if there are no subtypes or if this item represents a
+   * supertype of the pivot type.
+   */
+  List<int> get subclasses => _subclasses;
+
+  /**
+   * The indexes of the items representing the subtypes of this class. The list
+   * will be empty if there are no subtypes or if this item represents a
+   * supertype of the pivot type.
+   */
+  void set subclasses(List<int> value) {
+    assert(value != null);
+    this._subclasses = value;
+  }
+
+  TypeHierarchyItem(Element classElement,
+      {String displayName,
+      Element memberElement,
+      int superclass,
+      List<int> interfaces,
+      List<int> mixins,
+      List<int> subclasses}) {
+    this.classElement = classElement;
+    this.displayName = displayName;
+    this.memberElement = memberElement;
+    this.superclass = superclass;
+    if (interfaces == null) {
+      this.interfaces = <int>[];
+    } else {
+      this.interfaces = interfaces;
+    }
+    if (mixins == null) {
+      this.mixins = <int>[];
+    } else {
+      this.mixins = mixins;
+    }
+    if (subclasses == null) {
+      this.subclasses = <int>[];
+    } else {
+      this.subclasses = subclasses;
+    }
+  }
+
+  factory TypeHierarchyItem.fromJson(
       JsonDecoder jsonDecoder, String jsonPath, Object json) {
     if (json == null) {
       json = {};
     }
     if (json is Map) {
-      int offset;
-      if (json.containsKey("offset")) {
-        offset = jsonDecoder.decodeInt(jsonPath + ".offset", json["offset"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "offset");
-      }
-      int length;
-      if (json.containsKey("length")) {
-        length = jsonDecoder.decodeInt(jsonPath + ".length", json["length"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "length");
-      }
-      String elementKindName;
-      if (json.containsKey("elementKindName")) {
-        elementKindName = jsonDecoder.decodeString(
-            jsonPath + ".elementKindName", json["elementKindName"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "elementKindName");
-      }
-      String oldName;
-      if (json.containsKey("oldName")) {
-        oldName =
-            jsonDecoder.decodeString(jsonPath + ".oldName", json["oldName"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "oldName");
-      }
-      return new RenameFeedback(offset, length, elementKindName, oldName);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "rename feedback", json);
-    }
-  }
-
+      Element classElement;
+      if (json.containsKey("classElement")) {
+        classElement = new Element.fromJson(
+            jsonDecoder, jsonPath + ".classElement", json["classElement"]);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "classElement");
+      }
+      String displayName;
+      if (json.containsKey("displayName")) {
+        displayName = jsonDecoder.decodeString(
+            jsonPath + ".displayName", json["displayName"]);
+      }
+      Element memberElement;
+      if (json.containsKey("memberElement")) {
+        memberElement = new Element.fromJson(
+            jsonDecoder, jsonPath + ".memberElement", json["memberElement"]);
+      }
+      int superclass;
+      if (json.containsKey("superclass")) {
+        superclass =
+            jsonDecoder.decodeInt(jsonPath + ".superclass", json["superclass"]);
+      }
+      List<int> interfaces;
+      if (json.containsKey("interfaces")) {
+        interfaces = jsonDecoder.decodeList(jsonPath + ".interfaces",
+            json["interfaces"], jsonDecoder.decodeInt);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "interfaces");
+      }
+      List<int> mixins;
+      if (json.containsKey("mixins")) {
+        mixins = jsonDecoder.decodeList(
+            jsonPath + ".mixins", json["mixins"], jsonDecoder.decodeInt);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "mixins");
+      }
+      List<int> subclasses;
+      if (json.containsKey("subclasses")) {
+        subclasses = jsonDecoder.decodeList(jsonPath + ".subclasses",
+            json["subclasses"], jsonDecoder.decodeInt);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, "subclasses");
+      }
+      return new TypeHierarchyItem(classElement,
+          displayName: displayName,
+          memberElement: memberElement,
+          superclass: superclass,
+          interfaces: interfaces,
+          mixins: mixins,
+          subclasses: subclasses);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, "TypeHierarchyItem", json);
+    }
+  }
+
+  @override
   Map<String, dynamic> toJson() {
     Map<String, dynamic> result = {};
-    result["offset"] = offset;
-    result["length"] = length;
-    result["elementKindName"] = elementKindName;
-    result["oldName"] = oldName;
+    result["classElement"] = classElement.toJson();
+    if (displayName != null) {
+      result["displayName"] = displayName;
+    }
+    if (memberElement != null) {
+      result["memberElement"] = memberElement.toJson();
+    }
+    if (superclass != null) {
+      result["superclass"] = superclass;
+    }
+    result["interfaces"] = interfaces;
+    result["mixins"] = mixins;
+    result["subclasses"] = subclasses;
     return result;
   }
 
-  @override
-  String toString() => JSON.encode(toJson());
-
-  @override
-  bool operator ==(other) {
-    if (other is RenameFeedback) {
-      return offset == other.offset &&
-          length == other.length &&
-          elementKindName == other.elementKindName &&
-          oldName == other.oldName;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode {
-    int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, offset.hashCode);
-    hash = JenkinsSmiHash.combine(hash, length.hashCode);
-    hash = JenkinsSmiHash.combine(hash, elementKindName.hashCode);
-    hash = JenkinsSmiHash.combine(hash, oldName.hashCode);
-    return JenkinsSmiHash.finish(hash);
-  }
-}
-
-/**
- * rename options
- *
- * {
- *   "newName": String
- * }
- *
- * Clients may not extend, implement or mix-in this class.
- */
-class RenameOptions extends RefactoringOptions {
-  String _newName;
-
-  /**
-   * The name that the element should have after the refactoring.
-   */
-  String get newName => _newName;
-
-  /**
-   * The name that the element should have after the refactoring.
-   */
-  void set newName(String value) {
-    assert(value != null);
-    this._newName = value;
-  }
-
-  RenameOptions(String newName) {
-    this.newName = newName;
-  }
-
-  factory RenameOptions.fromJson(
-      JsonDecoder jsonDecoder, String jsonPath, Object json) {
-    if (json == null) {
-      json = {};
-    }
-    if (json is Map) {
-      String newName;
-      if (json.containsKey("newName")) {
-        newName =
-            jsonDecoder.decodeString(jsonPath + ".newName", json["newName"]);
-      } else {
-        throw jsonDecoder.missingKey(jsonPath, "newName");
-      }
-      return new RenameOptions(newName);
-    } else {
-      throw jsonDecoder.mismatch(jsonPath, "rename options", json);
-    }
-  }
-
-  factory RenameOptions.fromRefactoringParams(
-      EditGetRefactoringParams refactoringParams, Request request) {
-    return new RenameOptions.fromJson(
-        new RequestDecoder(request), "options", refactoringParams.options);
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> result = {};
-    result["newName"] = newName;
-    return result;
-  }
-
   @override
   String toString() => JSON.encode(toJson());
 
   @override
   bool operator ==(other) {
-    if (other is RenameOptions) {
-      return newName == other.newName;
+    if (other is TypeHierarchyItem) {
+      return classElement == other.classElement &&
+          displayName == other.displayName &&
+          memberElement == other.memberElement &&
+          superclass == other.superclass &&
+          listEqual(interfaces, other.interfaces, (int a, int b) => a == b) &&
+          listEqual(mixins, other.mixins, (int a, int b) => a == b) &&
+          listEqual(subclasses, other.subclasses, (int a, int b) => a == b);
     }
     return false;
   }
 
   @override
   int get hashCode {
     int hash = 0;
-    hash = JenkinsSmiHash.combine(hash, newName.hashCode);
+    hash = JenkinsSmiHash.combine(hash, classElement.hashCode);
+    hash = JenkinsSmiHash.combine(hash, displayName.hashCode);
+    hash = JenkinsSmiHash.combine(hash, memberElement.hashCode);
+    hash = JenkinsSmiHash.combine(hash, superclass.hashCode);
+    hash = JenkinsSmiHash.combine(hash, interfaces.hashCode);
+    hash = JenkinsSmiHash.combine(hash, mixins.hashCode);
+    hash = JenkinsSmiHash.combine(hash, subclasses.hashCode);
     return JenkinsSmiHash.finish(hash);
   }
 }