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

Minor, inline method from LazyJavaPackageFragmentProvider

Browse Source
This commit is contained in:
Alexander Udalov
2014-11-25 18:53:00 +03:00
parent ab6fec1540
commit 75851d44cc
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt
+5 -6
View File
@@ -22,9 +22,9 @@ import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass import org.jetbrains.jet.lang.resolve.java.structure.JavaClass
import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.ClassDescriptor
import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.* import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.*
import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass
import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider
import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.name.Name
import org.jetbrains.jet.utils.emptyOrSingletonList
public class LazyJavaPackageFragmentProvider( public class LazyJavaPackageFragmentProvider(
outerContext: GlobalJavaResolverContext, outerContext: GlobalJavaResolverContext,
@@ -75,13 +75,12 @@ public class LazyJavaPackageFragmentProvider(
) )
} }
fun getPackageFragment(fqName: FqName) = packageFragments(fqName) private fun getPackageFragment(fqName: FqName) = packageFragments(fqName)
override fun getPackageFragments(fqName: FqName) = getPackageFragment(fqName)?.let {listOf(it)}.orEmpty() override fun getPackageFragments(fqName: FqName) = emptyOrSingletonList(getPackageFragment(fqName))
override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean) = getPackageFragment(fqName)?.getMemberScope()?.getSubPackages().orEmpty() override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean) =
getPackageFragment(fqName)?.getMemberScope()?.getSubPackages().orEmpty()
fun resolveKotlinBinaryClass(kotlinClass: KotlinJvmBinaryClass) = c.deserializedDescriptorResolver.resolveClass(kotlinClass)
fun getClass(javaClass: JavaClass): ClassDescriptor? = c.javaClassResolver.resolveClass(javaClass) fun getClass(javaClass: JavaClass): ClassDescriptor? = c.javaClassResolver.resolveClass(javaClass)
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/resolvers.kt
+1 -1
View File
@@ -93,7 +93,7 @@ private fun LazyJavaResolverContext.resolveBinaryClass(kotlinClass: KotlinJvmBin
errorReporter.reportIncompatibleAbiVersion(kotlinClass, header.version) errorReporter.reportIncompatibleAbiVersion(kotlinClass, header.version)
} }
else if (header.kind == KotlinClassHeader.Kind.CLASS) { else if (header.kind == KotlinClassHeader.Kind.CLASS) {
val descriptor = packageFragmentProvider.resolveKotlinBinaryClass(kotlinClass) val descriptor = deserializedDescriptorResolver.resolveClass(kotlinClass)
if (descriptor != null) { if (descriptor != null) {
return JavaClassLookupResult(kClass = descriptor) return JavaClassLookupResult(kClass = descriptor)
} }