mirror of
https://github.com/architectury/architectury-loom.git
synced 2026-03-28 04:07:01 -05:00
Fix remapping Kotlin classes containing $. (#1385)
* Fix remapping Kotlin classes containing $. Closes #1363 * spotless
This commit is contained in:
@@ -88,7 +88,15 @@ class KotlinClassRemapper(
|
||||
|
||||
private fun remap(name: ClassName): ClassName {
|
||||
val local = name.isLocalClassName()
|
||||
val remapped = remapper.map(name.toJvmInternalName()).replace('$', '.')
|
||||
|
||||
// Ensure that none inner classes with names containing $ are persisted.
|
||||
// See: https://github.com/FabricMC/fabric-loom/issues/1363 fix suggested by fan87
|
||||
val normalizedName = name.replace('$', '\n')
|
||||
val remapped =
|
||||
remapper
|
||||
.map(normalizedName.toJvmInternalName())
|
||||
.replace('$', '.')
|
||||
.replace('\n', '$')
|
||||
|
||||
if (local) {
|
||||
return ".$remapped"
|
||||
|
||||
Reference in New Issue
Block a user