From 0378551b724f29569d80434a7981eed3e6983293 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 28 Oct 2013 13:07:58 +0400 Subject: [PATCH] Allow for Kotlin class resolution --- .../jet/lang/resolve/java/JavaDescriptorResolver.java | 2 +- .../jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt | 4 ++-- .../java/lazy/descriptors/LazyJavaPackageFragmentScope.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 9cdb5cbb4e8..3aeafdc6ae7 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -111,7 +111,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes @Override public ClassDescriptor resolveClassByFqName(FqName name) { - return null; + return javaResolverCache.getClassResolvedFromSource(name); } }, externalAnnotationResolver, 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 c7d2d508b96..af08b8f8085 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 @@ -68,9 +68,9 @@ public open class LazyJavaSubModule( override fun resolveClassByFqName(fqName: FqName): ClassDescriptor? { val jClass = c.finder.findClass(fqName) - if (jClass == null) return null + if (jClass != null) return resolveClass(jClass) - return resolveClass(jClass) + return outerContext.javaClassResolver.resolveClassByFqName(fqName) } } } \ No newline at end of file diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt index 8c62feac54d..85bfce6032f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt @@ -24,7 +24,7 @@ public abstract class LazyJavaPackageFragmentScope( val fqName = fqName.child(name) val javaClass = c.finder.findClass(fqName) if (javaClass == null) - null + c.javaClassResolver.resolveClassByFqName(fqName) else LazyJavaClassDescriptor(c.withTypes(TypeParameterResolver.EMPTY), packageFragment, fqName, javaClass) }