From 3cecea38f2f02933a13400993ce5f183f3510a08 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 21 Nov 2011 15:56:59 +0100 Subject: [PATCH] IDEA-76874 Basic completion doesn't show methods when they do not suite by return type --- .../completion/JavaCompletionContributor.java | 7 ------- .../normal/VoidMethodsInNonVoidContext.java | 5 ----- .../normal/VoidMethodsInNonVoidContext_after.java | 5 ----- .../completion/NormalCompletionOrderingTest.java | 2 +- .../completion/NormalCompletionTest.groovy | 12 +----------- 5 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 java/java-tests/testData/codeInsight/completion/normal/VoidMethodsInNonVoidContext.java delete mode 100644 java/java-tests/testData/codeInsight/completion/normal/VoidMethodsInNonVoidContext_after.java 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 fceb3ec7c267..94135a94b346 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java @@ -267,8 +267,6 @@ public class JavaCompletionContributor extends CompletionContributor { if (reference instanceof PsiJavaReference) { final ElementFilter filter = getReferenceFilter(position); if (filter != null) { - boolean filterVoid = JavaSmartCompletionContributor.getExpectedTypes(parameters).length > 0 && parameters.getInvocationCount() < 2; - final boolean isSwitchLabel = SWITCH_LABEL.accepts(position); final PsiFile originalFile = parameters.getOriginalFile(); for (LookupElement element : JavaCompletionUtil.processJavaReference(position, @@ -290,11 +288,6 @@ public class JavaCompletionContributor extends CompletionContributor { item.setTailType(TailType.NONE); } - Object object = element.getObject(); - if (filterVoid && object instanceof PsiMethod && PsiType.VOID.equals(((PsiMethod)object).getReturnType())) { - continue; - } - result.addElement(element); } } diff --git a/java/java-tests/testData/codeInsight/completion/normal/VoidMethodsInNonVoidContext.java b/java/java-tests/testData/codeInsight/completion/normal/VoidMethodsInNonVoidContext.java deleted file mode 100644 index b0564b6e4878..000000000000 --- a/java/java-tests/testData/codeInsight/completion/normal/VoidMethodsInNonVoidContext.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Foo { - Object foo(){ - return noti - } -} diff --git a/java/java-tests/testData/codeInsight/completion/normal/VoidMethodsInNonVoidContext_after.java b/java/java-tests/testData/codeInsight/completion/normal/VoidMethodsInNonVoidContext_after.java deleted file mode 100644 index 6e1389582825..000000000000 --- a/java/java-tests/testData/codeInsight/completion/normal/VoidMethodsInNonVoidContext_after.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Foo { - Object foo(){ - return notify - } -} diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.java index 6a1a00c2141f..4de3a931b505 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.java @@ -47,7 +47,7 @@ public class NormalCompletionOrderingTest extends CompletionSortingTestCase { } public void testReturnF() throws Throwable { - checkPreferredItems(0, "false"); + checkPreferredItems(0, "false", "finalize"); } public void testPreferDefaultTypeToExpected() throws Throwable { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy index a0fcb1848b48..d926cb51bd39 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy @@ -727,7 +727,7 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase { public void testDoubleFalse() throws Throwable { configureByFile(getTestName(false) + ".java"); - assertStringItems("false", "fefefef"); + assertStringItems("false", "fefefef", "finalize"); } public void testSameNamedVariableInNestedClasses() throws Throwable { @@ -895,16 +895,6 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase { } } - public void testVoidMethodsInNonVoidContext() throws Throwable { - configure() - checkResultByFile(getTestName(false) + ".java") - assertEmpty(myItems) - assertNull(getLookup()); - - myFixture.complete(CompletionType.BASIC, 2) - checkResult() - } - public void testEnumConstantFromEnumMember() throws Throwable { doTest(); } public void testPrimitiveMethodParameter() throws Throwable { doTest(); }