From 2765327ae56d42c0486bcb289e6b1c403f4d11ab Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 31 Oct 2013 19:23:14 +0400 Subject: [PATCH] Detour for built-in classes --- .../jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt index 3a57931aefb..c8ea96e18c1 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt @@ -76,6 +76,9 @@ public open class LazyJavaSubModule( } override fun resolveClassByFqName(fqName: FqName): ClassDescriptor? { + val builtinClass = JavaClassResolver.getKotlinBuiltinClassDescriptor(fqName) + if (builtinClass != null) return builtinClass + val jClass = c.finder.findClass(fqName) if (jClass != null) return resolveClass(jClass)