diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardClasses.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardClasses.java index 9bf6b06ed00..8e5b08976f4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardClasses.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardClasses.java @@ -613,11 +613,6 @@ public class JetStandardClasses { } public static boolean isStandardClass(@NotNull FqName fqName) { - for (DeclarationDescriptor descriptor : getAllStandardClasses()) { - if (DescriptorUtils.getFQName(descriptor).equals(fqName.toUnsafe())) { - return true; - } - } - return false; + return JetStandardClasses.STANDARD_CLASSES_FQNAME.equals(fqName.parent()); } } diff --git a/idea/testData/javaFacade/ea38770.kt b/idea/testData/javaFacade/ea38770.kt new file mode 100644 index 00000000000..9c02663cfc0 --- /dev/null +++ b/idea/testData/javaFacade/ea38770.kt @@ -0,0 +1,3 @@ +fun foo() { + T.toString() +} diff --git a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java index c8d1a59aa89..435e3ecec17 100644 --- a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java @@ -87,6 +87,19 @@ public class JetJavaFacadeTest extends LightCodeInsightFixtureTestCase { doTestWrapClass(); } + public void testEa38770() { + myFixture.configureByFile(getTestName(true) + ".kt"); + + PsiReference reference = myFixture.getFile().findReferenceAt(myFixture.getCaretOffset()); + assertNotNull(reference); + PsiElement element = reference.resolve(); + assertNotNull(element); + assertInstanceOf(element, JetNamedFunction.class); + JetNamedFunction toString = (JetNamedFunction) element; + + assertNull("There should be no wrapper for built-in function", JetLightClass.wrapMethod(toString)); + } + public void testInnerClass() throws Exception { myFixture.configureByFile(getTestName(true) + ".kt");