From fd48b4dd04adfe41223725d2e0fe124e1f96b526 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 26 Mar 2015 21:34:53 +0300 Subject: [PATCH] Minor, drop unneeded code in findClassInJava JavaClassFinderImpl already checks that it never finds light classes and ReflectJavaClassFinder can't ever find them --- .../org/jetbrains/kotlin/load/java/lazy/resolvers.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt index c83f139ef62..3bcd8aa337e 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt @@ -49,7 +49,7 @@ class LazyJavaTypeParameterResolver( private val typeParameters: Map = typeParameterOwner.getTypeParameters().mapToIndex() private val resolve = c.storageManager.createMemoizedFunctionWithNullableValues { - (typeParameter: JavaTypeParameter) -> + typeParameter: JavaTypeParameter -> typeParameters[typeParameter]?.let { index -> LazyJavaTypeParameterDescriptor(c.child(this), typeParameter, index, containingDeclaration) } @@ -73,13 +73,9 @@ fun LazyJavaResolverContext.findClassInJava(classId: ClassId): JavaClassLookupRe if (binaryClassResult != null) return binaryClassResult val javaClass = finder.findClass(classId) - if (javaClass == null) return JavaClassLookupResult() - - // Light classes are not proper binaries either - if (javaClass.getOriginKind() == JavaClass.OriginKind.KOTLIN_LIGHT_CLASS) return JavaClassLookupResult() - - return JavaClassLookupResult(javaClass) + if (javaClass != null) return JavaClassLookupResult(javaClass) + return JavaClassLookupResult() } private fun LazyJavaResolverContext.resolveBinaryClass(kotlinClass: KotlinJvmBinaryClass?): JavaClassLookupResult? {