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

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

Issue 1153253004: Issue 23389. Report error in the renamed element be invisible after rename. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 7 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_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 7cb5306b0240ba835d44f770d02cb51ccfe6ed74..70b7d8b7eeb880f6e59e73af080bbae3a3683ad7 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
@@ -16,6 +16,7 @@ import 'package:analysis_server/src/services/refactoring/refactoring_internal.da
import 'package:analysis_server/src/services/refactoring/rename.dart';
import 'package:analysis_server/src/services/search/hierarchy.dart';
import 'package:analysis_server/src/services/search/search_engine.dart';
+import 'package:analyzer/src/generated/ast.dart' show Identifier;
import 'package:analyzer/src/generated/element.dart';
import 'package:analyzer/src/generated/java_core.dart';
@@ -123,29 +124,32 @@ class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
*/
class _ClassMemberValidator {
final SearchEngine searchEngine;
+ final LibraryElement library;
final Element element;
final ClassElement elementClass;
final ElementKind elementKind;
final String name;
final bool isRename;
+ final RefactoringStatus result = new RefactoringStatus();
Set<Element> elements = new Set<Element>();
List<SearchMatch> references = <SearchMatch>[];
_ClassMemberValidator.forCreate(
this.searchEngine, this.elementClass, this.name)
: isRename = false,
+ library = null,
element = null,
elementKind = ElementKind.METHOD;
_ClassMemberValidator.forRename(this.searchEngine, Element element, this.name)
: isRename = true,
+ library = element.library,
element = element,
elementClass = element.enclosingElement,
elementKind = element.kind;
Future<RefactoringStatus> validate() async {
- RefactoringStatus result = new RefactoringStatus();
// check if there is a member with "newName" in the same ClassElement
for (Element newNameMember in getChildren(elementClass, name)) {
result.addError(format(
@@ -198,6 +202,10 @@ class _ClassMemberValidator {
}
}
}
+ // visibility
+ if (isRename) {
+ _validateWillBeInvisible();
+ }
// done
return result;
}
@@ -227,4 +235,22 @@ class _ClassMemberValidator {
references.addAll(elementReferences);
});
}
+
+ /**
+ * Validates if any usage of [element] renamed to [name] will be invisible.
+ */
+ Future _validateWillBeInvisible() async {
+ if (!Identifier.isPrivateName(name)) {
+ return;
+ }
+ for (SearchMatch reference in references) {
+ Element refElement = reference.element;
+ LibraryElement refLibrary = refElement.library;
+ if (refLibrary != library) {
+ String message = format("Renamed {0} will be invisible in '{1}'.",
+ getElementKindName(element), getElementQualifiedName(refLibrary));
+ result.addError(message, newLocation_fromMatch(reference));
+ }
+ }
+ }
}

Powered by Google App Engine
This is Rietveld 408576698