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

Do not resolve Kotlin binaries as Java classes

Browse Source
This commit is contained in:
Andrey Breslav
2013-10-31 20:07:31 +04:00
parent 2765327ae5
commit 137f33c829
1 changed files with 21 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
+21 -1
View File
@@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaClassResolver;
import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaSubModule;
import org.jetbrains.jet.lang.resolve.java.resolver.*;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass;
import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage;
import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver;
import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder;
import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass;
@@ -148,7 +149,26 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
subModule = new LazyJavaSubModule(
new GlobalJavaResolverContext(
storageManager,
javaClassFinder,
new JavaClassFinder() {
@Nullable
@Override
public JavaClass findClass(@NotNull FqName fqName) {
JavaClass javaClass = javaClassFinder.findClass(fqName);
if (javaClass == null) {
return null;
}
if (DescriptorResolverUtils.isCompiledKotlinClassOrPackageClass(javaClass)) {
return null;
}
return javaClass;
}
@Nullable
@Override
public JavaPackage findPackage(@NotNull FqName fqName) {
return javaClassFinder.findPackage(fqName);
}
},
new LazyJavaClassResolver() {
@Override
public ClassDescriptor resolveClass(JavaClass aClass) {