From 75851d44cc01a009a781a7b698e620e00422a70e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 25 Nov 2014 18:53:00 +0300 Subject: [PATCH] Minor, inline method from LazyJavaPackageFragmentProvider --- .../java/lazy/LazyJavaPackageFragmentProvider.kt | 11 +++++------ .../jetbrains/jet/lang/resolve/java/lazy/resolvers.kt | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt index 8f961d2141f..6eddd855142 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt @@ -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.descriptors.ClassDescriptor 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.resolve.name.Name +import org.jetbrains.jet.utils.emptyOrSingletonList public class LazyJavaPackageFragmentProvider( 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() - - fun resolveKotlinBinaryClass(kotlinClass: KotlinJvmBinaryClass) = c.deserializedDescriptorResolver.resolveClass(kotlinClass) + override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean) = + getPackageFragment(fqName)?.getMemberScope()?.getSubPackages().orEmpty() fun getClass(javaClass: JavaClass): ClassDescriptor? = c.javaClassResolver.resolveClass(javaClass) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/resolvers.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/resolvers.kt index d5aa31ffacc..d9694acd98c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/resolvers.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/resolvers.kt @@ -93,7 +93,7 @@ private fun LazyJavaResolverContext.resolveBinaryClass(kotlinClass: KotlinJvmBin errorReporter.reportIncompatibleAbiVersion(kotlinClass, header.version) } else if (header.kind == KotlinClassHeader.Kind.CLASS) { - val descriptor = packageFragmentProvider.resolveKotlinBinaryClass(kotlinClass) + val descriptor = deserializedDescriptorResolver.resolveClass(kotlinClass) if (descriptor != null) { return JavaClassLookupResult(kClass = descriptor) }