Move SourceReference, extract duplicate code.

pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart

Index: pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart
index 3688f59045d7b2dbab93d072f32f7167d486d45c..5744fb24f48b0fa3eba17a410b5c731e3a42368c 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart
@@ -95,8 +95,7 @@ class RenameUnitMemberRefactoringImpl extends RenameRefactoringImpl {
   }
 
   @override
-  Future<SourceChange> createChange() {
-    SourceChange change = new SourceChange(refactoringName);
+  Future fillChange() {
     // prepare elements
     List<Element> elements = [];
     if (element is PropertyInducingElement && element.isSynthetic) {
@@ -114,17 +113,8 @@ class RenameUnitMemberRefactoringImpl extends RenameRefactoringImpl {
     }
     // update each element
     return Future.forEach(elements, (Element element) {
-      // update declaration
-      addDeclarationEdit(change, element);
-      // schedule updating references
-      return searchEngine.searchReferences(element).then((refMatches) {
-        List<SourceReference> references = getSourceReferences(refMatches);
-        for (SourceReference reference in references) {
-          addReferenceEdit(change, reference);
-        }
-      });
-    }).then((_) {
-      return change;
+      addDeclarationEdit(element);
+      return searchEngine.searchReferences(element).then(addReferenceEdits);
     });
   }
 }