add () when completing class name in more cases

java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java

@@ -1001,11 +1001,11 @@ public class JavaCompletionUtil {
   }
 
   public static boolean hasAccessibleInnerClass(@NotNull PsiClass psiClass, @NotNull PsiElement position) {
-    final PsiClass[] inners = psiClass.getAllInnerClasses();
+    final PsiClass[] inners = psiClass.getInnerClasses();
     if (inners.length > 0) {
       PsiResolveHelper resolveHelper = JavaPsiFacade.getInstance(position.getProject()).getResolveHelper();
       for (PsiClass inner : inners) {
-        if (resolveHelper.isAccessible(inner, position, null)) {
+        if (inner.hasModifierProperty(PsiModifier.STATIC) && resolveHelper.isAccessible(inner, position, null)) {
           return true;
         }
       }

java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInnersTab.java

@@ -10,7 +10,7 @@ class Xxx {
     private Xxx(String x) {
     }
 
-    class Yyy {
+    static class Yyy {
 
     }
 }

java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInnersTab_after.java

@@ -10,7 +10,7 @@ class Xxx {
     private Xxx(String x) {
     }
 
-    class Yyy {
+    static class Yyy {
 
     }
 }

java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInstanceInner.java

@@ -0,0 +1,11 @@
+class Foo {
+  {
+    Zzoo l = new Zz<caret>
+  }
+}
+
+class Zzoo {
+  void run();
+
+  class Impl implements Zzoo {}
+}

java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInstanceInner_after.java

@@ -0,0 +1,11 @@
+class Foo {
+  {
+    Zzoo l = new Zzoo()<caret>
+  }
+}
+
+class Zzoo {
+  void run();
+
+  class Impl implements Zzoo {}
+}

java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy

@@ -664,6 +664,8 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
 
   public void testClassNameWithInner() throws Throwable { doTest() }
 
+  public void testClassNameWithInstanceInner() throws Throwable { doTest('\n') }
+
   public void testDoubleFalse() throws Throwable {
     configureByFile(getTestName(false) + ".java");
     assertStringItems("false", "finalize");