fix jvm name for annotation values

google · Feb 13, 2024 · 42df0ec · 42df0ec
1 parent b8a1a1a
commit 42df0ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/ResolverAAImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/ResolverAAImpl.kt
@@ -409,6 +409,9 @@ class ResolverAAImpl(
 
     // TODO: handle @JvmName annotations, mangled names
     override fun getJvmName(accessor: KSPropertyAccessor): String? {
+        if (accessor.receiver.closestClassDeclaration()?.classKind == ClassKind.ANNOTATION_CLASS) {
+            return accessor.receiver.simpleName.asString()
+        }
         val prefix = if (accessor is KSPropertyGetter) {
             "get"
         } else {

diff --git a/test-utils/testData/api/mangledNames.kt b/test-utils/testData/api/mangledNames.kt
@@ -47,6 +47,8 @@
 // inlineReturningFun -> inlineReturningFun-HRn7Rpw
 // internalInlineReceivingFun -> internalInlineReceivingFun-E03SJzc$mainModule
 // internalInlineReturningFun -> internalInlineReturningFun-HRn7Rpw$mainModule
+// mainPackage.Anno -> declarations
+// get-a -> a
 // mainPackage.AbstractKotlinClass -> declarations
 // get-abstractVar -> getAbstractVar
 // set-abstractVar -> setAbstractVar
@@ -151,6 +153,7 @@ class Foo {
     internal fun internalInlineReturningFun(): Inline1 = TODO()
 }
 
+annotation class Anno(val a: String)
 abstract class AbstractKotlinClass {
     abstract var abstractVar:String
     abstract val abstractVal:String