Kotlin: Fix a bad label expansion

igfoo · igfoo · commit 40976a91ce4e · 2022-05-10T19:51:09.000+01:00
We were making a key
    @"class;ClassLabelResults(classLabel=java.io.Console, shortName=Console)\$LineReader"
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -563,7 +563,7 @@ class X {
         val label = if (parent is IrClass) {
             // todo: fix this. Ugly string concat to handle nested class IDs.
             // todo: Can the containing class have type arguments?
-            "${getUnquotedClassLabel(parent, listOf())}\$$cls"
+            "${getUnquotedClassLabel(parent, listOf()).classLabel}\$$cls"
         } else {
             if (pkg.isEmpty()) cls else "$pkg.$cls"
         }

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ class X {`
`563`	`563`	`val label = if (parent is IrClass) {`
`564`	`564`	`// todo: fix this. Ugly string concat to handle nested class IDs.`
`565`	`565`	`// todo: Can the containing class have type arguments?`
`566`		`- "${getUnquotedClassLabel(parent, listOf())}\$$cls"`
	`566`	`+ "${getUnquotedClassLabel(parent, listOf()).classLabel}\$$cls"`
`567`	`567`	`} else {`
`568`	`568`	`if (pkg.isEmpty()) cls else "$pkg.$cls"`
`569`	`569`	`}`