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

Use constant for empty resolve result

Browse Source
This commit is contained in:
Nikolay Krasko
2015-04-22 21:56:21 +03:00
parent df2900c4e4
commit f972e12331
1 changed files with 7 additions and 3 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
+7 -3
View File
@@ -60,7 +60,11 @@ class LazyJavaTypeParameterResolver(
} }
} }
data class JavaClassLookupResult(val jClass: JavaClass? = null, val kClass: ClassDescriptor? = null) data class JavaClassLookupResult(val jClass: JavaClass? = null, val kClass: ClassDescriptor? = null) {
companion object {
val EMPTY = JavaClassLookupResult()
}
}
fun LazyJavaResolverContext.lookupBinaryClass(javaClass: JavaClass): ClassDescriptor? { fun LazyJavaResolverContext.lookupBinaryClass(javaClass: JavaClass): ClassDescriptor? {
val kotlinJvmBinaryClass = kotlinClassFinder.findKotlinClass(javaClass) val kotlinJvmBinaryClass = kotlinClassFinder.findKotlinClass(javaClass)
@@ -75,7 +79,7 @@ fun LazyJavaResolverContext.findClassInJava(classId: ClassId): JavaClassLookupRe
val javaClass = finder.findClass(classId) val javaClass = finder.findClass(classId)
if (javaClass != null) return JavaClassLookupResult(javaClass) if (javaClass != null) return JavaClassLookupResult(javaClass)
return JavaClassLookupResult() return JavaClassLookupResult.EMPTY
} }
private fun LazyJavaResolverContext.resolveBinaryClass(kotlinClass: KotlinJvmBinaryClass?): JavaClassLookupResult? { private fun LazyJavaResolverContext.resolveBinaryClass(kotlinClass: KotlinJvmBinaryClass?): JavaClassLookupResult? {
@@ -93,7 +97,7 @@ private fun LazyJavaResolverContext.resolveBinaryClass(kotlinClass: KotlinJvmBin
} }
else { else {
// This is a package or trait-impl or something like that // This is a package or trait-impl or something like that
return JavaClassLookupResult() return JavaClassLookupResult.EMPTY
} }
return null return null