diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java index c240ad91b64a..0f70a482fb5a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java @@ -270,16 +270,11 @@ public class JavaCompletionContributor extends CompletionContributor { final boolean isSwitchLabel = SWITCH_LABEL.accepts(position); final PsiFile originalFile = parameters.getOriginalFile(); - Set set = JavaCompletionUtil.processJavaReference(position, + for (LookupElement element : JavaCompletionUtil.processJavaReference(position, (PsiJavaReference)reference, new ElementExtractorFilter(filter), checkAccess, - result.getPrefixMatcher(), parameters); - PsiClass arrays = JavaPsiFacade.getInstance(position.getProject()).findClass(CommonClassNames.JAVA_UTIL_ARRAYS, position.getResolveScope()); - if (arrays != null && filter.isAcceptable(arrays, position) && isClassNamePossible(parameters.getPosition())) { - set.add(JavaClassNameCompletionContributor.createClassLookupItem(arrays, true)); - } - for (LookupElement element : set) { + result.getPrefixMatcher(), parameters)) { if (inheritors.alreadyProcessed(element)) { continue; } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy index 146070fc692b..c5e754ab78c4 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy @@ -934,8 +934,9 @@ public class Bar { public void testArrays() { myFixture.configureByText "a.java", "class Foo {{ }}" - type 'Arrays' - assert myFixture.lookupElementStrings == ['Arrays', 'ArrayStoreException'] + type 'Arrays.' + myFixture.checkResult "class Foo {{ Arrays. }}" + assert !lookup }