Make Change implementation consistent with the server spec.

pkg/analysis_services/lib/src/correction/assist.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.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library services.src.correction.assist;
 
 import 'dart:collection';
@@ skipping 27 matching lines @@
   final String file;
   final CompilationUnit unit;
   final int selectionOffset;
   final int selectionLength;
   CompilationUnitElement unitElement;
   LibraryElement unitLibraryElement;
   String unitLibraryFile;
   String unitLibraryFolder;
 
   final List<Edit> edits = <Edit>[];
-  final Map<String, LinkedPositionGroup> linkedPositionGroups = <String,
-      LinkedPositionGroup>{};
+  final Map<String, LinkedEditGroup> linkedPositionGroups = <String,
+      LinkedEditGroup>{};
   Position endPosition = null;
   final List<Assist> assists = <Assist>[];
 
   int selectionEnd;
   CorrectionUtils utils;
   AstNode node;
 
   AssistProcessor(this.searchEngine, this.source, this.file, this.unit,
       this.selectionOffset, this.selectionLength) {
     unitElement = unit.element;
@@ skipping 68 matching lines @@
     if (assistFile == null) {
       assistFile = file;
     }
     FileEdit fileEdit = new FileEdit(file);
     edits.forEach((edit) => fileEdit.add(edit));
     // prepare Change
     String message = JavaString.format(kind.message, args);
     Change change = new Change(message);
     change.add(fileEdit);
     linkedPositionGroups.values.forEach(
-        (group) => change.addLinkedPositionGroup(group));
+        (group) => change.addLinkedEditGroup(group));
     change.endPosition = endPosition;
     // add Assist
     Assist assist = new Assist(kind, change);
     assists.add(assist);
     // clear
     edits.clear();
     linkedPositionGroups.clear();
     endPosition = null;
   }
 
@@ skipping 92 matching lines @@
     // name(s)
     {
       List<String> suggestions =
           getVariableNameSuggestionsForExpression(type, expression, excluded);
       builder.startPosition("NAME");
       for (int i = 0; i < suggestions.length; i++) {
         String name = suggestions[i];
         if (i == 0) {
           builder.append(name);
         }
-        builder.addProposal(name);
+        builder.addSuggestion(LinkedEditSuggestionKind.VARIABLE, name);
       }
       builder.endPosition();
     }
     builder.append(" = ");
     // add proposal
     _insertBuilder(builder);
     _addAssist(AssistKind.ASSIGN_TO_LOCAL_VARIABLE, []);
   }
 
   void _addProposal_convertToBlockFunctionBody() {
@@ skipping 1257 matching lines @@
 
   /**
    * Adds a new [Edit] to [edits].
    */
   void _addReplaceEdit(SourceRange range, String text) {
     Edit edit = new Edit(range.offset, range.length, text);
     edits.add(edit);
   }
 
   /**
-   * Returns an existing or just added [LinkedPositionGroup] with [groupId].
+   * Returns an existing or just added [LinkedEditGroup] with [groupId].
    */
-  LinkedPositionGroup _getLinkedPosition(String groupId) {
-    LinkedPositionGroup group = linkedPositionGroups[groupId];
+  LinkedEditGroup _getLinkedPosition(String groupId) {
+    LinkedEditGroup group = linkedPositionGroups[groupId];
     if (group == null) {
-      group = new LinkedPositionGroup(groupId);
+      group = new LinkedEditGroup(groupId);
       linkedPositionGroups[groupId] = group;
     }
     return group;
   }
 
   /**
    * Returns the text of the given range in the unit.
    */
   String _getSource(AstNode node) {
     // TODO(scheglov) rename
     return utils.getText(node);
   }
 
   /**
    * Returns the text of the given range in the unit.
    */
   String _getSource2(SourceRange range) {
     // TODO(scheglov) rename
     return utils.getText3(range);
   }
 
   /**
    * Inserts the given [SourceBuilder] at its offset.
    */
   void _insertBuilder(SourceBuilder builder) {
     String text = builder.toString();
     _addInsertEdit(builder.offset, text);
     // add linked positions
-    builder.linkedPositionGroups.forEach((LinkedPositionGroup group) {
-      LinkedPositionGroup fixGroup = _getLinkedPosition(group.id);
+    builder.linkedPositionGroups.forEach((LinkedEditGroup group) {
+      LinkedEditGroup fixGroup = _getLinkedPosition(group.id);
       group.positions.forEach((Position position) {
-        fixGroup.addPosition(position);
+        fixGroup.addPosition(position, group.length);
       });
-      group.proposals.forEach((String proposal) {
-        fixGroup.addProposal(proposal);
+      group.suggestions.forEach((LinkedEditSuggestion suggestion) {
+        fixGroup.addSuggestion(suggestion);
       });
     });
   }
 
   /**
    * This method does nothing, but we invoke it in places where Dart VM
    * coverage agent fails to provide coverage information - such as almost
    * all "return" statements.
    *
    * https://code.google.com/p/dart/issues/detail?id=19912
@@ skipping 46 matching lines @@
 class _SimpleIdentifierRecursiveAstVisitor extends RecursiveAstVisitor {
   final _SimpleIdentifierVisitor visitor;
 
   _SimpleIdentifierRecursiveAstVisitor(this.visitor);
 
   @override
   visitSimpleIdentifier(SimpleIdentifier node) {
     visitor(node);
   }
 }