Update analysis server and integration tests to match new ChangeContentOverlay.

pkg/analysis_services/test/correction/assist_test.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 test.services.correction.assist;
 
 import 'package:analysis_services/correction/assist.dart';
 import 'package:analysis_services/correction/change.dart';
 import 'package:analysis_services/index/index.dart';
 import 'package:analysis_services/index/local_memory_index.dart';
 import 'package:analysis_services/src/search/search_engine.dart';
 import 'package:analysis_testing/abstract_single_unit.dart';
 import 'package:analysis_testing/reflective_tests.dart';
-import 'package:collection/collection.dart';
 import 'package:unittest/unittest.dart';
 
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(AssistProcessorTest);
 }
 
 
 @ReflectiveTestCase()
@@ skipping 12 matching lines @@
   /**
    * Asserts that there is an [Assist] of the given [kind] at [offset] which
    * produces the [expected] code when applied to [testCode].
    */
   void assertHasAssist(AssistKind kind, String expected) {
     assist = _assertHasAssist(kind);
     change = assist.change;
     // apply to "file"
     List<FileEdit> fileEdits = change.fileEdits;
     expect(fileEdits, hasLength(1));
-    resultCode = _applyEdits(testCode, change.fileEdits[0].edits);
+    // TODO(paulberry): should the code under test be responsible for sorting
+    // the edits?
+    resultCode = Edit.applySorted(testCode, change.fileEdits[0].edits);
     // verify
     expect(resultCode, expected);
   }
 
   /**
    * Calls [assertHasAssist] at the offset of [offsetSearch] in [testCode].
    */
   void assertHasAssistAt(String offsetSearch, AssistKind kind,
       String expected) {
     offset = findOffset(offsetSearch);
@@ skipping 2124 matching lines @@
 // start
   while (condition) {
     print(0);
     print(1);
   }
 // end
 }
 ''');
   }
 
-  String _applyEdits(String code, List<Edit> edits) {
-    mergeSort(edits, compare: (a, b) => a.offset - b.offset);
-    edits.reversed.forEach((Edit edit) {
-      code = code.substring(0, edit.offset) +
-          edit.replacement +
-          code.substring(edit.end);
-    });
-    return code;
-  }
-
   /**
    * Computes assists and verifies that there is an assist of the given kind.
    */
   Assist _assertHasAssist(AssistKind kind) {
     List<Assist> assists =
         computeAssists(searchEngine, testUnit, offset, length);
     for (Assist assist in assists) {
       if (assist.kind == kind) {
         return assist;
       }
@@ skipping 37 matching lines @@
   void _indexTestUnit(String code) {
     resolveTestUnit(code);
     index.indexUnit(context, testUnit);
   }
 
   void _setStartEndSelection() {
     offset = findOffset('// start\n') + '// start\n'.length;
     length = findOffset('// end') - offset;
   }
 }