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

(LightClass) KotlinShortNamesCacheTest fix for methods, referenced from companions and classes

Browse Source
This commit is contained in:
Vladimir Ilmov
2020-06-05 22:21:52 +02:00
parent 8f00344191
commit db0788c68f
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt
+4 -12
View File
@@ -128,18 +128,10 @@ object LightClassUtil {
return getPsiMethodWrappers(declaration).firstOrNull() return getPsiMethodWrappers(declaration).firstOrNull()
} }
private fun getPsiMethodWrappers(declaration: KtDeclaration): Sequence<KtLightMethod> { private fun getPsiMethodWrappers(declaration: KtDeclaration): Sequence<KtLightMethod> =
val classes = getWrappingClasses(declaration) getWrappingClasses(declaration).flatMap { it.methods.asSequence() }
for (clazz in classes) { .filterIsInstance<KtLightMethod>()
// the first class with methods found should contain all methods with kotlinOrigin, so no need to look after .filter { it.kotlinOrigin === declaration }
val methods = clazz.methods
.filterIsInstance<KtLightMethod>()
.filter { it.kotlinOrigin === declaration }
if (methods.isNotEmpty())
return methods.asSequence()
}
return emptySequence()
}
private fun getWrappingClass(declaration: KtDeclaration): PsiClass? { private fun getWrappingClass(declaration: KtDeclaration): PsiClass? {
if (declaration is KtParameter) { if (declaration is KtParameter) {