diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiExpressionPsiTypeProviderTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiExpressionPsiTypeProviderTest.kt
index 2d977cddc23..eda73be2a15 100644
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiExpressionPsiTypeProviderTest.kt
+++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiExpressionPsiTypeProviderTest.kt
@@ -8,9 +8,11 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTyp
 import org.jetbrains.kotlin.analysis.api.analyze
 import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider.AnalysisApiPsiTypeProviderTestUtils.findLightDeclarationContext
 import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider.AnalysisApiPsiTypeProviderTestUtils.getContainingKtLightClass
+import org.jetbrains.kotlin.analysis.api.types.KtTypeMappingMode
 import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedTest
 import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
 import org.jetbrains.kotlin.analysis.utils.printer.parentOfType
+import org.jetbrains.kotlin.analysis.utils.printer.prettyPrint
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.psi.KtFile
@@ -35,11 +37,22 @@ abstract class AbstractAnalysisApiExpressionPsiTypeProviderTest : AbstractAnalys
         val actual = analyze(mainFile) {
             val returnType = declarationAtCaret.getKtType()
             if (returnType != null) {
-                val psiType = returnType.asPsiType(psiContext, allowErrorTypes = false)
-                buildString {
+                prettyPrint {
                     appendLine("KtType: ${returnType.render(position = Variance.INVARIANT)}")
-                    appendLine("PsiType: $psiType")
+                    for (allowErrorTypes in listOf(false, true)) {
+                        for (typeMappingMode in KtTypeMappingMode.entries) {
+                            for (isAnnotationMethod in listOf(false, true)) {
+                                val psiType = returnType.asPsiType(psiContext, allowErrorTypes, typeMappingMode, isAnnotationMethod)
+                                appendLine("asPsiType(allowErrorTypes=$allowErrorTypes, mode=$typeMappingMode, isAnnotationMethod=$isAnnotationMethod):")
+                                withIndent {
+                                    appendLine(psiType.toString())
+                                }
+                                appendLine()
+                            }
+                        }
+                    }
                 }
+
             } else {
                 "null"
             }
diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/capturedBoundType.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/capturedBoundType.txt
index 9f66a0bf5b6..94d77895aea 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/capturedBoundType.txt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/capturedBoundType.txt
@@ -1,2 +1,97 @@
 KtType: T
-PsiType: null
+asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_call.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_call.txt
index 5615d699ced..a19dca2219c 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_call.txt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_call.txt
@@ -1,2 +1,97 @@
 KtType: getInner
-PsiType: null
+asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false):
+  PsiType:NonExistentClass
+
+asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true):
+  PsiType:NonExistentClass
+
diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_constructor.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_constructor.txt
index 1fbc0959d83..ac2043cf4b2 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_constructor.txt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_constructor.txt
@@ -1,2 +1,97 @@
 KtType: Outer.`<no name provided>`.Inner
-PsiType: null
+asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true):
+  null
+
+asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false):
+  null
+
+asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true):
+  null
+
diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/localClassWithUnresolvedSuperType.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/localClassWithUnresolvedSuperType.txt
index f3f602f6f15..6eb07be3b4b 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/localClassWithUnresolvedSuperType.txt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/localClassWithUnresolvedSuperType.txt
@@ -1,2 +1,97 @@
 KtType: Foo.Bar
-PsiType: PsiType:Bar
+asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false):
+  PsiType:Bar
+
+asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true):
+  PsiType:Bar
+
diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/recursiveTypeParameter_localSimple.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/recursiveTypeParameter_localSimple.txt
index 8885140f23e..88b187eacaa 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/recursiveTypeParameter_localSimple.txt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/recursiveTypeParameter_localSimple.txt
@@ -1,2 +1,97 @@
 KtType: kotlin.collections.List<Test>
-PsiType: PsiType:List<? extends Comparable<? super Test>>
+asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false):
+  PsiType:List<Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true):
+  PsiType:List<Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
+  PsiType:List<Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
+  PsiType:List<Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false):
+  PsiType:List<Comparable<Test>>
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false):
+  PsiType:List<Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true):
+  PsiType:List<Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
+  PsiType:List<Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
+  PsiType:List<Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false):
+  PsiType:List<Comparable<Test>>
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Test>>
+
+asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Test>>
+
diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/recursiveTypeParameter_localWithTypeParameter.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/recursiveTypeParameter_localWithTypeParameter.txt
index af20d97efef..63b26b2d2e1 100644
--- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/recursiveTypeParameter_localWithTypeParameter.txt
+++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/recursiveTypeParameter_localWithTypeParameter.txt
@@ -1,2 +1,97 @@
 KtType: kotlin.collections.List<Wrapper>
-PsiType: PsiType:List<? extends Comparable<? super Wrapper<T>>>
+asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false):
+  PsiType:List<Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true):
+  PsiType:List<Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
+  PsiType:List<Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
+  PsiType:List<Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false):
+  PsiType:List<Comparable<Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false):
+  PsiType:List<Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true):
+  PsiType:List<Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
+  PsiType:List<Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
+  PsiType:List<Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false):
+  PsiType:List<Comparable<Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+
+asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true):
+  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+