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

Jump to bottom

Reformant kotlin to make spotless happy #1109

Closed
wants to merge 1 commit into from
Closed

Reformant kotlin to make spotless happy #1109

Show file tree
Hide file tree
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
278 changes: 139 additions & 139 deletions ...otlin/net/fabricmc/loom/kotlin/remapping/KotlinClassMetadataRemappingAnnotationVisitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,144 +33,144 @@ import org.objectweb.asm.tree.AnnotationNode
import org.slf4j.LoggerFactory

class KotlinClassMetadataRemappingAnnotationVisitor(
private val remapper: Remapper,
val next: AnnotationVisitor,
val className: String?,
private val remapper: Remapper,
val next: AnnotationVisitor,
val className: String?,
) :
AnnotationNode(Opcodes.ASM9, KotlinMetadataRemappingClassVisitor.ANNOTATION_DESCRIPTOR) {
private val logger = LoggerFactory.getLogger(javaClass)

override fun visit(
name: String?,
value: Any?,
) {
super.visit(name, value)
}

override fun visitEnd() {
super.visitEnd()

val header = readHeader() ?: return

val headerVersion = KotlinVersion(header.metadataVersion[0], header.metadataVersion[1], 0)
val currentMinorVersion = KotlinVersion(KotlinVersion.CURRENT.major, KotlinVersion.CURRENT.minor, 0)

if (headerVersion != currentMinorVersion) {
logger.info(
"Kotlin metadata for class ($className) as it was built using a different major Kotlin " +
"version (${header.metadataVersion[0]}.${header.metadataVersion[1]}.x) while the remapper " +
"is using (${KotlinVersion.CURRENT}).",
)
}

when (val metadata = KotlinClassMetadata.readLenient(header)) {
is KotlinClassMetadata.Class -> {
var klass = metadata.kmClass
klass = KotlinClassRemapper(remapper).remap(klass)
val remapped = KotlinClassMetadata.Class(klass, metadata.version, metadata.flags).write()
writeClassHeader(remapped)
validateKotlinClassHeader(remapped, header)
}
is KotlinClassMetadata.SyntheticClass -> {
var klambda = metadata.kmLambda

if (klambda != null) {
klambda = KotlinClassRemapper(remapper).remap(klambda)
val remapped = KotlinClassMetadata.SyntheticClass(klambda, metadata.version, metadata.flags).write()
writeClassHeader(remapped)
validateKotlinClassHeader(remapped, header)
} else {
accept(next)
}
}
is KotlinClassMetadata.FileFacade -> {
var kpackage = metadata.kmPackage
kpackage = KotlinClassRemapper(remapper).remap(kpackage)
val remapped = KotlinClassMetadata.FileFacade(kpackage, metadata.version, metadata.flags).write()
writeClassHeader(remapped)
validateKotlinClassHeader(remapped, header)
}
is KotlinClassMetadata.MultiFileClassPart -> {
var kpackage = metadata.kmPackage
kpackage = KotlinClassRemapper(remapper).remap(kpackage)
val remapped =
KotlinClassMetadata.MultiFileClassPart(
kpackage,
metadata.facadeClassName,
metadata.version,
metadata.flags,
).write()
writeClassHeader(remapped)
validateKotlinClassHeader(remapped, header)
}
is KotlinClassMetadata.MultiFileClassFacade, is KotlinClassMetadata.Unknown -> {
// do nothing
accept(next)
}
}
}

@Suppress("UNCHECKED_CAST")
private fun readHeader(): Metadata? {
var kind: Int? = null
var metadataVersion: IntArray? = null
var data1: Array<String>? = null
var data2: Array<String>? = null
var extraString: String? = null
var packageName: String? = null
var extraInt: Int? = null

if (values == null) {
return null
}

values.chunked(2).forEach { (name, value) ->
when (name) {
"k" -> kind = value as Int
"mv" -> metadataVersion = (value as List<Int>).toIntArray()
"d1" -> data1 = (value as List<String>).toTypedArray()
"d2" -> data2 = (value as List<String>).toTypedArray()
"xs" -> extraString = value as String
"pn" -> packageName = value as String
"xi" -> extraInt = value as Int
}
}

return Metadata(kind, metadataVersion, data1, data2, extraString, packageName, extraInt)
}

private fun writeClassHeader(header: Metadata) {
val newNode = AnnotationNode(api, desc)
newNode.values = this.values.toMutableList()

newNode.run {
for (i in values.indices step 2) {
when (values[i]) {
"k" -> values[i + 1] = header.kind
"mv" -> values[i + 1] = header.metadataVersion.toList()
"d1" -> values[i + 1] = header.data1.toList()
"d2" -> values[i + 1] = header.data2.toList()
"xs" -> values[i + 1] = header.extraString
"pn" -> values[i + 1] = header.packageName
"xi" -> values[i + 1] = header.extraInt
}
}
}

newNode.accept(next)
}

private fun validateKotlinClassHeader(
remapped: Metadata,
original: Metadata,
) {
// This can happen when the remapper is ran on a kotlin version
// that does not match the version the class was compiled with.
if (remapped.data2.size != original.data2.size) {
logger.info(
"Kotlin class metadata size mismatch: data2 size does not match original in class $className. " +
"New: ${remapped.data2.size} Old: ${original.data2.size}",
)
}
}
AnnotationNode(Opcodes.ASM9, KotlinMetadataRemappingClassVisitor.ANNOTATION_DESCRIPTOR) {
private val logger = LoggerFactory.getLogger(javaClass)

override fun visit(
name: String?,
value: Any?,
) {
super.visit(name, value)
}

override fun visitEnd() {
super.visitEnd()

val header = readHeader() ?: return

val headerVersion = KotlinVersion(header.metadataVersion[0], header.metadataVersion[1], 0)
val currentMinorVersion = KotlinVersion(KotlinVersion.CURRENT.major, KotlinVersion.CURRENT.minor, 0)

if (headerVersion != currentMinorVersion) {
logger.info(
"Kotlin metadata for class ($className) as it was built using a different major Kotlin " +
"version (${header.metadataVersion[0]}.${header.metadataVersion[1]}.x) while the remapper " +
"is using (${KotlinVersion.CURRENT}).",
)
}

when (val metadata = KotlinClassMetadata.readLenient(header)) {
is KotlinClassMetadata.Class -> {
var klass = metadata.kmClass
klass = KotlinClassRemapper(remapper).remap(klass)
val remapped = KotlinClassMetadata.Class(klass, metadata.version, metadata.flags).write()
writeClassHeader(remapped)
validateKotlinClassHeader(remapped, header)
}
is KotlinClassMetadata.SyntheticClass -> {
var klambda = metadata.kmLambda

if (klambda != null) {
klambda = KotlinClassRemapper(remapper).remap(klambda)
val remapped = KotlinClassMetadata.SyntheticClass(klambda, metadata.version, metadata.flags).write()
writeClassHeader(remapped)
validateKotlinClassHeader(remapped, header)
} else {
accept(next)
}
}
is KotlinClassMetadata.FileFacade -> {
var kpackage = metadata.kmPackage
kpackage = KotlinClassRemapper(remapper).remap(kpackage)
val remapped = KotlinClassMetadata.FileFacade(kpackage, metadata.version, metadata.flags).write()
writeClassHeader(remapped)
validateKotlinClassHeader(remapped, header)
}
is KotlinClassMetadata.MultiFileClassPart -> {
var kpackage = metadata.kmPackage
kpackage = KotlinClassRemapper(remapper).remap(kpackage)
val remapped =
KotlinClassMetadata.MultiFileClassPart(
kpackage,
metadata.facadeClassName,
metadata.version,
metadata.flags,
).write()
writeClassHeader(remapped)
validateKotlinClassHeader(remapped, header)
}
is KotlinClassMetadata.MultiFileClassFacade, is KotlinClassMetadata.Unknown -> {
// do nothing
accept(next)
}
}
}

@Suppress("UNCHECKED_CAST")
private fun readHeader(): Metadata? {
var kind: Int? = null
var metadataVersion: IntArray? = null
var data1: Array<String>? = null
var data2: Array<String>? = null
var extraString: String? = null
var packageName: String? = null
var extraInt: Int? = null

if (values == null) {
return null
}

values.chunked(2).forEach { (name, value) ->
when (name) {
"k" -> kind = value as Int
"mv" -> metadataVersion = (value as List<Int>).toIntArray()
"d1" -> data1 = (value as List<String>).toTypedArray()
"d2" -> data2 = (value as List<String>).toTypedArray()
"xs" -> extraString = value as String
"pn" -> packageName = value as String
"xi" -> extraInt = value as Int
}
}

return Metadata(kind, metadataVersion, data1, data2, extraString, packageName, extraInt)
}

private fun writeClassHeader(header: Metadata) {
val newNode = AnnotationNode(api, desc)
newNode.values = this.values.toMutableList()

newNode.run {
for (i in values.indices step 2) {
when (values[i]) {
"k" -> values[i + 1] = header.kind
"mv" -> values[i + 1] = header.metadataVersion.toList()
"d1" -> values[i + 1] = header.data1.toList()
"d2" -> values[i + 1] = header.data2.toList()
"xs" -> values[i + 1] = header.extraString
"pn" -> values[i + 1] = header.packageName
"xi" -> values[i + 1] = header.extraInt
}
}
}

newNode.accept(next)
}

private fun validateKotlinClassHeader(
remapped: Metadata,
original: Metadata,
) {
// This can happen when the remapper is ran on a kotlin version
// that does not match the version the class was compiled with.
if (remapped.data2.size != original.data2.size) {
logger.info(
"Kotlin class metadata size mismatch: data2 size does not match original in class $className. " +
"New: ${remapped.data2.size} Old: ${original.data2.size}",
)
}
}
}
Loading
Loading