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

Detect Kotlin binaries by actually loading binary data, not simply checking whether the annotation is present

Browse Source 
This is needed because even if the annotation is present, the ABI version may be wrong, and we should load such class as a Java class anyways
This commit is contained in:
Andrey Breslav
2013-11-13 15:22:17 +04:00
parent b16b9c58e1
commit ec1960a960
1 changed files with 9 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/JavaDescriptorResolver.java
+9 -1
View File
@@ -153,11 +153,19 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
@Nullable @Nullable
@Override @Override
public JavaClass findClass(@NotNull FqName fqName) { public JavaClass findClass(@NotNull FqName fqName) {
// Do not look for JavaClasses for Kotlin binaries
if (kotlinClassesFromBinaries.invoke(fqName) != null
|| kotlinNamespacesFromBinaries.invoke(fqName) != null) {
return null;
}
JavaClass javaClass = javaClassFinder.findClass(fqName); JavaClass javaClass = javaClassFinder.findClass(fqName);
if (javaClass == null) { if (javaClass == null) {
return null; return null;
} }
if (DescriptorResolverUtils.isCompiledKotlinClassOrPackageClass(javaClass)) {
// Light classes are not proper binaries either
if (javaClass.getOriginKind() == JavaClass.OriginKind.KOTLIN_LIGHT_CLASS) {
return null; return null;
} }
return javaClass; return javaClass;