azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Detour for built-in classes

Browse Source
This commit is contained in:
Andrey Breslav
2013-10-31 19:23:14 +04:00
parent 258db05af2
commit 2765327ae5
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt
+3
View File
@@ -76,6 +76,9 @@ public open class LazyJavaSubModule(
} }
override fun resolveClassByFqName(fqName: FqName): ClassDescriptor? { override fun resolveClassByFqName(fqName: FqName): ClassDescriptor? {
val builtinClass = JavaClassResolver.getKotlinBuiltinClassDescriptor(fqName)
if (builtinClass != null) return builtinClass
val jClass = c.finder.findClass(fqName) val jClass = c.finder.findClass(fqName)
if (jClass != null) return resolveClass(jClass) if (jClass != null) return resolveClass(jClass)