Handle JvmName in annotation classes

(cherry picked from commit 9eae2ee)
google · Oct 18, 2024 · a1fbd18 · a1fbd18
1 parent 057675d
commit a1fbd18
Showing 1 changed file with 4 additions and 4 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
@@ -469,10 +469,6 @@ class ResolverAAImpl(
 
     // TODO: handle library symbols
     override fun getJvmName(accessor: KSPropertyAccessor): String {
-        if (accessor.receiver.closestClassDeclaration()?.classKind == ClassKind.ANNOTATION_CLASS) {
-            return accessor.receiver.simpleName.asString()
-        }
-
         val symbol: KaPropertyAccessorSymbol? = when (accessor) {
             is KSPropertyAccessorImpl -> accessor.ktPropertyAccessorSymbol
             else -> null
@@ -482,6 +478,10 @@ class ResolverAAImpl(
             return it
         }
 
+        if (accessor.receiver.closestClassDeclaration()?.classKind == ClassKind.ANNOTATION_CLASS) {
+            return accessor.receiver.simpleName.asString()
+        }
+
         val prefix = if (accessor is KSPropertyGetter) {
             "get"
         } else {