diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java index c0f7a6948aff..70aca0252e5a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java @@ -83,7 +83,14 @@ abstract class StaticMembersProcessor if (qualifiedName != null && containingFile != null && !ImportFilter.shouldImport(containingFile, qualifiedName)) { return true; } + + PsiModifierList modifierList = member.getModifierList(); + if (modifierList != null && member instanceof PsiMethod && !modifierList.hasExplicitModifier(PsiModifier.STATIC)) { + //methods in interfaces must have explicit static modifier or they are not static; + return true; + } } + PsiFile file = member.getContainingFile(); if (file instanceof PsiJavaFile //do not show methods from default package diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/StaticImportMethodWithCommonNameTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/StaticImportMethodWithCommonNameTest.java index 3b33e7ad17a4..f49243a51230 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/StaticImportMethodWithCommonNameTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/StaticImportMethodWithCommonNameTest.java @@ -24,8 +24,8 @@ public class StaticImportMethodWithCommonNameTest extends LightCodeInsightFixtur protected void setUp() throws Exception { super.setUp(); int idx = 0; - while (idx++ < 50) { - myFixture.addClass("package a; class Test" + idx + "{ public void format(String s, String s1) {}}"); + while (idx++ < 450) { + myFixture.addClass("package a; class ATest" + idx + "{ public void format(String s, String s1) {}}"); } }