...

IVIanuu · Mar 11, 2025 · f461bfc · f461bfc
1 parent 166990c
commit f461bfc
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 39 deletions.
diff --git a/compiler/src/main/kotlin/injekt/compiler/InjektFqNames.kt b/compiler/src/main/kotlin/injekt/compiler/InjektFqNames.kt
@@ -4,6 +4,7 @@
 
 package injekt.compiler
 
+import org.jetbrains.kotlin.builtins.*
 import org.jetbrains.kotlin.name.*
 
 object InjektFqNames {
@@ -34,4 +35,5 @@ object InjektFqNames {
   val kSuspendFunction = StandardClassIds.BASE_COROUTINES_PACKAGE.child("KSuspendFunction".asNameId()).asString()
   val composableFunction = FqName("androidx.compose.runtime.internal.ComposableFunction").asString()
   val kComposableFunction = FqName("androidx.compose.runtime.internal.KComposableFunction").asString()
+  val Target = ClassId.topLevel(StandardNames.FqNames.target)
 }
diff --git a/compiler/src/main/kotlin/injekt/compiler/fir/TagAnnotationTargetPatcher.kt b/compiler/src/main/kotlin/injekt/compiler/fir/TagAnnotationTargetPatcher.kt
@@ -7,7 +7,6 @@
 package injekt.compiler.fir
 
 import injekt.compiler.*
-import org.jetbrains.kotlin.builtins.*
 import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.analysis.checkers.declaration.*
 import org.jetbrains.kotlin.fir.declarations.*
@@ -34,52 +33,53 @@ class TagAnnotationTargetPatcher(
     containingClass: FirClassLikeSymbol<*>?,
     isLocal: Boolean
   ): FirDeclarationStatus {
-    val targetClassId = ClassId.topLevel(StandardNames.FqNames.target)
-    if (!regularClass.hasAnnotation(targetClassId, session)) {
-      val targetSymbol = targetClassId.toSymbol(session)!!
-        .cast<FirClassSymbol<*>>()
-      val targetConstructorSymbol =
-        targetSymbol.primaryConstructorSymbol(session)!!
-      val allowedTargetsValueParameterSymbol =
-        targetConstructorSymbol.valueParameterSymbols.single()
+    if (regularClass.hasAnnotation(InjektFqNames.Target, session))
+      return super.transformStatus(status, regularClass, containingClass, isLocal)
 
-      regularClass.replaceAnnotations(
-        regularClass.annotations + buildAnnotation {
-          source = regularClass.source
+    val targetSymbol = InjektFqNames.Target
+      .toSymbol(session)!!
+      .cast<FirClassSymbol<*>>()
+    val targetConstructorSymbol =
+      targetSymbol.primaryConstructorSymbol(session)!!
+    val allowedTargetsValueParameterSymbol =
+      targetConstructorSymbol.valueParameterSymbols.single()
 
-          annotationTypeRef = targetSymbol.defaultType().toFirResolvedTypeRef()
+    regularClass.replaceAnnotations(
+      regularClass.annotations + buildAnnotation {
+        source = regularClass.source
 
-          argumentMapping = buildAnnotationArgumentMapping {
-            mapping[Name.identifier("allowedTargets")] =
-              buildVarargArgumentsExpression {
-                coneTypeOrNull = allowedTargetsValueParameterSymbol.resolvedReturnType
-                coneElementTypeOrNull = allowedTargetsValueParameterSymbol.resolvedReturnType
-                  .typeArguments
-                  .single()
-                  .type
+        annotationTypeRef = targetSymbol.defaultType().toFirResolvedTypeRef()
 
-                arguments += buildEnumEntryDeserializedAccessExpression {
-                  enumClassId = StandardClassIds.AnnotationTarget
-                  enumEntryName = Name.identifier("CLASS")
-                }
-                  .toQualifiedPropertyAccessExpression(session)
+        argumentMapping = buildAnnotationArgumentMapping {
+          mapping[Name.identifier("allowedTargets")] =
+            buildVarargArgumentsExpression {
+              coneTypeOrNull = allowedTargetsValueParameterSymbol.resolvedReturnType
+              coneElementTypeOrNull = allowedTargetsValueParameterSymbol.resolvedReturnType
+                .typeArguments
+                .single()
+                .type
 
-                arguments += buildEnumEntryDeserializedAccessExpression {
-                  enumClassId = StandardClassIds.AnnotationTarget
-                  enumEntryName = Name.identifier("CONSTRUCTOR")
-                }
-                  .toQualifiedPropertyAccessExpression(session)
+              arguments += buildEnumEntryDeserializedAccessExpression {
+                enumClassId = StandardClassIds.AnnotationTarget
+                enumEntryName = Name.identifier("CLASS")
+              }
+                .toQualifiedPropertyAccessExpression(session)
+
+              arguments += buildEnumEntryDeserializedAccessExpression {
+                enumClassId = StandardClassIds.AnnotationTarget
+                enumEntryName = Name.identifier("CONSTRUCTOR")
+              }
+                .toQualifiedPropertyAccessExpression(session)
 
-                arguments += buildEnumEntryDeserializedAccessExpression {
-                  enumClassId = StandardClassIds.AnnotationTarget
-                  enumEntryName = Name.identifier("TYPE")
-                }
-                  .toQualifiedPropertyAccessExpression(session)
+              arguments += buildEnumEntryDeserializedAccessExpression {
+                enumClassId = StandardClassIds.AnnotationTarget
+                enumEntryName = Name.identifier("TYPE")
               }
-          }
+                .toQualifiedPropertyAccessExpression(session)
+            }
         }
-      )
-    }
+      }
+    )
 
     return super.transformStatus(status, regularClass, containingClass, isLocal)
   }