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

Report no parent KtNamedDeclaration for declaration instead of NPE in BindingContextUtils.getEnclosingDescriptor

Browse Source 
#EA-210816 Fixed
This commit is contained in:
Vladimir Dolzhenko
2019-10-15 13:58:54 +02:00
parent 46a083cd1e
commit 96198a1cd3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.kt → compiler/frontend/src/org/jetbrains/kotlin/resolve/bindingContextUtil/BindingContextUtils.kt
+7 -2
View File
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.resolve.scopes.utils.takeSnapshot
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.expressions.typeInfoFactory.noTypeInfo import org.jetbrains.kotlin.types.expressions.typeInfoFactory.noTypeInfo
import org.jetbrains.kotlin.types.typeUtil.makeNotNullable import org.jetbrains.kotlin.types.typeUtil.makeNotNullable
import org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments
fun KtReturnExpression.getTargetFunctionDescriptor(context: BindingContext): FunctionDescriptor? { fun KtReturnExpression.getTargetFunctionDescriptor(context: BindingContext): FunctionDescriptor? {
val targetLabel = getTargetLabel() val targetLabel = getTargetLabel()
@@ -133,12 +134,16 @@ fun <T : PsiElement> KtElement.getParentOfTypeCodeFragmentAware(vararg parentCla
} }
fun getEnclosingDescriptor(context: BindingContext, element: KtElement): DeclarationDescriptor { fun getEnclosingDescriptor(context: BindingContext, element: KtElement): DeclarationDescriptor {
val declaration = element.getParentOfTypeCodeFragmentAware(KtNamedDeclaration::class.java) val declaration =
element.getParentOfTypeCodeFragmentAware(KtNamedDeclaration::class.java)
?: throw KotlinExceptionWithAttachments("No parent KtNamedDeclaration for of type ${element.javaClass}")
.withAttachment("element.kt", element.text)
return if (declaration is KtFunctionLiteral) { return if (declaration is KtFunctionLiteral) {
getEnclosingDescriptor(context, declaration) getEnclosingDescriptor(context, declaration)
} else { } else {
context.get(DECLARATION_TO_DESCRIPTOR, declaration) context.get(DECLARATION_TO_DESCRIPTOR, declaration)
?: error("No descriptor for named declaration: " + declaration?.text + "\n(of type " + declaration?.javaClass + ")") ?: throw KotlinExceptionWithAttachments("No descriptor for named declaration of type ${declaration?.javaClass}")
.withAttachment("declaration.kt", declaration.text)
} }
} }