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

jvm-abi-gen: Do not write kotlin.Metadata default values

Browse Source 
See KT-39492. This does not affect compilation, but it causes problems
in IntelliJ.
This commit is contained in:
Steven Schäfer
2021-12-08 18:49:27 +01:00
committed by Alexander Udalov
parent e50e055eb4
commit 3f22321643
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiMetadataProcessor.kt
+21 -11
View File
@@ -60,8 +60,8 @@ private fun kotlinClassHeaderVisitor(body: (KotlinClassHeader) -> Unit): Annotat
var metadataVersion: IntArray = intArrayOf() var metadataVersion: IntArray = intArrayOf()
var data1: MutableList<String> = mutableListOf() var data1: MutableList<String> = mutableListOf()
var data2: MutableList<String> = mutableListOf() var data2: MutableList<String> = mutableListOf()
var extraString: String = "" var extraString: String? = null
var packageName: String = "" var packageName: String? = null
var extraInt: Int = 0 var extraInt: Int = 0
override fun visit(name: String, value: Any?) { override fun visit(name: String, value: Any?) {
@@ -108,17 +108,27 @@ private fun kotlinClassHeaderVisitor(body: (KotlinClassHeader) -> Unit): Annotat
private fun AnnotationVisitor.visitKotlinMetadata(header: KotlinClassHeader) { private fun AnnotationVisitor.visitKotlinMetadata(header: KotlinClassHeader) {
visit(KIND_FIELD_NAME, header.kind) visit(KIND_FIELD_NAME, header.kind)
visit(METADATA_VERSION_FIELD_NAME, header.metadataVersion) visit(METADATA_VERSION_FIELD_NAME, header.metadataVersion)
visitArray(METADATA_DATA_FIELD_NAME).apply { if (header.data1.isNotEmpty()) {
header.data1.forEach { visit(null, it) } visitArray(METADATA_DATA_FIELD_NAME).apply {
visitEnd() header.data1.forEach { visit(null, it) }
visitEnd()
}
} }
visitArray(METADATA_STRINGS_FIELD_NAME).apply { if (header.data2.isNotEmpty()) {
header.data2.forEach { visit(null, it) } visitArray(METADATA_STRINGS_FIELD_NAME).apply {
visitEnd() header.data2.forEach { visit(null, it) }
visitEnd()
}
}
if (header.extraString.isNotEmpty()) {
visit(METADATA_EXTRA_STRING_FIELD_NAME, header.extraString)
}
if (header.packageName.isNotEmpty()) {
visit(METADATA_PACKAGE_NAME_FIELD_NAME, header.packageName)
}
if (header.extraInt != 0) {
visit(METADATA_EXTRA_INT_FIELD_NAME, header.extraInt)
} }
visit(METADATA_EXTRA_STRING_FIELD_NAME, header.extraString)
visit(METADATA_PACKAGE_NAME_FIELD_NAME, header.packageName)
visit(METADATA_EXTRA_INT_FIELD_NAME, header.extraInt)
visitEnd() visitEnd()
} }