From 8cea94f9c3ad2952abcc1c6101e563e255deb19a Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 21 Mar 2012 17:58:29 +0100
Subject: [PATCH] optimize imports: leave on demand imports untouched when no
 corresponding dirs can be found in the resolve scope (IDEA-82944) [peter]
 (cherry picked from commit 61c42a9b1cb1fa712db584b8df5bc707cf4fb7ea)

---
 .../refactoring/OptimizeImportsRefactoringHelper.java    | 9 ++++++++-
 .../packageToNonExistentPackage/after/p1/C1.java         | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java b/java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java
index 85d27192acb5..5f6072a2bb91 100644
--- a/java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java
+++ b/java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java
@@ -104,10 +104,17 @@ public class OptimizeImportsRefactoringHelper implements RefactoringHelper<Set<P
             if (importStatement != null && importStatement.isValid()) {
               final PsiJavaCodeReferenceElement ref = importStatement.getImportReference();
               //Do not remove non-resolving refs
-              if (ref == null || ref.resolve() == null) {
+              if (ref == null) {
+                continue;
+              }
+              final PsiElement resolve = ref.resolve();
+              if (resolve == null) {
                 continue;
               }
 
+              if (resolve instanceof PsiPackage && ((PsiPackage)resolve).getDirectories(ref.getResolveScope()).length == 0) {
+                continue;
+              }
               importStatement.delete();
             }
           }
diff --git a/java/java-tests/testData/refactoring/migration/packageToNonExistentPackage/after/p1/C1.java b/java/java-tests/testData/refactoring/migration/packageToNonExistentPackage/after/p1/C1.java
index dd6403feaa2d..bd90b5874462 100644
--- a/java/java-tests/testData/refactoring/migration/packageToNonExistentPackage/after/p1/C1.java
+++ b/java/java-tests/testData/refactoring/migration/packageToNonExistentPackage/after/p1/C1.java
@@ -1,5 +1,7 @@
 package p1;
 
+import zzz.bbb.*;
+
 class C {
   zzz.bbb.AAA a = new zzz.bbb.AAA();
 }
\ No newline at end of file