diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyPackageViewDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyPackageViewDescriptorImpl.kt index a4ce38be4e2..7afa5144a0a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyPackageViewDescriptorImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyPackageViewDescriptorImpl.kt @@ -39,6 +39,8 @@ open class LazyPackageViewDescriptorImpl( module.packageFragmentProvider.isEmpty(fqName) } + override fun isEmpty(): Boolean = empty + override val memberScope: MemberScope = LazyScopeAdapter(storageManager) { if (isEmpty()) { MemberScope.Empty diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ReplPackageViewDescriptorFactory.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ReplPackageViewDescriptorFactory.kt index be0906fe953..7d313cd9f94 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ReplPackageViewDescriptorFactory.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ReplPackageViewDescriptorFactory.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import org.jetbrains.kotlin.descriptors.impl.LazyPackageViewDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.PackageViewDescriptorFactory +import org.jetbrains.kotlin.descriptors.isEmpty import org.jetbrains.kotlin.descriptors.packageFragments import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.storage.StorageManager @@ -34,4 +35,9 @@ class ReplPackageViewDescriptor( if (calculatedFragments.isNotEmpty()) cachedFragments = calculatedFragments return calculatedFragments } + + override fun isEmpty(): Boolean { + cachedFragments?.let { return it.isEmpty() } + return module.packageFragmentProvider.isEmpty(fqName) + } }