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

Add more diagnostic context to LightClassUtil#findClass

Browse Source 
Relates to #EA-5389872
This commit is contained in:
Vladimir Dolzhenko
2020-02-03 00:00:45 +01:00
parent 80eb148092
commit cf9ceb4e99
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt
+7 -3
View File
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.utils.checkWithAttachment
object LightClassUtil { object LightClassUtil {
@@ -154,9 +155,12 @@ object LightClassUtil {
if (parent is KtFile) { if (parent is KtFile) {
// top-level declaration // top-level declaration
return findFileFacade(parent) return findFileFacade(parent)
} } else if (parent is KtClassBody) {
else if (parent is KtClassBody) { checkWithAttachment(parent.parent is KtClassOrObject, {
assert(parent.parent is KtClassOrObject) { "Bad parent: ${parent.parent?.javaClass}" } "Bad parent: ${parent.parent?.javaClass}"
}) {
it.withAttachment("parent", parent.text)
}
return (parent.parent as KtClassOrObject).toLightClass() return (parent.parent as KtClassOrObject).toLightClass()
} }