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

Replace getEntries with hardcoded PsiMethod in LC decompiled declaration

Browse Source 
This adds NotNull annotation.

^KTIJ-23530 Fixed
This commit is contained in:
Roman Efremov
2022-12-21 20:04:30 +01:00
committed by Space Team
parent cbb20ce2b8
commit 25f65aff3a
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt
+6
View File
@@ -20,7 +20,9 @@ import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile
import org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService
import org.jetbrains.kotlin.asJava.classes.KotlinClassInnerStuffCache
import org.jetbrains.kotlin.asJava.classes.LightClassesLazyCreator
import org.jetbrains.kotlin.asJava.classes.getEnumEntriesPsiMethod
import org.jetbrains.kotlin.asJava.classes.lazyPub
import org.jetbrains.kotlin.asJava.isGetEntriesMethod
import org.jetbrains.kotlin.asJava.isSyntheticValuesOrValueOfMethod
import org.jetbrains.kotlin.load.java.structure.LightClassOriginKind
import org.jetbrains.kotlin.psi.KtClassOrObject
@@ -159,8 +161,12 @@ open class KtLightClassForDecompiledDeclaration(
private val _methods: MutableList<PsiMethod> by lazyPub {
mutableListOf<PsiMethod>().also {
val isEnum = isEnum
clsDelegate.methods.mapNotNullTo(it) { psiMethod ->
if (isSyntheticValuesOrValueOfMethod(psiMethod)) return@mapNotNullTo null
if (isEnum && isGetEntriesMethod(psiMethod)) {
return@mapNotNullTo getEnumEntriesPsiMethod(this)
}
KtLightMethodForDecompiledDeclaration(
funDelegate = psiMethod,
funParent = this,