SLC: keep annotations on type when converting to PsiType

^KT-55815 Fixed

compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt

@@ -165,30 +165,10 @@ internal fun KotlinType.asPsiType(
     typeMapper.mapType(this, signatureWriter, mode)
 }
 
-// There is no other known way found to make PSI types annotated for now.
-// It seems we need for platform changes to do it more convenient way (KTIJ-141).
-private val setPsiTypeAnnotationProvider: (PsiType, TypeAnnotationProvider) -> Unit by lazyPub {
-    val klass = PsiType::class.java
-    val providerField = try {
-        klass.getDeclaredField("myAnnotationProvider")
-            .also { it.isAccessible = true }
-    } catch (e: NoSuchFieldException) {
-        if (ApplicationManager.getApplication().isInternal) throw e
-        null
-    } catch (e: SecurityException) {
-        if (ApplicationManager.getApplication().isInternal) throw e
-        null
-    }
-
-    { psiType, provider ->
-        providerField?.set(psiType, provider)
-    }
-}
-
 private fun annotateByKotlinType(
     psiType: PsiType,
     kotlinType: KotlinType,
-    psiContext: PsiElement,
+    psiContext: PsiTypeElement,
 ): PsiType {
 
     fun KotlinType.getAnnotationsSequence(): Sequence<List<PsiAnnotation>> =
@@ -199,37 +179,7 @@ private fun annotateByKotlinType(
             }
         }
 
-    val annotationsIterator = kotlinType.getAnnotationsSequence().iterator()
-    if (!annotationsIterator.hasNext()) return psiType
-
-    if (psiType is PsiPrimitiveType) {
-        val annotation = annotationsIterator.next()
-        val provider = TypeAnnotationProvider.Static.create(annotation.toTypedArray())
-        return psiType.annotate(provider)
-    }
-
-    fun recursiveAnnotator(psiType: PsiType) {
-        if (!annotationsIterator.hasNext()) return
-        val typeAnnotations = annotationsIterator.next()
-
-        if (psiType is PsiPrimitiveType) return //Primitive type cannot be type parameter so we skip it
-
-        if (psiType is PsiClassType) {
-            for (parameterType in psiType.parameters) {
-                recursiveAnnotator(parameterType)
-            }
-        } else if (psiType is PsiArrayType) {
-            recursiveAnnotator(psiType.componentType)
-        }
-
-        if (typeAnnotations.isEmpty()) return
-
-        val provider = TypeAnnotationProvider.Static.create(typeAnnotations.toTypedArray())
-        setPsiTypeAnnotationProvider(psiType, provider)
-    }
-
-    recursiveAnnotator(psiType)
-    return psiType
+    return psiType.annotateByTypeAnnotationProvider(kotlinType.getAnnotationsSequence())
 }
 
 internal fun KtUltraLightSupport.mapType(

compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.fir.java

@@ -58,7 +58,7 @@ public final class klass /* klass*/ {
   private final int x = 2 /* initializer type: int */;
 
   @org.jetbrains.annotations.NotNull()
-  public final X annotatedMethod(@org.jetbrains.annotations.NotNull() P<X, P<X, Y>>, @org.jetbrains.annotations.NotNull() Y[]);//  annotatedMethod(P<X, P<X, Y>>, Y[])
+  public final @A6() X annotatedMethod(@org.jetbrains.annotations.NotNull() @A0() P<@A1() X, P<@A2() @A3() X, @A4() Y>>, @org.jetbrains.annotations.NotNull() @A5() Y[]);//  annotatedMethod(@A0() P<@A1() X, P<@A2() @A3() X, @A4() Y>>, @A5() Y[])
 
   @org.jetbrains.annotations.Nullable()
   public final java.util.List<java.lang.Integer> getY();//  getY()