From 668b36f684c162ae7ea714520b2a171dad94ad20 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 19 Oct 2015 16:50:54 +0300 Subject: [PATCH] Minor: meaningful message on failure to find nested class data when building cls stubs --- .../idea/decompiler/stubBuilder/ClassClsStubBuilder.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt index e01afe87bf9..76bc5acf9e1 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt @@ -39,6 +39,7 @@ import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer import org.jetbrains.kotlin.serialization.deserialization.TypeTable import org.jetbrains.kotlin.serialization.deserialization.supertypes +import org.jetbrains.kotlin.utils.sure fun createClassStub(parent: StubElement, classProto: ProtoBuf.Class, classId: ClassId, context: ClsStubBuilderContext) { ClassClsStubBuilder(parent, classProto, classId, context).build() @@ -216,7 +217,9 @@ private class ClassClsStubBuilder( } private fun createNestedClassStub(classBody: StubElement, nestedClassId: ClassId) { - val classDataWithSource = c.components.classDataFinder.findClassData(nestedClassId)!! + val classDataWithSource = c.components.classDataFinder.findClassData(nestedClassId).sure { + "Could not find class data for nested class ${nestedClassId.shortClassName} of class ${nestedClassId.outerClassId}" + } val (nameResolver, classProto) = classDataWithSource.classData createClassStub(classBody, classProto, nestedClassId, c.child(nameResolver, TypeTable(classProto.typeTable))) }