From b36bf96b6102a83015dd44edcd7aee7c6260116b Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 5 Oct 2015 16:05:29 +0200 Subject: [PATCH] ensure redundant imports are removed from valid file, probably moved to another source root EA-74064 - PIEAE: PsiUtilCore.ensureValid --- .../extractSuperclass/ExtractSuperBaseProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java index 612dc901c8ad..75c965f45ba2 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java @@ -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); }