| Index: pkg/analysis_services/lib/src/correction/assist.dart
|
| diff --git a/pkg/analysis_services/lib/src/correction/assist.dart b/pkg/analysis_services/lib/src/correction/assist.dart
|
| index 708c57190a7432622a1b57517c2ca601ad9bcbf7..a4b07006ea7a3a4641dd629468432a70bdc426a4 100644
|
| --- a/pkg/analysis_services/lib/src/correction/assist.dart
|
| +++ b/pkg/analysis_services/lib/src/correction/assist.dart
|
| @@ -45,8 +45,8 @@ class AssistProcessor {
|
| 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>[];
|
|
|
| @@ -135,7 +135,7 @@ class AssistProcessor {
|
| 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);
|
| @@ -248,7 +248,7 @@ class AssistProcessor {
|
| if (i == 0) {
|
| builder.append(name);
|
| }
|
| - builder.addProposal(name);
|
| + builder.addSuggestion(LinkedEditSuggestionKind.VARIABLE, name);
|
| }
|
| builder.endPosition();
|
| }
|
| @@ -1526,12 +1526,12 @@ class AssistProcessor {
|
| }
|
|
|
| /**
|
| - * 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;
|
| @@ -1560,13 +1560,13 @@ class AssistProcessor {
|
| 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);
|
| });
|
| });
|
| }
|
|
|