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

Introduce ClassDataProvider

Browse Source
This commit is contained in:
Alexey Tsvetkov
2015-07-29 16:10:46 +03:00
parent cb7518c3ee
commit 0688afbb0c
7 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
+2 -1
View File
@@ -220,7 +220,8 @@ private class ClassClsStubBuilder(
}
private fun createNestedClassStub(classBody: StubElement<out PsiElement>, nestedClassId: ClassId) {
val classData = c.components.classDataFinder.findClassData(nestedClassId)!!
val classDataProvider = c.components.classDataFinder.findClassData(nestedClassId)!!
val classData = classDataProvider.classData
createClassStub(classBody, classData.getClassProto(), nestedClassId, c.child(classData.getNameResolver()))
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DirectoryBasedClassFinder.kt
+8 -5
View File
@@ -27,8 +27,8 @@ import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder
import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.serialization.ClassData
import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
import org.jetbrains.kotlin.serialization.deserialization.ClassDataProvider
import org.jetbrains.kotlin.serialization.deserialization.LocalClassResolver
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil
@@ -71,14 +71,16 @@ class DirectoryBasedDataFinder(
val classFinder: DirectoryBasedClassFinder,
val log: Logger
) : ClassDataFinder {
override fun findClassData(classId: ClassId): ClassData? {
override fun findClassData(classId: ClassId): ClassDataProvider? {
val binaryClass = classFinder.findKotlinClass(classId) ?: return null
val data = binaryClass.getClassHeader().annotationData
if (data == null) {
log.error("Annotation data missing for ${binaryClass.getClassId()}")
return null
}
return JvmProtoBufUtil.readClassDataFrom(data)
val classData = JvmProtoBufUtil.readClassDataFrom(data)
return ClassDataProvider(classData)
}
}
@@ -86,11 +88,12 @@ class DirectoryBasedKotlinJavaScriptDataFinder(
val classFinder: DirectoryBasedKotlinJavaScriptMetaFileFinder,
val log: Logger
) : ClassDataFinder {
override fun findClassData(classId: ClassId): ClassData? {
override fun findClassData(classId: ClassId): ClassDataProvider? {
val file = classFinder.findKotlinJavascriptMetaFile(classId) ?: return null
val content = file.contentsToByteArray(false)
return content.toClassData(classFinder.nameResolver)
val classData = content.toClassData(classFinder.nameResolver)
return ClassDataProvider(classData)
}
}