Make Change implementation consistent with the server spec.

pkg/analysis_services/lib/src/correction/fix.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.fix;
 
 import 'dart:collection';
@@ skipping 37 matching lines @@
   final Source source;
   final String file;
   final CompilationUnit unit;
   final AnalysisError error;
   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<Fix> fixes = <Fix>[];
 
   CorrectionUtils utils;
   int errorOffset;
   int errorLength;
   int errorEnd;
   AstNode node;
   AstNode coveredNode;
 
@@ skipping 138 matching lines @@
     if (fixFile == null) {
       fixFile = 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 Fix
     Fix fix = new Fix(kind, change);
     fixes.add(fix);
     // clear
     edits.clear();
     linkedPositionGroups.clear();
     endPosition = null;
   }
 
@@ skipping 387 matching lines @@
     // add elements
     bool isFirst = true;
     for (ExecutableElement missingOverride in missingOverrides) {
       if (!isFirst || !targetClass.members.isEmpty) {
         sb.append(eol);
       }
       _addFix_createMissingOverrides_single(sb, targetClass, missingOverride);
       isFirst = false;
     }
     // add proposal
-    endPosition = new Position(file, insertOffset, 0);
+    endPosition = new Position(file, insertOffset);
     _insertBuilder(sb);
     _addFix(FixKind.CREATE_MISSING_OVERRIDES, [missingOverrides.length]);
   }
 
   void _addFix_createMissingOverrides_single(SourceBuilder sb,
       ClassDeclaration targetClass, ExecutableElement missingOverride) {
     // prepare environment
     String prefix = utils.getIndent(1);
     String prefix2 = utils.getIndent(2);
     // may be property
@@ skipping 57 matching lines @@
         sb.append(eol);
       }
       // append method
       sb.append(prefix);
       sb.append(
           "noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);");
       sb.append(eol);
     }
     // done
     _insertBuilder(sb);
-    endPosition = new Position(file, insertOffset, 0);
+    endPosition = new Position(file, insertOffset);
     // add proposal
     _addFix(FixKind.CREATE_NO_SUCH_METHOD, []);
   }
 
 
   void _addFix_createPart() {
     // TODO(scheglov) implement
 //    if (node is SimpleStringLiteral && node.parent is PartDirective) {
 //      SimpleStringLiteral uriLiteral = node as SimpleStringLiteral;
 //      String uriString = uriLiteral.value;
@@ skipping 514 matching lines @@
       }
       sb.append(" ");
       // append parameter name
       {
         List<String> suggestions =
             _getArgumentNameSuggestions(excluded, type, argument, i);
         String favorite = suggestions[0];
         excluded.add(favorite);
         sb.startPosition("ARG${i}");
         sb.append(favorite);
-        sb.addProposals(suggestions);
+        sb.addSuggestions(LinkedEditSuggestionKind.PARAMETER, suggestions);
         sb.endPosition();
       }
     }
   }
 
   void _addFix_undefinedMethod_useSimilar() {
     if (node is SimpleIdentifier && node.parent is MethodInvocation) {
       MethodInvocation invocation = node.parent as MethodInvocation;
       String name = (node as SimpleIdentifier).name;
       _ClosestElementFinder finder =
@@ skipping 87 matching lines @@
    */
   void _addInsertEdit(int offset, String text) {
     Edit edit = new Edit(offset, 0, text);
     edits.add(edit);
   }
 
   /**
    * Adds a single linked position to [groupId].
    */
   void _addLinkedPosition(String groupId, SourceRange range) {
-    Position position = new Position(file, range.offset, range.length);
-    LinkedPositionGroup group = _getLinkedPosition(groupId);
-    group.addPosition(position);
+    Position position = new Position(file, range.offset);
+    LinkedEditGroup group = _getLinkedPosition(groupId);
+    group.addPosition(position, range.length);
   }
 
   /**
    * Adds a single linked position to [groupId].
    */
   void _addLinkedPosition3(String groupId, SourceBuilder sb,
       SourceRange range) {
     if (sb.offset < range.offset) {
       int delta = sb.length;
       range = range.getTranslated(delta);
@@ skipping 261 matching lines @@
         }
         String valueSource =
             sourceContent.substring(valueRange.offset, valueRange.end);
         defaultSourceMap[parameter] = valueSource;
       }
     }
     return defaultSourceMap;
   }
 
   /**
-   * 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 `true` if [node] is in static context.
    */
   bool _inStaticContext() {
     // constructor initializer cannot reference "this"
@@ skipping 124 matching lines @@
     return null;
   }
 
   /**
    * 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);
       });
     });
   }
 
 //  void _addLinkedPositionProposal(String group,
 //      LinkedPositionProposal proposal) {
 //    List<LinkedPositionProposal> nodeProposals = linkedPositionProposals[group];
 //    if (nodeProposals == null) {
 //      nodeProposals = <LinkedPositionProposal>[];
 //      linkedPositionProposals[group] = nodeProposals;
@@ skipping 69 matching lines @@
     }
   }
 
   static void _addSuperTypeProposals(SourceBuilder sb,
       Set<DartType> alreadyAdded, DartType type) {
     if (type != null &&
         !alreadyAdded.contains(type) &&
         type.element is ClassElement) {
       alreadyAdded.add(type);
       ClassElement element = type.element as ClassElement;
-      sb.addProposal(element.name);
+      sb.addSuggestion(LinkedEditSuggestionKind.TYPE, element.name);
       _addSuperTypeProposals(sb, alreadyAdded, element.supertype);
       for (InterfaceType interfaceType in element.interfaces) {
         _addSuperTypeProposals(sb, alreadyAdded, interfaceType);
       }
     }
   }
 
   /**
    * Attempts to convert the given absolute path into a "package" URI.
    *
@@ skipping 77 matching lines @@
 /**
  * Describes the location for a newly created [ConstructorDeclaration].
  */
 class _ConstructorLocation {
   final String _prefix;
   final int _offset;
   final String _suffix;
 
   _ConstructorLocation(this._prefix, this._offset, this._suffix);
 }