diff --git a/java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java index 6209d6a9686a..9cb5a212acad 100644 --- a/java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java +++ b/java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java @@ -90,7 +90,7 @@ public abstract class MembersGetter { public void processMembers(final Consumer results, @Nullable final PsiClass where, final boolean acceptMethods, final boolean searchInheritors) { - if (where == null) return; + if (where == null || CommonClassNames.JAVA_LANG_STRING.equals(where.getQualifiedName())) return; final boolean searchFactoryMethods = searchInheritors && !CommonClassNames.JAVA_LANG_OBJECT.equals(where.getQualifiedName()) && 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 795e5d9ab577..7741a09efe0a 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java @@ -726,8 +726,7 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase { public void testDontAutoCastWhenAlreadyCasted() throws Throwable { configureByTestName(); - assertEquals("s", myItems[0].getLookupString()); - assertEquals("copyValueOf", myItems[1].getLookupString()); + myFixture.assertPreferredCompletionItems(0, "s", "toString"); select(); checkResultByTestName(); }