Allow for Kotlin class resolution
This commit is contained in:
+1
-1
@@ -111,7 +111,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
|
||||
|
||||
@Override
|
||||
public ClassDescriptor resolveClassByFqName(FqName name) {
|
||||
return null;
|
||||
return javaResolverCache.getClassResolvedFromSource(name);
|
||||
}
|
||||
},
|
||||
externalAnnotationResolver,
|
||||
|
||||
+2
-2
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user