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

Rename ClassDataProvider -> ClassDataWithSource

Browse Source
This commit is contained in:
Alexander Udalov
2015-09-22 17:45:00 +03:00
parent 0ef705f073
commit e52a9b9fb8
9 changed files with 43 additions and 57 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 -2
View File
@@ -220,8 +220,8 @@ private class ClassClsStubBuilder(
}
private fun createNestedClassStub(classBody: StubElement<out PsiElement>, nestedClassId: ClassId) {
val classDataProvider = c.components.classDataFinder.findClassData(nestedClassId)!!
val (nameResolver, classProto) = classDataProvider.classData
val classDataWithSource = c.components.classDataFinder.findClassData(nestedClassId)!!
val (nameResolver, classProto) = classDataWithSource.classData
createClassStub(classBody, classProto, nestedClassId, c.child(nameResolver))
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DirectoryBasedClassFinder.kt
+5 -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.ClassDataWithSource
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,7 +71,7 @@ class DirectoryBasedDataFinder(
val classFinder: DirectoryBasedClassFinder,
val log: Logger
) : ClassDataFinder {
override fun findClassData(classId: ClassId): ClassDataProvider? {
override fun findClassData(classId: ClassId): ClassDataWithSource? {
val binaryClass = classFinder.findKotlinClass(classId) ?: return null
val data = binaryClass.getClassHeader().annotationData
if (data == null) {
@@ -80,7 +80,7 @@ class DirectoryBasedDataFinder(
}
val classData = JvmProtoBufUtil.readClassDataFrom(data)
return ClassDataProvider(classData)
return ClassDataWithSource(classData)
}
}
@@ -88,12 +88,12 @@ class DirectoryBasedKotlinJavaScriptDataFinder(
val classFinder: DirectoryBasedKotlinJavaScriptMetaFileFinder,
val log: Logger
) : ClassDataFinder {
override fun findClassData(classId: ClassId): ClassDataProvider? {
override fun findClassData(classId: ClassId): ClassDataWithSource? {
val file = classFinder.findKotlinJavascriptMetaFile(classId) ?: return null
val content = file.contentsToByteArray(false)
val classData = content.toClassData(classFinder.nameResolver)
return ClassDataProvider(classData)
return ClassDataWithSource(classData)
}
}