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

lazy -> storageManager.createLazyValue

Browse Source
This commit is contained in:
Michael Bogdanov
2015-09-04 15:50:22 +03:00
parent 974095313c
commit bbf63aa38c
1 changed files with 3 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/descriptors/LazyJavaPackageScope.kt
+3 -3
View File
@@ -48,7 +48,7 @@ public class LazyJavaPackageScope(
public val kotlinBinaryClass: KotlinJvmBinaryClass? public val kotlinBinaryClass: KotlinJvmBinaryClass?
= c.components.kotlinClassFinder.findKotlinClass(PackageClassUtils.getPackageClassId(packageFragment.fqName)) = c.components.kotlinClassFinder.findKotlinClass(PackageClassUtils.getPackageClassId(packageFragment.fqName))
public val kotlinBinaryClasses: List<KotlinJvmBinaryClass> by lazy { private val kotlinBinaryClasses = c.storageManager.createLazyValue {
val simpleNames = c.components.packageMapper.findPackageParts(jPackage.getFqName().asString()) val simpleNames = c.components.packageMapper.findPackageParts(jPackage.getFqName().asString())
val packageClassId = PackageClassUtils.getPackageClassId(packageFragment.fqName).packageFqName val packageClassId = PackageClassUtils.getPackageClassId(packageFragment.fqName).packageFqName
@@ -59,10 +59,10 @@ public class LazyJavaPackageScope(
} }
private val deserializedPackageScope = c.storageManager.createLazyValue { private val deserializedPackageScope = c.storageManager.createLazyValue {
if (kotlinBinaryClasses.isEmpty()) if (kotlinBinaryClasses().isEmpty())
JetScope.Empty JetScope.Empty
else { else {
c.components.deserializedDescriptorResolver.createKotlinNewPackageScope(packageFragment, kotlinBinaryClasses) c.components.deserializedDescriptorResolver.createKotlinNewPackageScope(packageFragment, kotlinBinaryClasses())
} }
} }