Code cleanup: KotlinDeserializedJvmSymbolsProvider

This commit is contained in:
Mikhail Glukhikh
2020-12-07 13:56:24 +03:00
parent 1383e923ea
commit e51503ab42
@@ -73,7 +73,6 @@ class KotlinDeserializedJvmSymbolsProvider(
private class PackagePartsCacheData( private class PackagePartsCacheData(
val proto: ProtoBuf.Package, val proto: ProtoBuf.Package,
val context: FirDeserializationContext, val context: FirDeserializationContext,
val source: JvmPackagePartSource,
) { ) {
val topLevelFunctionNameIndex by lazy { val topLevelFunctionNameIndex by lazy {
proto.functionList.withIndex() proto.functionList.withIndex()
@@ -130,7 +129,6 @@ class KotlinDeserializedJvmSymbolsProvider(
FirConstDeserializer(session, facadeBinaryClass ?: kotlinJvmBinaryClass), FirConstDeserializer(session, facadeBinaryClass ?: kotlinJvmBinaryClass),
source source
), ),
source,
) )
} }
} }
@@ -176,7 +174,7 @@ class KotlinDeserializedJvmSymbolsProvider(
private fun loadAnnotation( private fun loadAnnotation(
annotationClassId: ClassId, result: MutableList<FirAnnotationCall>, annotationClassId: ClassId, result: MutableList<FirAnnotationCall>,
): KotlinJvmBinaryClass.AnnotationArgumentVisitor? { ): KotlinJvmBinaryClass.AnnotationArgumentVisitor {
val lookupTag = ConeClassLikeLookupTagImpl(annotationClassId) val lookupTag = ConeClassLikeLookupTagImpl(annotationClassId)
return object : KotlinJvmBinaryClass.AnnotationArgumentVisitor { return object : KotlinJvmBinaryClass.AnnotationArgumentVisitor {
@@ -231,7 +229,7 @@ class KotlinDeserializedJvmSymbolsProvider(
argumentMap[name] = enumClassId.toEnumEntryReferenceExpression(enumEntryName) argumentMap[name] = enumClassId.toEnumEntryReferenceExpression(enumEntryName)
} }
override fun visitArray(name: Name): AnnotationArrayArgumentVisitor? { override fun visitArray(name: Name): AnnotationArrayArgumentVisitor {
return object : AnnotationArrayArgumentVisitor { return object : AnnotationArrayArgumentVisitor {
private val elements = mutableListOf<FirExpression>() private val elements = mutableListOf<FirExpression>()
@@ -261,9 +259,9 @@ class KotlinDeserializedJvmSymbolsProvider(
} }
} }
override fun visitAnnotation(name: Name, classId: ClassId): KotlinJvmBinaryClass.AnnotationArgumentVisitor? { override fun visitAnnotation(name: Name, classId: ClassId): KotlinJvmBinaryClass.AnnotationArgumentVisitor {
val list = mutableListOf<FirAnnotationCall>() val list = mutableListOf<FirAnnotationCall>()
val visitor = loadAnnotation(classId, list)!! val visitor = loadAnnotation(classId, list)
return object : KotlinJvmBinaryClass.AnnotationArgumentVisitor by visitor { return object : KotlinJvmBinaryClass.AnnotationArgumentVisitor by visitor {
override fun visitEnd() { override fun visitEnd() {
visitor.visitEnd() visitor.visitEnd()