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

Minor, drop unneeded code in findClassInJava

Browse Source 
JavaClassFinderImpl already checks that it never finds light classes and
ReflectJavaClassFinder can't ever find them
This commit is contained in:
Alexander Udalov
2015-03-26 21:34:53 +03:00
parent f3191a39a5
commit fd48b4dd04
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt
+3 -7
View File
@@ -49,7 +49,7 @@ class LazyJavaTypeParameterResolver(
private val typeParameters: Map<JavaTypeParameter, Int> = typeParameterOwner.getTypeParameters().mapToIndex() private val typeParameters: Map<JavaTypeParameter, Int> = typeParameterOwner.getTypeParameters().mapToIndex()
private val resolve = c.storageManager.createMemoizedFunctionWithNullableValues { private val resolve = c.storageManager.createMemoizedFunctionWithNullableValues {
(typeParameter: JavaTypeParameter) -> typeParameter: JavaTypeParameter ->
typeParameters[typeParameter]?.let { index -> typeParameters[typeParameter]?.let { index ->
LazyJavaTypeParameterDescriptor(c.child(this), typeParameter, index, containingDeclaration) LazyJavaTypeParameterDescriptor(c.child(this), typeParameter, index, containingDeclaration)
} }
@@ -73,13 +73,9 @@ fun LazyJavaResolverContext.findClassInJava(classId: ClassId): JavaClassLookupRe
if (binaryClassResult != null) return binaryClassResult if (binaryClassResult != null) return binaryClassResult
val javaClass = finder.findClass(classId) val javaClass = finder.findClass(classId)
if (javaClass == null) return JavaClassLookupResult() if (javaClass != null) return JavaClassLookupResult(javaClass)
// Light classes are not proper binaries either
if (javaClass.getOriginKind() == JavaClass.OriginKind.KOTLIN_LIGHT_CLASS) return JavaClassLookupResult()
return JavaClassLookupResult(javaClass)
return JavaClassLookupResult()
} }
private fun LazyJavaResolverContext.resolveBinaryClass(kotlinClass: KotlinJvmBinaryClass?): JavaClassLookupResult? { private fun LazyJavaResolverContext.resolveBinaryClass(kotlinClass: KotlinJvmBinaryClass?): JavaClassLookupResult? {