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

Use lazySync instead of lazyPub to avoid raise on creation LightClasses

Browse Source
This commit is contained in:
Vladimir Dolzhenko
2019-08-29 17:51:09 +02:00
parent b856d60575
commit d6c54b845b
5 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/LazyLightClassDataHolder.kt
+8 -6
View File
@@ -14,7 +14,7 @@ import com.intellij.psi.impl.java.stubs.PsiJavaFileStub
import org.jetbrains.kotlin.asJava.LightClassBuilder
import org.jetbrains.kotlin.asJava.builder.*
import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.asJava.classes.lazyPub
import org.jetbrains.kotlin.asJava.classes.lazySync
import org.jetbrains.kotlin.asJava.elements.KtLightField
import org.jetbrains.kotlin.asJava.elements.KtLightFieldImpl
import org.jetbrains.kotlin.asJava.elements.KtLightMethod
@@ -43,9 +43,11 @@ sealed class LazyLightClassDataHolder(
cache.computeIfAbsent(lazyLightClassDataHolder, diagnostics)
}
private val exactResultLazyValue = lazyPub { builder(exactContextProvider()).stub }
private val _builderExactContextProvider: LightClassBuilderResult by lazySync { builder(exactContextProvider()) }
private val lazyInexactStub by lazyPub {
private val exactResultLazyValue = lazySync { _builderExactContextProvider.stub }
private val lazyInexactStub by lazySync {
dummyContextProvider?.let { provider -> provider()?.let { context -> builder.invoke(context).stub } }
}
@@ -56,7 +58,7 @@ sealed class LazyLightClassDataHolder(
override val extraDiagnostics: Diagnostics
get() = diagnosticsHolderProvider().getOrCompute(this) {
builder(exactContextProvider()).diagnostics
_builderExactContextProvider.diagnostics
// Force lazy diagnostics computation because otherwise a lot of memory is retained by computation.
// NB: Laziness here is not crucial anyway since somebody already has requested diagnostics and we hope one will use them
.takeUnless { it.isEmpty() } ?: Diagnostics.EMPTY
@@ -100,9 +102,9 @@ sealed class LazyLightClassDataHolder(
private inner class LazyLightClassData(
findDelegate: (PsiJavaFileStub) -> PsiClass
) : LightClassData {
override val clsDelegate: PsiClass by lazyPub { findDelegate(javaFileStub) }
override val clsDelegate: PsiClass by lazySync { findDelegate(javaFileStub) }
private val dummyDelegate: PsiClass? by lazyPub { inexactStub?.let(findDelegate) }
private val dummyDelegate: PsiClass? by lazySync { inexactStub?.let(findDelegate) }
override fun getOwnFields(containingClass: KtLightClass): List<KtLightField> {
if (dummyDelegate == null) return KtLightFieldImpl.fromClsFields(clsDelegate, containingClass)