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

Prefer sources to binaries in JDR

Browse Source
This commit is contained in:
Andrey Breslav
2014-01-10 18:06:29 +04:00
parent 5a49b6fda5
commit 935fae70ea
1 changed files with 7 additions and 1 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/LazyJavaPackageFragmentProvider.kt
+7 -1
View File
@@ -100,10 +100,16 @@ public open class LazyJavaPackageFragmentProvider(
val builtinClass = JavaClassResolver.getKotlinBuiltinClassDescriptor(fqName) val builtinClass = JavaClassResolver.getKotlinBuiltinClassDescriptor(fqName)
if (builtinClass != null) return builtinClass if (builtinClass != null) return builtinClass
// TODO Here we prefer sources (something outside JDR subsystem) to binaries, which should actually be driven by module dependencies separation
// See DeserializedDescriptorResolver.javaDescriptorFinder
val classFromSources = outerContext.javaClassResolver.resolveClassByFqName(fqName)
if (classFromSources != null) return classFromSources
val (jClass, kClass) = c.findClassInJava(fqName) val (jClass, kClass) = c.findClassInJava(fqName)
if (jClass != null) return resolveClass(jClass) if (jClass != null) return resolveClass(jClass)
if (kClass != null) return kClass if (kClass != null) return kClass
return outerContext.javaClassResolver.resolveClassByFqName(fqName)
return null
} }
} }
} }