From c245db83304b629353e28004d14a4f282bb21ef3 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 7 Jun 2016 13:15:13 +0300
Subject: [PATCH] find classes to import: check accessibility (IDEA-154069)

---
 .../daemon/impl/quickfix/ImportClassFix.java  |  3 ++-
 .../intention/AddImportActionTest.groovy      | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java
index fec3efd161ba..111f9251673f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java
@@ -28,6 +28,7 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.util.ClassUtil;
+import com.intellij.psi.util.PsiUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
@@ -143,6 +144,6 @@ public class ImportClassFix extends ImportClassFixBase<PsiJavaCodeReferenceEleme
 
   @Override
   protected boolean isAccessible(PsiMember member, PsiJavaCodeReferenceElement reference) {
-    return member.hasModifierProperty(PsiModifier.PUBLIC) || member.hasModifierProperty(PsiModifier.PROTECTED);
+    return PsiUtil.isAccessible(member, reference, null);
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
index 4edd0568525a..7c22ac932db1 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
@@ -85,6 +85,29 @@ public class Foo {
 '''
   }
 
+  public void testPackageLocalInner() {
+    myFixture.addClass 'package foo; class Outer { static class Inner {static String FOO = "";}}'
+
+    myFixture.configureByText 'a.java', '''\
+package foo;
+class Usage {
+  {
+    String foo = In<caret>ner.FOO;
+  }
+}
+'''
+
+    importClass()
+
+    myFixture.checkResult '''package foo;
+class Usage {
+  {
+    String foo = Outer.Inner.FOO;
+  }
+}
+'''
+  }
+
   public void testWrongTypeParams() throws Exception {
     myFixture.addClass 'package f; public class Foo {}'
     myFixture.configureByText 'a.java', '''\