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

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

Issue 946023003: Fix for searching constructor references. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 10 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_constructor.dart
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart
index 544b79aa6419358232aefa4bab03f6cdb8d85642..b43ad0bdd485e17e7769651a95e678b16054d432 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart
@@ -7,6 +7,7 @@ library services.src.refactoring.rename_constructor;
import 'dart:async';
import 'package:analysis_server/src/protocol_server.dart' hide Element;
+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/correction/util.dart';
import 'package:analysis_server/src/services/refactoring/naming_conventions.dart';
@@ -17,6 +18,7 @@ import 'package:analysis_server/src/services/search/hierarchy.dart';
import 'package:analysis_server/src/services/search/search_engine.dart';
import 'package:analyzer/src/generated/element.dart';
import 'package:analyzer/src/generated/java_core.dart';
+import 'package:analyzer/src/generated/source.dart';
/**
@@ -51,11 +53,14 @@ class RenameConstructorRefactoringImpl extends RenameRefactoringImpl {
@override
Future fillChange() async {
- String replacement = newName.isEmpty ? '' : '.${newName}';
- // update references
- List<SearchMatch> matches = await searchEngine.searchReferences(element);
- List<SourceReference> references = getSourceReferences(matches);
if (!element.isSynthetic) {
+ // prepare references
+ List<SearchMatch> matches = await searchEngine.searchReferences(element);
+ List<SourceReference> references = getSourceReferences(matches);
+ // append declaration
+ references.add(_createDeclarationReference());
+ // update references
+ String replacement = newName.isEmpty ? '' : '.${newName}';
for (SourceReference reference in references) {
reference.addEdit(change, replacement);
}
@@ -74,4 +79,15 @@ class RenameConstructorRefactoringImpl extends RenameRefactoringImpl {
result.addError(message, newLocation_fromElement(newNameMember));
}
}
+
+ SourceReference _createDeclarationReference() {
+ SourceRange sourceRange;
+ if (element.periodOffset != null) {
+ sourceRange = rangeStartEnd(element.periodOffset, element.nameEnd);
+ } else {
+ sourceRange = rangeStartLength(element.nameEnd, 0);
+ }
+ String file = element.source.fullName;
+ return new SourceReference(file, sourceRange, element, true, true);
+ }
}

Powered by Google App Engine
This is Rietveld 408576698