From 3e4c533167cc92136657cddad22a737b48ce0a88 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 14 Nov 2013 15:14:36 +0400 Subject: [PATCH] Do not allow built-in classes in Java resolve --- .../jet/lang/resolve/java/JavaDescriptorResolver.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index b42520a4f32..fdc2031765c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -153,9 +153,10 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes @Nullable @Override public JavaClass findClass(@NotNull FqName fqName) { - // Do not look for JavaClasses for Kotlin binaries + // Do not look for JavaClasses for Kotlin binaries & built-ins if (kotlinClassesFromBinaries.invoke(fqName) != null - || kotlinNamespacesFromBinaries.invoke(fqName) != null) { + || kotlinNamespacesFromBinaries.invoke(fqName) != null + || JavaClassResolver.getKotlinBuiltinClassDescriptor(fqName) != null) { return null; }