MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

move inner: moved class should be checked if it contains inaccessible refs (IDEA-60450)

Browse Source
This commit is contained in:
anna
2010-10-29 15:02:01 +04:00
parent 92ed84def2
commit fe83d89f0d
5 changed files with 91 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java
+57 -35
View File
@@ -347,51 +347,20 @@ public class MoveInnerProcessor extends BaseRefactoringProcessor {
protected boolean preprocessUsages(Ref<UsageInfo[]> refUsages) {
final MultiMap<PsiElement, String> conflicts = new MultiMap<PsiElement, String>();
final HashMap<PsiElement,HashSet<PsiElement>> reported = new HashMap<PsiElement, HashSet<PsiElement>>();
class Visitor extends JavaRecursiveElementWalkingVisitor {
private final HashMap<PsiElement,HashSet<PsiElement>> reported = new HashMap<PsiElement, HashSet<PsiElement>>();
@Override public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
PsiElement resolved = reference.resolve();
if (resolved instanceof PsiMember &&
PsiTreeUtil.isAncestor(myInnerClass, resolved, true) &&
becomesInaccessible((PsiMember)resolved)) {
final PsiElement container = ConflictsUtil.getContainer(reference);
HashSet<PsiElement> containerSet = reported.get(resolved);
if (containerSet == null) {
containerSet = new HashSet<PsiElement>();
reported.put(resolved, containerSet);
}
if (!containerSet.contains(container)) {
containerSet.add(container);
String message = RefactoringBundle.message("0.will.become.inaccessible.from.1",
RefactoringUIUtil.getDescription(resolved, true),
RefactoringUIUtil.getDescription(container, true));
conflicts.putValue(resolved, message);
}
registerConflict(reference, resolved, reported, conflicts);
}
}
private boolean becomesInaccessible(PsiMember element) {
final String visibilityModifier = VisibilityUtil.getVisibilityModifier(element.getModifierList());
if (PsiModifier.PRIVATE.equals(visibilityModifier)) return true;
if (PsiModifier.PUBLIC.equals(visibilityModifier)) return false;
final PsiFile containingFile = myOuterClass.getContainingFile();
if (myTargetContainer instanceof PsiDirectory) {
final PsiPackage aPackage = JavaDirectoryService.getInstance().getPackage((PsiDirectory)myTargetContainer);
return !isInPackage(containingFile, aPackage);
}
// target container is a class
PsiFile targetFile = myTargetContainer.getContainingFile();
if (targetFile != null) {
final PsiDirectory containingDirectory = targetFile.getContainingDirectory();
if (containingDirectory != null) {
final PsiPackage targetPackage = JavaDirectoryService.getInstance().getPackage(containingDirectory);
return isInPackage(containingFile, targetPackage);
}
}
return false;
}
@Override public void visitClass(PsiClass aClass) {
@@ -402,10 +371,63 @@ public class MoveInnerProcessor extends BaseRefactoringProcessor {
// if (myInnerClass.hasModifierProperty(PsiModifier.)) {
myOuterClass.accept(new Visitor());
myInnerClass.accept(new JavaRecursiveElementWalkingVisitor() {
@Override
public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
super.visitReferenceElement(reference);
final PsiElement resolve = reference.resolve();
if (resolve instanceof PsiMember) {
if (PsiTreeUtil.isAncestor(myOuterClass, resolve, true) && !PsiTreeUtil.isAncestor(myInnerClass, resolve, true)) {
if (becomesInaccessible((PsiMember)resolve)) {
registerConflict(reference, resolve, reported, conflicts);
}
}
}
}
});
return showConflicts(conflicts, refUsages.get());
}
private static void registerConflict(PsiJavaCodeReferenceElement reference,
PsiElement resolved,
HashMap<PsiElement, HashSet<PsiElement>> reported, MultiMap<PsiElement, String> conflicts) {
final PsiElement container = ConflictsUtil.getContainer(reference);
HashSet<PsiElement> containerSet = reported.get(resolved);
if (containerSet == null) {
containerSet = new HashSet<PsiElement>();
reported.put(resolved, containerSet);
}
if (!containerSet.contains(container)) {
containerSet.add(container);
String message = RefactoringBundle.message("0.will.become.inaccessible.from.1",
RefactoringUIUtil.getDescription(resolved, true),
RefactoringUIUtil.getDescription(container, true));
conflicts.putValue(resolved, message);
}
}
private boolean becomesInaccessible(PsiMember element) {
final String visibilityModifier = VisibilityUtil.getVisibilityModifier(element.getModifierList());
if (PsiModifier.PRIVATE.equals(visibilityModifier)) return true;
if (PsiModifier.PUBLIC.equals(visibilityModifier)) return false;
final PsiFile containingFile = myOuterClass.getContainingFile();
if (myTargetContainer instanceof PsiDirectory) {
final PsiPackage aPackage = JavaDirectoryService.getInstance().getPackage((PsiDirectory)myTargetContainer);
return !isInPackage(containingFile, aPackage);
}
// target container is a class
PsiFile targetFile = myTargetContainer.getContainingFile();
if (targetFile != null) {
final PsiDirectory containingDirectory = targetFile.getContainingDirectory();
if (containingDirectory != null) {
final PsiPackage targetPackage = JavaDirectoryService.getInstance().getPackage(containingDirectory);
return isInPackage(containingFile, targetPackage);
}
}
return false;
}
private static boolean isInPackage(final PsiFile containingFile, PsiPackage aPackage) {
if (containingFile != null) {
final PsiDirectory containingDirectory = containingFile.getContainingDirectory();
java/java-tests/testData/refactoring/moveInner/innerClassInheritance/after/p/A.java
+8
View File
@@ -0,0 +1,8 @@
package p;
class A {
private static class C {
}
}
java/java-tests/testData/refactoring/moveInner/innerClassInheritance/after/p/B.java
+5
View File
@@ -0,0 +1,5 @@
package p;
class B extends A.C {
}
java/java-tests/testData/refactoring/moveInner/innerClassInheritance/before/p/A.java
+11
View File
@@ -0,0 +1,11 @@
package p;
class A {
private static class C {
}
private static class B extends C{
}
}
java/java-tests/testSrc/com/intellij/refactoring/MoveInnerTest.java
+10
View File
@@ -46,6 +46,16 @@ public class MoveInnerTest extends MultiFileTestCase {
doTest(createAction("xxx.Outer.Inner", "Inner", true, "outer", false, false, null));
}
public void testInnerClassInheritance() throws Exception {
try {
doTest(createAction("p.A.B", "B", false, null, false, false, null));
fail("Conflict was not detected");
}
catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
assertEquals("class <b><code>p.A.C</code></b> will become inaccessible from class <b><code>p.A.B</code></b>.", e.getMessage());
}
}
public void testScr30106() throws Exception {
doTest(createAction("p.A.B", "B", true, "outer", false, false, null));
}