diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java b/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java index 93c1645c4947..e0cabe46b9ae 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java @@ -99,9 +99,7 @@ class SameSignatureCallParametersProvider extends CompletionProvider overload : psiClass.findMethodsAndTheirSubstitutorsByName(((PsiMethod)element).getName(), true)) { - if (!overload.first.hasModifierProperty(PsiModifier.ABSTRACT)/* && overload.first.hasModifierProperty(PsiModifier.STATIC)*/) { - candidates.add(overload); - } + candidates.add(overload); } break; } diff --git a/java/java-tests/testData/codeInsight/completion/smartType/SameNamedArgumentsDelegation-out.java b/java/java-tests/testData/codeInsight/completion/smartType/SameNamedArgumentsDelegation-out.java new file mode 100644 index 000000000000..bff93e7ce370 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/smartType/SameNamedArgumentsDelegation-out.java @@ -0,0 +1,13 @@ +import java.io.File; + +public interface Zoo { + void foo(String s, File file); +} + +class ZooImpl implements Zoo { + private Zoo delegate; + @Override + public void foo(String s, File file) { + delegate.foo(s, file); + } +} diff --git a/java/java-tests/testData/codeInsight/completion/smartType/SameNamedArgumentsDelegation.java b/java/java-tests/testData/codeInsight/completion/smartType/SameNamedArgumentsDelegation.java new file mode 100644 index 000000000000..915e760bf22a --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/smartType/SameNamedArgumentsDelegation.java @@ -0,0 +1,13 @@ +import java.io.File; + +public interface Zoo { + void foo(String s, File file); +} + +class ZooImpl implements Zoo { + private Zoo delegate; + @Override + public void foo(String s, File file) { + delegate.foo(); + } +} diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java index 97e7156fc63d..53312c576642 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java @@ -769,6 +769,13 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase { checkResultByTestName(); } + public void testSameNamedArgumentsDelegation() throws Throwable { + configureByTestName(); + getLookup().setCurrentItem(getLookup().getItems().get(1)); + select(); + checkResultByTestName(); + } + public void testWrongAnonymous() throws Throwable { configureByTestName(); select();