safe delete: ignore imports on inner classes (IDEA-180327)

java/java-impl/src/com/intellij/refactoring/safeDelete/JavaImportSearcher.java

@@ -27,15 +27,10 @@ public class JavaImportSearcher extends ImportSearcher {
     final PsiFile containingFile = element.getContainingFile();
     if (!(containingFile instanceof PsiJavaFile)) return null;
 
-    if (onlyNonStatic) {
-      PsiElement parent = element.getParent();
-      if (parent instanceof PsiImportStatement) {
-        return parent;
-      }
+    PsiImportStatementBase importStatementBase = PsiTreeUtil.getParentOfType(element, PsiImportStatementBase.class);
+    if (onlyNonStatic && importStatementBase instanceof PsiImportStaticStatement) {
+      return null;
     }
-    else {
-      return PsiTreeUtil.getParentOfType(element, PsiImportStatementBase.class);
-    }
-    return null;
+    return importStatementBase;
   }
 }

java/java-tests/testData/refactoring/safeDelete/safeDeleteImportsOnInnerClasses/after/p/B.java

@@ -0,0 +1,5 @@
+package p;
+
+class B {
+
+}

java/java-tests/testData/refactoring/safeDelete/safeDeleteImportsOnInnerClasses/before/p/A.java

@@ -0,0 +1,5 @@
+package p;
+public class A {
+  public static class Inner {}
+}
+

java/java-tests/testData/refactoring/safeDelete/safeDeleteImportsOnInnerClasses/before/p/B.java

@@ -0,0 +1,6 @@
+package p;
+
+import p.<caret>A.Inner;
+class B {
+
+}

java/java-tests/testSrc/com/intellij/java/refactoring/SafeDeleteTest.java

@@ -168,6 +168,10 @@ public class SafeDeleteTest extends MultiFileTestCase {
     doTest("B");
   }
 
+  public void testSafeDeleteImportsOnInnerClasses() {
+    doTest("p.B");
+  }
+
   public void testRemoveOverridersInspiteOfUnsafeUsages() {
     try {
       BaseRefactoringProcessor.ConflictsInTestsException.setTestIgnore(true);