[FIR] Transform annotations of type refs in body resolve stage

Also fix building CFG for annotation calls

compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantReturnUnitTypeChecker.kt

@@ -5,7 +5,7 @@ interface I {
 }
 
 class A {
-    fun too(): @Annotation Unit {}
+    fun too(): <!NOT_AN_ANNOTATION_CLASS, NOT_AN_ANNOTATION_CLASS!>@Annotation<!> Unit {}
 
     fun foo(): <!REDUNDANT_RETURN_UNIT_TYPE!>Unit<!>
     {

compiler/fir/analysis-tests/testData/resolve/multifile/Annotations.fir.txt

@@ -69,9 +69,9 @@ FILE: main.kt
             public get(): R|kotlin/String|
 
     }
-    @R|annotations/WithString|(String(xyz)) public final class Second : @R|annotations/WithInt|(IntegerLiteral(0)) R|test/First| {
+    @R|annotations/WithString|(String(xyz)) public final class Second : @R|annotations/WithInt|(Int(0)) R|test/First| {
         public constructor(y: R|kotlin/Char|): R|test/Second| {
-            super<@R|annotations/WithInt|(IntegerLiteral(0)) R|test/First|>()
+            super<@R|annotations/WithInt|(Int(0)) R|test/First|>()
         }
 
         public final val y: R|kotlin/Char| = R|<local>/y|

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt

@@ -61,12 +61,14 @@ open class FirBodyResolveTransformer(
     }
 
     override fun transformTypeRef(typeRef: FirTypeRef, data: ResolutionMode): FirResolvedTypeRef {
-        if (typeRef is FirResolvedTypeRef) {
+        val resolvedTypeRef = if (typeRef is FirResolvedTypeRef) {
-            return typeRef
+            typeRef
-        }
+        } else {
-        return typeResolverTransformer.withFile(context.file) {
+            typeResolverTransformer.withFile(context.file) {
-            transformTypeRef(typeRef, FirCompositeScope(components.createCurrentScopeList()))
+                transformTypeRef(typeRef, FirCompositeScope(components.createCurrentScopeList()))
+            }
         }
+        return resolvedTypeRef.transformAnnotations(this, data)
     }
 
     override fun transformImplicitTypeRef(implicitTypeRef: FirImplicitTypeRef, data: ResolutionMode): FirTypeRef {

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt

@@ -782,14 +782,15 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
         annotationCall: FirAnnotationCall,
         status: FirAnnotationResolveStatus
     ): FirAnnotationCall {
-        dataFlowAnalyzer.enterAnnotationCall(annotationCall)
         return withFirArrayOfCallTransformer {
             annotationCall.transformAnnotationTypeRef(transformer, ResolutionMode.ContextIndependent)
             if (status == FirAnnotationResolveStatus.PartiallyResolved) return annotationCall
-            val result = callResolver.resolveAnnotationCall(annotationCall) ?: return annotationCall
+            dataFlowAnalyzer.enterAnnotationCall(annotationCall)
+            val result = callResolver.resolveAnnotationCall(annotationCall)
+            dataFlowAnalyzer.exitAnnotationCall(result ?: annotationCall)
+            if (result == null) return annotationCall
             callCompleter.completeCall(result, noExpectedType)
             result.replaceResolveStatus(status)
-            dataFlowAnalyzer.exitAnnotationCall(result)
             annotationCall
         }
     }

compiler/testData/diagnostics/tests/annotations/typeUse/kt25876.fir.kt

@@ -4,10 +4,10 @@
 @Target(AnnotationTarget.TYPE)
 annotation class Anno(val value: String)
 
-fun foo(x: String): @Anno(Lorem, ipsum::class, "dolor", sit-amet) String {  // OK
+fun foo(x: String): @Anno(<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>Lorem<!>, <!TOO_MANY_ARGUMENTS, TOO_MANY_ARGUMENTS!><!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>ipsum<!>::class<!>, <!TOO_MANY_ARGUMENTS, TOO_MANY_ARGUMENTS!>"dolor"<!>, <!TOO_MANY_ARGUMENTS, TOO_MANY_ARGUMENTS!><!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>sit<!>-<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>amet<!><!>) String {  // OK
     return x
 }
 
-abstract class Foo : @Anno(o_O) Throwable()  // OK
+abstract class Foo : @Anno(<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>o_O<!>) Throwable()  // OK
 
-abstract class Bar<T : @Anno(O_o) Any>  // OK
+abstract class Bar<T : @Anno(<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>O_o<!>) Any>  // OK

compiler/testData/diagnostics/tests/inference/commonSystem/lessSpecificTypeForArgumentCallWithExactAnnotation.fir.kt

@@ -6,7 +6,7 @@ interface B : A
 interface C : A
 
 @Suppress("INVISIBLE_REFERENCE")
-fun <K> select(x: K, y: K): @kotlin.internal.Exact K = x
+fun <K> select(x: K, y: K): <!HIDDEN, HIDDEN!>@kotlin.internal.Exact<!> K = x
 
 fun foo(a: Any) {}
 

compiler/testData/diagnostics/tests/inference/commonSystem/lessSpecificTypeForArgumentCallWithExactAnnotation_ni.fir.kt

@@ -6,7 +6,7 @@ interface B : A
 interface C : A
 
 @Suppress("INVISIBLE_REFERENCE")
-fun <K> select(x: K, y: K): @kotlin.internal.Exact K = x
+fun <K> select(x: K, y: K): <!HIDDEN, HIDDEN!>@kotlin.internal.Exact<!> K = x
 
 fun foo(a: Any) {}
 

compiler/testData/diagnostics/tests/inference/commonSystem/postponedCompletionWithExactAnnotation.fir.kt

@@ -6,7 +6,7 @@ interface ISample
 fun <K> elvisSimple(x: K?, y: K): K = y
 
 @Suppress("INVISIBLE_REFERENCE")
-fun <K> elvisExact(x: K?, y: K): @kotlin.internal.Exact K = y
+fun <K> elvisExact(x: K?, y: K): <!HIDDEN, HIDDEN!>@kotlin.internal.Exact<!> K = y
 
 fun <T : Number> materialize(): T? = TODO()
 

compiler/testData/diagnostics/tests/inference/commonSystem/postponedCompletionWithExactAnnotation_ni.fir.kt

@@ -6,7 +6,7 @@ interface ISample
 fun <K> elvisSimple(x: K?, y: K): K = y
 
 @Suppress("INVISIBLE_REFERENCE")
-fun <K> elvisExact(x: K?, y: K): @kotlin.internal.Exact K = y
+fun <K> elvisExact(x: K?, y: K): <!HIDDEN, HIDDEN!>@kotlin.internal.Exact<!> K = y
 
 fun <T : Number> materialize(): T? = null
 fun <T> Any?.materialize(): T = null as T

compiler/testData/diagnostics/tests/inference/completion/withExact.fir.kt

@@ -6,7 +6,7 @@
 import kotlin.internal.Exact
 
 class Inv<I>(val arg: I)
-class InvExact<E>(val arg: @kotlin.internal.Exact E)
+class InvExact<E>(val arg: <!HIDDEN, HIDDEN!>@kotlin.internal.Exact<!> E)
 
 interface Base
 class Derived : Base

compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/elvisOperatorAgainstFlexibleType.fir.kt

@@ -0,0 +1,20 @@
+// !LANGUAGE: +NewInference
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+
+// FILE: Foo.java
+
+public class Foo {
+    public static <K, V> void create(java.util.Map<? extends K, ? extends V> m) { return null; }
+}
+
+// FILE: test.kt
+
+fun test(properties: Map<String, String>, nullableProperties: Map<String, String>?) {
+    val f1 = Foo.create(select1(properties, myEmptyMap()))
+    val f2 = Foo.create(nullableProperties ?: myEmptyMap())
+}
+
+fun <T, R> myEmptyMap(): Map<T, R> = TODO()
+
+@Suppress("INVISIBLE_REFERENCE")
+fun <S> select1(x: S, y: S): <!HIDDEN, HIDDEN!>@kotlin.internal.Exact<!> S = y

compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/elvisOperatorAgainstFlexibleType.kt

@@ -1,4 +1,3 @@
-// FIR_IDENTICAL
 // !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 
@@ -18,4 +17,4 @@ fun test(properties: Map<String, String>, nullableProperties: Map<String, String
 fun <T, R> myEmptyMap(): Map<T, R> = TODO()
 
 @Suppress("INVISIBLE_REFERENCE")
-fun <S> select1(x: S, y: S): @kotlin.internal.Exact S = y
+fun <S> select1(x: S, y: S): @kotlin.internal.Exact S = y

compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/internalAnnotationsOnTypes.fir.kt

@@ -0,0 +1,30 @@
+//!DIAGNOSTICS: -UNUSED_PARAMETER
+
+@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
+fun <R> Iterable<*>.filterIsInstance1(): List<@kotlin.internal.NoInfer R> = throw Exception()
+
+@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
+fun <R> List<*>.filterIsInstance2(): <!HIDDEN, HIDDEN!>@kotlin.internal.NoInfer<!> List<R> = throw Exception()
+
+fun test(list: List<Int>) {
+    list.filterIsInstance1<Int>().map { it * 2 }
+    list.filterIsInstance2<Int>().filter { it > 10 }
+}
+
+@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
+fun <R> foo(t: R): List<@kotlin.internal.NoInfer R> = throw Exception("$t")
+
+fun test() {
+    foo(1).map { it * 2 }
+}
+
+@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
+fun <R> List<R>.foo(): <!HIDDEN, HIDDEN!>@kotlin.internal.NoInfer<!> R = throw Exception()
+
+@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
+fun <R> bar(r: R, f: Function1<@kotlin.internal.NoInfer R, Unit>): Nothing = throw Exception()
+
+fun test1() {
+    listOf("").foo().length
+    bar(1) { x -> x + 1 }
+}

compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/internalAnnotationsOnTypes.kt

@@ -1,4 +1,3 @@
-// FIR_IDENTICAL
 //!DIAGNOSTICS: -UNUSED_PARAMETER
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@@ -28,4 +27,4 @@ fun <R> bar(r: R, f: Function1<@kotlin.internal.NoInfer R, Unit>): Nothing = thr
 fun test1() {
     listOf("").foo().length
     bar(1) { x -> x + 1 }
-}
+}

compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.fir.kt

@@ -7,7 +7,7 @@
 public fun <T> Iterable<T>.contains1(element: T): Int<!> = null!!
 
 <!CONFLICTING_OVERLOADS!>@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
-public fun <T> Iterable<T>.contains1(element: @kotlin.internal.NoInfer T): Boolean<!> = null!!
+public fun <T> Iterable<T>.contains1(element: <!HIDDEN, HIDDEN!>@kotlin.internal.NoInfer<!> T): Boolean<!> = null!!
 
 
 fun test() {

compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.fir.kt

@@ -2,13 +2,13 @@
 // !WITH_NEW_INFERENCE
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
-fun <T> test1(t1: T, t2: @kotlin.internal.NoInfer T): T = t1
+fun <T> test1(t1: T, t2: <!HIDDEN, HIDDEN!>@kotlin.internal.NoInfer<!> T): T = t1
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
-fun <T> @kotlin.internal.NoInfer T.test2(t1: T): T = t1
+fun <T> <!HIDDEN, HIDDEN!>@kotlin.internal.NoInfer<!> T.test2(t1: T): T = t1
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
-fun <T> test3(t1: @kotlin.internal.NoInfer T): T = t1
+fun <T> test3(t1: <!HIDDEN, HIDDEN!>@kotlin.internal.NoInfer<!> T): T = t1
 
 fun usage() {
     test1(1, "312")
@@ -17,7 +17,7 @@ fun usage() {
 }
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
-fun <T> List<T>.contains1(e: @kotlin.internal.NoInfer T): Boolean = true
+fun <T> List<T>.contains1(e: <!HIDDEN, HIDDEN!>@kotlin.internal.NoInfer<!> T): Boolean = true
 
 fun test(i: Int?, a: Any, l: List<Int>) {
     l.contains1(a)
@@ -26,7 +26,7 @@ fun test(i: Int?, a: Any, l: List<Int>) {
 }
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
-fun <T> assertEquals1(e1: T, e2: @kotlin.internal.NoInfer T): Boolean = true
+fun <T> assertEquals1(e1: T, e2: <!HIDDEN, HIDDEN!>@kotlin.internal.NoInfer<!> T): Boolean = true
 
 fun test(s: String) {
     assertEquals1(s, 11)

compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/propagationOfNoInferAnnotation.kt

@@ -2,7 +2,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 private object TopLevelTypeVariable {
-    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
+    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "HIDDEN")
     fun <T> foo(): @kotlin.internal.NoInfer T = TODO()
 
     fun <K> bar(k: K) {}
@@ -15,7 +15,7 @@ private object TopLevelTypeVariable {
 private object NestedTypeVariable {
     class Inv<T>
 
-    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
+    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "HIDDEN")
     fun <T> foo(): Inv<@kotlin.internal.NoInfer T> = TODO()
 
     fun <K> bar(p: Inv<K>) {}
@@ -23,4 +23,4 @@ private object NestedTypeVariable {
     fun test() {
         bar(foo<String>())
     }
-}
+}

compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/propagationOfNoInferAnnotation.txt

@@ -4,7 +4,7 @@ private object NestedTypeVariable {
     private constructor NestedTypeVariable()
     public final fun </*0*/ K> bar(/*0*/ p: NestedTypeVariable.Inv<K>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public final fun </*0*/ T> foo(): NestedTypeVariable.Inv<T>
+    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "HIDDEN"}) public final fun </*0*/ T> foo(): NestedTypeVariable.Inv<T>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public final fun test(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -21,7 +21,7 @@ private object TopLevelTypeVariable {
     private constructor TopLevelTypeVariable()
     public final fun </*0*/ K> bar(/*0*/ k: K): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public final fun </*0*/ T> foo(): T
+    @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "HIDDEN"}) public final fun </*0*/ T> foo(): T
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public final fun test(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/1.fir.kt

@@ -2,6 +2,6 @@
 @Target(AnnotationTarget.TYPE)
 annotation class Ann(val x: Int)
 
-fun case_1(x: String): @Ann(unresolved_reference) String {
+fun case_1(x: String): @Ann(<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>unresolved_reference<!>) String {
     return x
 }

compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/2.fir.kt

@@ -5,4 +5,4 @@
 @Target(AnnotationTarget.TYPE)
 annotation class Ann(val x: Int)
 
-abstract class Foo : @Ann(unresolved_reference) Any()
+abstract class Foo : @Ann(<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>unresolved_reference<!>) Any()

compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/3.fir.kt

@@ -8,7 +8,7 @@ annotation class Ann(val x: Int)
 fun foo(i: Inv<@Ann(unresolved_reference) String>) {}
 
 // TESTCASE NUMBER: 2
-fun test(vararg a: @Ann(unresolved_reference) Any) {}
+fun test(vararg a: @Ann(<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>unresolved_reference<!>) Any) {}
 
 // TESTCASE NUMBER: 3
-class A<T>(a: @Ann(unresolved_reference) T)
+class A<T>(a: @Ann(<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>unresolved_reference<!>) T)

compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/5.fir.kt

@@ -3,7 +3,7 @@
 annotation class Ann(val x: Int)
 
 // TESTCASE NUMBER: 1
-abstract class Bar<T : @Ann(unresolved_reference) Any>
+abstract class Bar<T : @Ann(<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>unresolved_reference<!>) Any>
 
 /*
  * TESTCASE NUMBER: 2

compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/6.fir.kt

@@ -10,7 +10,7 @@ annotation class Ann(val x: Int)
  * UNEXPECTED BEHAVIOUR
  */
 fun case_1(a: Any) {
-    if (a is @Ann(unresolved_reference) String) return
+    if (a is @Ann(<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>unresolved_reference<!>) String) return
 }
 
 /*
@@ -18,7 +18,7 @@ fun case_1(a: Any) {
  * UNEXPECTED BEHAVIOUR
  */
 fun case_2(a: Any) {
-    a as @Ann(unresolved_reference) String // OK, no error in IDE and in the compiler
+    a as @Ann(<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>unresolved_reference<!>) String // OK, no error in IDE and in the compiler
 }
 
 /*
@@ -28,10 +28,10 @@ fun case_2(a: Any) {
 fun case_3_1(a: Any) {}
 
 fun case_3_2(a: Any) {
-    case_3_1(a as @Ann(unresolved_reference) String) // OK, no error in IDE and in the compiler
+    case_3_1(a as @Ann(<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>unresolved_reference<!>) String) // OK, no error in IDE and in the compiler
 }
 
 // TESTCASE NUMBER: 4
 fun case_4(a: Any) {
-    val x = a as @Ann(unresolved_reference) String // ERROR, has error in IDE and in the compiler
+    val x = a as @Ann(<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>unresolved_reference<!>) String // ERROR, has error in IDE and in the compiler
 }

compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.fir.kt

@@ -18,4 +18,4 @@ val case_1 = object : TypeToken<@Ann(unresolved_reference) String>() {}
  */
 interface A
 
-val case_2 = object: @Ann(unresolved_reference) A {}
+val case_2 = object: @Ann(<!TOO_MANY_ARGUMENTS, TOO_MANY_ARGUMENTS, TOO_MANY_ARGUMENTS, TOO_MANY_ARGUMENTS, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>unresolved_reference<!>) A {}

compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/9.fir.kt

@@ -9,4 +9,4 @@ annotation class Ann
 
 var <T> T.test
     get() = 11
-    set(value: @Ann(unresolved_reference) Int) {}
+    set(value: @Ann(<!TOO_MANY_ARGUMENTS, TOO_MANY_ARGUMENTS, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>unresolved_reference<!>) Int) {}