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

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

Issue 1398213004: Warn about conflict before renamed class member and enclosing class name. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « no previous file | pkg/analysis_server/test/services/refactoring/rename_class_member_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart
index 4d70e0625c2da07b749269ebb2ea2864417ddd73..00fa3b97bdb6ea94d9ee9c5d51f55b984cec6c4c 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart
@@ -170,6 +170,29 @@ class _ClassMemberValidator {
await _prepareReferences();
Set<ClassElement> subClasses =
await getSubClasses(searchEngine, elementClass);
+ // check shadowing of class names
+ if (element != null) {
+ for (Element element in elements) {
+ ClassElement clazz = element.enclosingElement;
+ if (clazz.name == name) {
+ result.addError(
+ format(
+ "Renamed {0} has the same name as the declaring class '{1}'.",
+ elementKind.displayName,
+ name),
+ newLocation_fromElement(element));
+ }
+ }
+ } else {
+ if (elementClass.name == name) {
+ result.addError(
+ format(
+ "Created {0} has the same name as the declaring class '{1}'.",
+ elementKind.displayName,
+ name),
+ newLocation_fromElement(elementClass));
+ }
+ }
// check shadowing in hierarchy
List<SearchMatch> declarations =
await searchEngine.searchElementDeclarations(name);
« no previous file with comments | « no previous file | pkg/analysis_server/test/services/refactoring/rename_class_member_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698