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

Fix PackageFragmentProvider#isEmpty(FqName) for REPL

Browse Source
This commit is contained in:
Vladimir Dolzhenko
2021-04-09 17:41:51 +02:00
committed by TeamCityServer
parent bcaad7487f
commit 613eda5016
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyPackageViewDescriptorImpl.kt
+2
View File
@@ -39,6 +39,8 @@ open class LazyPackageViewDescriptorImpl(
module.packageFragmentProvider.isEmpty(fqName) module.packageFragmentProvider.isEmpty(fqName)
} }
override fun isEmpty(): Boolean = empty
override val memberScope: MemberScope = LazyScopeAdapter(storageManager) { override val memberScope: MemberScope = LazyScopeAdapter(storageManager) {
if (isEmpty()) { if (isEmpty()) {
MemberScope.Empty MemberScope.Empty
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ReplPackageViewDescriptorFactory.kt
+6
View File
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.descriptors.PackageViewDescriptor
import org.jetbrains.kotlin.descriptors.impl.LazyPackageViewDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.LazyPackageViewDescriptorImpl
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
import org.jetbrains.kotlin.descriptors.impl.PackageViewDescriptorFactory import org.jetbrains.kotlin.descriptors.impl.PackageViewDescriptorFactory
import org.jetbrains.kotlin.descriptors.isEmpty
import org.jetbrains.kotlin.descriptors.packageFragments import org.jetbrains.kotlin.descriptors.packageFragments
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.StorageManager
@@ -34,4 +35,9 @@ class ReplPackageViewDescriptor(
if (calculatedFragments.isNotEmpty()) cachedFragments = calculatedFragments if (calculatedFragments.isNotEmpty()) cachedFragments = calculatedFragments
return calculatedFragments return calculatedFragments
} }
override fun isEmpty(): Boolean {
cachedFragments?.let { return it.isEmpty() }
return module.packageFragmentProvider.isEmpty(fqName)
}
} }