Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Catch parsing errors when resolving kotlinx.metadata #1152

Merged
merged 1 commit into from
Sep 12, 2024
Merged

Catch parsing errors when resolving kotlinx.metadata #1152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions ...ure-classes/src/main/java/com/jetbrains/plugin/structure/classes/utils/KtClassResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@ import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlinx.metadata.jvm.Metadata
import org.objectweb.asm.tree.AnnotationNode
import org.objectweb.asm.tree.ClassNode
import org.slf4j.Logger
import org.slf4j.LoggerFactory

internal const val KOTLIN_METADATA_ANNOTATION_DESC = "Lkotlin/Metadata;"

private typealias Signature = String

private val LOG: Logger = LoggerFactory.getLogger(KtClassResolver::class.java)

class KtClassResolver {
private val cache = HashMap<Signature, KtClassNode>()

Expand All @@ -28,11 +32,8 @@ class KtClassResolver {
?.let { annotation -> getKtClassNode(this, annotation) }

private fun getKtClassNode(classNode: ClassNode, metadataAnnotation: Metadata): KtClassNode? {
val metadata = KotlinClassMetadata.readStrict(metadataAnnotation)
return if (metadata is KotlinClassMetadata.Class) {
return readMetadata(classNode, metadataAnnotation)?.let { metadata ->
KtClassNode(classNode, metadata)
} else {
null
}
}

Expand All @@ -42,6 +43,20 @@ class KtClassResolver {
?.toMetadata()
}

private fun readMetadata(classNode: ClassNode, metadataAnnotation: Metadata): KotlinClassMetadata.Class? {
return try {
if (metadataAnnotation.metadataVersion.isNotEmpty()) {
KotlinClassMetadata.readStrict(metadataAnnotation) as? KotlinClassMetadata.Class
} else {
LOG.debug("Class [${classNode.name}] has @kotlin.Metadata annotation without 'metadataVersion' attribute. It cannot be read")
null
}
} catch (e: IllegalArgumentException) {
LOG.debug("Failed to read Kotlin metadata for class ${classNode.name}", e)
null
}
}

private fun AnnotationNode.toMetadata() = Metadata(
kind = int("k"),
metadataVersion = ints("mv"),
Expand Down
Loading