Skip to content

Fix remapping Kotlin classes containing $. #1385

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

Merged
merged 2 commits into from
Oct 5, 2025
Merged

Fix remapping Kotlin classes containing $. #1385

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efacc2b
Fix remapping Kotlin classes containing $.
modmuss50 Oct 5, 2025
4818fec
spotless
modmuss50 Oct 5, 2025
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
10 changes: 9 additions & 1 deletion src/main/kotlin/net/fabricmc/loom/kotlin/remapping/KotlinClassRemapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down