ensure redundant imports are removed from valid file, probably moved to another source root

EA-74064 - PIEAE: PsiUtilCore.ensureValid
This commit is contained in:
Anna Kozlova
2015-10-05 16:22:17 +02:00
parent 974a4ed08a
commit b36bf96b61
@@ -128,9 +128,10 @@ public abstract class ExtractSuperBaseProcessor extends TurnRefsToSuperProcessor
myClass.setName(myNewClassName);
PsiClass superClass = extractSuper(superClassName);
final PsiDirectory initialDirectory = myClass.getContainingFile().getContainingDirectory();
PsiFile containingFile = myClass.getContainingFile();
try {
if (myTargetDirectory != initialDirectory) {
myTargetDirectory.add(myClass.getContainingFile().copy());
containingFile = (PsiFile)myTargetDirectory.add(myClass.getContainingFile().copy());
myClass.getContainingFile().delete();
}
}
@@ -148,7 +149,6 @@ public abstract class ExtractSuperBaseProcessor extends TurnRefsToSuperProcessor
if (!Comparing.equal(oldQualifiedName, superClass.getQualifiedName())) {
processTurnToSuperRefs(usages, superClass);
}
final PsiFile containingFile = myClass.getContainingFile();
if (containingFile instanceof PsiJavaFile) {
JavaCodeStyleManager.getInstance(myProject).removeRedundantImports((PsiJavaFile) containingFile);
}