Update analysis server and integration tests to match new ChangeContentOverlay.

pkg/analysis_server/lib/src/domain_analysis.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library domain.analysis;
 
 import 'dart:collection';
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/computer/computer_hover.dart';
 import 'package:analysis_server/src/computer/error.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_services/constants.dart';
+import 'package:analysis_services/correction/change.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/engine.dart';
 
 
 /**
  * Instances of the class [AnalysisDomainHandler] implement a [RequestHandler]
  * that handles requests in the `analysis` domain.
  */
 class AnalysisDomainHandler implements RequestHandler {
   /**
@@ skipping 134 matching lines @@
 
   /**
    * Implement the 'analysis.updateContent' request.
    */
   Response updateContent(Request request) {
     var changes = new HashMap<String, ContentChange>();
     RequestDatum filesDatum = request.getRequiredParameter(FILES);
     for (String file in filesDatum.keys) {
       RequestDatum changeDatum = filesDatum[file];
       ContentChange change = new ContentChange();
-      switch (changeDatum[TYPE].asString()) {
+      change.type = changeDatum[TYPE].asString();
+      switch (change.type) {
         case ADD:
-          change.contentOrReplacement = changeDatum[CONTENT].asString();
+          change.content = changeDatum[CONTENT].asString();
           break;
         case CHANGE:
-          change.offset = changeDatum[OFFSET].asInt();
-          change.length = changeDatum[LENGTH].asInt();
-          change.contentOrReplacement = changeDatum[REPLACEMENT].asString();
+          change.changes = changeDatum[EDITS].asList((RequestDatum item) {
+            int offset = item[OFFSET].asInt();
+            int length = item[LENGTH].asInt();
+            String replacement = item[REPLACEMENT].asString();
+            return new Edit(offset, length, replacement);
+          });
           break;
         case REMOVE:
           break;
         default:
           return new Response.invalidParameter(
               request,
               changeDatum[TYPE].path,
               'be one of "add", "change", or "remove"');
       }
       changes[file] = change;
@@ skipping 56 matching lines @@
     return new Response(request.id);
   }
 }
 
 
 /**
  * A description of the change to the content of a file.
  */
 class ContentChange {
   /**
-   * If [offset] and [length] are null, the full content of the file (or null
-   * if the file should be read from the filesystem).
-   *
-   * If [offset] and [length] are non-null, the replacement text which should
-   * take the place of the [length] characters of the file starting at [offset].
+   * Type of content change.  'add' means that [content] contains the full
+   * content of the file, and [changes] should be null.  'change' means that
+   * [changes] contains changes to be applied to the file, and [content] should
+   * be null.  'remove' means that the file should be read from the filesystem,
+   * and both [content] and [changes] should be null.
    */
-  String contentOrReplacement;
+  String type;
 
-  int offset;
-  int length;
+  String content;
+  List<Edit> changes;
 }