Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(249)

Unified Diff: pkg/analysis_server/lib/src/services/refactoring/rename_import.dart

Issue 592123002: Move SourceReference, extract duplicate code. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/lib/src/services/refactoring/rename_import.dart
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_import.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_import.dart
index 177ded8af588f65483af862f1b9dc774557ab08d..da46d19ce60f3c478c3131f9c4512f103fe958e6 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_import.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_import.dart
@@ -11,6 +11,7 @@ import 'package:analysis_server/src/services/correction/source_range.dart';
import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/refactoring/naming_conventions.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
+import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart';
import 'package:analysis_server/src/services/refactoring/rename.dart';
import 'package:analysis_server/src/services/search/search_engine.dart';
import 'package:analyzer/src/generated/element.dart';
@@ -46,11 +47,9 @@ class RenameImportRefactoringImpl extends RenameRefactoringImpl {
}
@override
- Future<SourceChange> createChange() {
- SourceChange change = new SourceChange(refactoringName);
+ Future fillChange() {
// update declaration
{
- String file = getElementFile(element);
PrefixElement prefix = element.prefix;
SourceEdit edit = null;
if (newName.isEmpty) {
@@ -77,15 +76,12 @@ class RenameImportRefactoringImpl extends RenameRefactoringImpl {
return searchEngine.searchReferences(element).then((refMatches) {
List<SourceReference> references = getSourceReferences(refMatches);
for (SourceReference reference in references) {
- SourceEdit edit;
if (newName.isEmpty) {
- edit = createReferenceEdit(reference, newName);
+ reference.addEdit(change, newName);
} else {
- edit = createReferenceEdit(reference, "${newName}.");
+ reference.addEdit(change, "${newName}.");
}
- change.addElementEdit(reference.element, edit);
}
- return change;
});
}
}

Powered by Google App Engine
This is Rietveld 408576698