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

jvm-abi-gen: sort inner classes

Browse Source
This commit is contained in:
pyos
2022-12-06 11:00:04 +01:00
committed by Alexander Udalov
parent 26a7ac6d92
commit d6fdd6734e
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiOutputExtension.kt
+8 -3
View File
@@ -150,10 +150,15 @@ class JvmAbiOutputExtension(
override fun visitEnd() {} override fun visitEnd() {}
}, 0) }, 0)
innerClassesToKeep.retainAll(innerClassInfos.keys)
for (name in innerClassesToKeep.toList()) { for (name in innerClassesToKeep.toList()) {
val info = innerClassInfos[name] ?: continue var info = innerClassInfos[name]
generateSequence(info) { it.outerName?.takeIf(innerClassesToKeep::add)?.let(innerClassInfos::get) } while (info != null) {
.forEach { writer.visitInnerClass(it.name, it.outerName, it.innerName, it.access) } info = info.outerName?.takeIf(innerClassesToKeep::add)?.let(innerClassInfos::get)
}
}
for (name in innerClassesToKeep.sorted()) {
innerClassInfos[name]?.let { writer.visitInnerClass(it.name, it.outerName, it.innerName, it.access) }
} }
writer.visitEnd() writer.visitEnd()
plugins/jvm-abi-gen/testData/content/class/signatures.txt
Vendored
+2 -2
View File
@@ -21,15 +21,15 @@ public class test/BaseClass {
@kotlin.Metadata @kotlin.Metadata
public final class test/Class$NestedInnerClass$NestedNestedInnerClass { public final class test/Class$NestedInnerClass$NestedNestedInnerClass {
// source: 'classes.kt' // source: 'classes.kt'
public final inner class test/Class$NestedInnerClass$NestedNestedInnerClass
private final inner class test/Class$NestedInnerClass private final inner class test/Class$NestedInnerClass
public final inner class test/Class$NestedInnerClass$NestedNestedInnerClass
public method <init>(): void public method <init>(): void
} }
@kotlin.Metadata @kotlin.Metadata
final class test/Class$NestedInnerClass { final class test/Class$NestedInnerClass {
// source: 'classes.kt' // source: 'classes.kt'
public final inner class test/Class$NestedInnerClass$NestedNestedInnerClass
private final inner class test/Class$NestedInnerClass private final inner class test/Class$NestedInnerClass
public final inner class test/Class$NestedInnerClass$NestedNestedInnerClass
public method <init>(): void public method <init>(): void
} }
@kotlin.Metadata @kotlin.Metadata
plugins/jvm-abi-gen/testData/content/innerClasses/signatures.txt
Vendored
+3 -3
View File
@@ -6,15 +6,15 @@ public annotation class Anno {
@kotlin.Metadata @kotlin.Metadata
public final class InAnnotation { public final class InAnnotation {
// source: 'innerClasses.kt' // source: 'innerClasses.kt'
public inner class Outer$Middle$Inner
public inner class Outer$Middle public inner class Outer$Middle
public inner class Outer$Middle$Inner
public method <init>(): void public method <init>(): void
} }
@kotlin.Metadata @kotlin.Metadata
public final class InInlineMethod { public final class InInlineMethod {
// source: 'innerClasses.kt' // source: 'innerClasses.kt'
public inner class Outer$Middle$Inner
public inner class Outer$Middle public inner class Outer$Middle
public inner class Outer$Middle$Inner
public method <init>(): void public method <init>(): void
public final @org.jetbrains.annotations.NotNull method foo(): java.lang.Class public final @org.jetbrains.annotations.NotNull method foo(): java.lang.Class
} }
@@ -26,8 +26,8 @@ public final class InPrivateMethod {
@kotlin.Metadata @kotlin.Metadata
public final class InPublicMethod { public final class InPublicMethod {
// source: 'innerClasses.kt' // source: 'innerClasses.kt'
public inner class Outer$Middle$Inner
public inner class Outer$Middle public inner class Outer$Middle
public inner class Outer$Middle$Inner
public method <init>(): void public method <init>(): void
public final method foo(@org.jetbrains.annotations.NotNull p0: Outer$Middle$Inner): void public final method foo(@org.jetbrains.annotations.NotNull p0: Outer$Middle$Inner): void
} }