[Analysis API] render PsiType in tests properly

It should contain fully qualified names and annotations

^KT-66603

analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiExpressionPsiTypeProviderTest.kt

@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.psi.KtValueArgument
 import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.services.TestServices
 import org.jetbrains.kotlin.test.services.assertions
-import org.jetbrains.kotlin.types.Variance
 
 abstract class AbstractAnalysisApiExpressionPsiTypeProviderTest : AbstractAnalysisApiBasedTest() {
     override fun doTestByMainFile(mainFile: KtFile, mainModule: TestModule, testServices: TestServices) {
@@ -29,34 +28,37 @@ abstract class AbstractAnalysisApiExpressionPsiTypeProviderTest : AbstractAnalys
             is KtValueArgument -> element.getArgumentExpression()!!
             else -> error("Unexpected element: $element of ${element::class}")
         }
+
         val containingDeclaration = declarationAtCaret.parentOfType<KtDeclaration>()
             ?: error("Can't find containing declaration for $declarationAtCaret")
+
         val containingClass = getContainingKtLightClass(containingDeclaration, mainFile)
         val psiContext = containingClass.findLightDeclarationContext(containingDeclaration)
             ?: error("Can't find psi context for $containingDeclaration")
+
         val actual = analyze(mainFile) {
             val returnType = declarationAtCaret.getKtType()
             if (returnType != null) {
                 prettyPrint {
-                    appendLine("KtType: ${returnType.render(position = Variance.INVARIANT)}")
+                    appendLine("KtType: ${AnalysisApiPsiTypeProviderTestUtils.render(returnType)}")
                     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("PsiType: ${AnalysisApiPsiTypeProviderTestUtils.render(psiType)}")
                                 }
                                 appendLine()
                             }
                         }
                     }
                 }
-
             } else {
                 "null"
             }
         }
+
         testServices.assertions.assertEqualsToTestDataFileSibling(actual)
     }
 }

analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiKtTypeByPsiTypeProviderTest.kt

@@ -26,11 +26,11 @@ abstract class AbstractAnalysisApiKtTypeByPsiTypeProviderTest : AbstractAnalysis
         val actual = buildString {
             executeOnPooledThreadInReadAction {
                 analyseForTest(mainFile) {
-                    val returnType = psiMethod.returnType
+                    val psiType = psiMethod.returnType
-                    testServices.assertions.assertNotNull(returnType)
+                    testServices.assertions.assertNotNull(psiType)
-                    val asKtTypeSuper = returnType!!.asKtType(useSitePosition ?: psiMethod)!!
+                    val ktType = psiType!!.asKtType(useSitePosition ?: psiMethod)!!
-                    appendLine("PsiType: $returnType")
+                    appendLine("PsiType: ${AnalysisApiPsiTypeProviderTestUtils.render(psiType)}")
-                    appendLine("KtType: ${asKtTypeSuper.render(position = Variance.OUT_VARIANCE)}")
+                    appendLine("KtType: ${AnalysisApiPsiTypeProviderTestUtils.render(ktType, Variance.OUT_VARIANCE)}")
                 }
             }
         }

analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderTest.kt

@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.psi.KtPsiUtil
 import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.services.TestServices
 import org.jetbrains.kotlin.test.services.assertions
-import org.jetbrains.kotlin.types.Variance
 
 abstract class AbstractAnalysisApiPsiTypeProviderTest : AbstractAnalysisApiBasedTest() {
     override fun doTestByMainFile(mainFile: KtFile, mainModule: TestModule, testServices: TestServices) {
@@ -33,8 +32,9 @@ abstract class AbstractAnalysisApiPsiTypeProviderTest : AbstractAnalysisApiBased
             executeOnPooledThreadInReadAction {
                 analyze(declaration) {
                     val ktType = declaration.getReturnKtType()
-                    appendLine("KtType: ${ktType.render(position = Variance.INVARIANT)}")
+                    appendLine("KtType: ${AnalysisApiPsiTypeProviderTestUtils.render(ktType)}")
-                    appendLine("PsiType: ${ktType.asPsiType(psiContext, allowErrorTypes = false)}")
+                    val psiType = ktType.asPsiType(psiContext, allowErrorTypes = false)
+                    appendLine("PsiType: ${AnalysisApiPsiTypeProviderTestUtils.render(psiType)}")
                 }
             }
         }

analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AnalysisApiPsiTypeProviderTestUtils.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -9,6 +9,9 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiElementVisitor
+import com.intellij.psi.PsiType
+import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
+import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.elements.KtLightElement
@@ -16,9 +19,15 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.psiUtil.parents
+import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 
 object AnalysisApiPsiTypeProviderTestUtils {
+    context(KtAnalysisSession)
+    fun render(type: KtType?, variance: Variance = Variance.INVARIANT): String? = type?.render(position = variance)
+
+    fun render(type: PsiType?): String? = type?.getCanonicalText(/* annotated = */ true)
+
     internal fun getContainingKtLightClass(
         declaration: KtDeclaration,
         ktFile: KtFile,

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/anonym.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:T
+PsiType: T
 KtType: T?

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/extends.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:List<? extends String>
+PsiType: java.util.List<? extends java.lang.String>
 KtType: kotlin.collections.List<kotlin.String?>?

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithKotlinUseSite.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:TYPE
+PsiType: TYPE
 KtType: TYPE

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithMethodUseSite.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:TYPE
+PsiType: TYPE
 KtType: TYPE?

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithTypeParameterUseSite.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:TYPE
+PsiType: TYPE
 KtType: TYPE?

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameters.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:K
+PsiType: K
 KtType: K?

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nestedGenerics.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:List<String>
+PsiType: java.util.List<java.lang.String>
 KtType: kotlin.collections.List<kotlin.String?>?

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nullableString.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:String
+PsiType: java.lang.String
 KtType: kotlin.String?

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/primitive.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:int
+PsiType: int
 KtType: kotlin.Int

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeAnnotation.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:KotlinClass
+PsiType: @MyAnno KotlinClass
 KtType: @MyAnno KotlinClass?

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeAnnotationOnString.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:String
+PsiType: java.lang.@MyAnno String
 KtType: @MyAnno kotlin.String?

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameterWithKotlinUseSite.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:T
+PsiType: T
 KtType: T

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameterWithMethodUseSite.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:T
+PsiType: T
 KtType: T?

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:T
+PsiType: T
 KtType: T?

analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters2.txt

@@ -1,2 +1,2 @@
-PsiType: PsiType:K
+PsiType: K
 KtType: K?

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.txt

@@ -1,2 +1,2 @@
 KtType: PointerKeyboardModifiers
-PsiType: PsiType:int
+PsiType: int

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.descriptors.txt

@@ -1,2 +1,2 @@
 KtType: kotlin.Int
-PsiType: PsiType:int
+PsiType: int

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.txt

@@ -1,2 +1,2 @@
 KtType: Foo
-PsiType: PsiType:int
+PsiType: int

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/anonymousObject_exposedAsReturnValue.txt

@@ -1,2 +1,2 @@
 KtType: java.lang.Runnable
-PsiType: PsiType:Runnable
+PsiType: java.lang.Runnable

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/duplicatedClass_functionParameter.txt

@@ -1,2 +1,2 @@
 KtType: kotlin.Int
-PsiType: PsiType:int
+PsiType: int

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsMemberInAnonymousObject.txt

@@ -1,2 +1,2 @@
 KtType: kotlin.collections.MutableList<TagData>
-PsiType: PsiType:List<TagData>
+PsiType: java.util.List<TagData>

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsReturnValue.txt

@@ -1,2 +1,2 @@
 KtType: java.lang.Runnable
-PsiType: PsiType:Runnable
+PsiType: java.lang.Runnable

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsReturnValue_privateFunction.txt

@@ -1,2 +1,2 @@
 KtType: kotlin.Unit
-PsiType: PsiType:Unit
+PsiType: kotlin.Unit

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localFunctionInSameScope.txt

@@ -1,2 +1,2 @@
 KtType: Local
-PsiType: PsiType:Local
+PsiType: Local

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localPropertyInSameScope.txt

@@ -1,2 +1,2 @@
 KtType: Local
-PsiType: PsiType:Local
+PsiType: Local

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localPropertyInSampeScope_functionalType.txt

@@ -1,2 +1,2 @@
 KtType: () -> Local
-PsiType: PsiType:Function0<? extends Local>
+PsiType: kotlin.jvm.functions.Function0<? extends Local>

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_memberFunction.txt

@@ -1,2 +1,2 @@
 KtType: Local
-PsiType: PsiType:Local
+PsiType: Local

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/suspendFunctionValueParameterNoStdlib.descriptors.txt

@@ -1,2 +1,2 @@
 KtType: suspend (kotlin.Int) -> kotlin.Unit
-PsiType: PsiType:Function2<? super Integer, ? super Continuation<? super Unit>, ? extends Object>
+PsiType: kotlin.jvm.functions.Function2<? super java.lang.Integer,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object>

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/suspendFunctionValueParameterWithStdlib.txt

@@ -1,2 +1,2 @@
 KtType: suspend (kotlin.Int) -> kotlin.Unit
-PsiType: PsiType:Function2<? super Integer, ? super Continuation<? super Unit>, ? extends Object>
+PsiType: kotlin.jvm.functions.Function2<? super java.lang.Integer,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object>

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_false.descriptors.txt

@@ -0,0 +1,2 @@
+KtType: @kotlin.jvm.JvmSuppressWildcards(suppress = false) (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?)?
+PsiType: kotlin.jvm.functions.Function1<? super .AnimatedContentTransitionScope<.NavBackStackEntry>,? extends .EnterTransition>

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_false.txt

@@ -1,2 +1,2 @@
 KtType: @kotlin.jvm.JvmSuppressWildcards(suppress = false) (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?)?
-PsiType: PsiType:Function1<? super AnimatedContentTransitionScope<NavBackStackEntry>, ? extends EnterTransition>
+PsiType: kotlin.jvm.functions.Function1<? super AnimatedContentTransitionScope<NavBackStackEntry>,? extends EnterTransition>

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_true.descriptors.txt

@@ -0,0 +1,2 @@
+KtType: @kotlin.jvm.JvmSuppressWildcards(suppress = true) (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?)?
+PsiType: kotlin.jvm.functions.Function1<.AnimatedContentTransitionScope<.NavBackStackEntry>,.EnterTransition>

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_true.txt

@@ -1,2 +1,2 @@
 KtType: @kotlin.jvm.JvmSuppressWildcards(suppress = true) (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?)?
-PsiType: PsiType:Function1<AnimatedContentTransitionScope<NavBackStackEntry>, EnterTransition>
+PsiType: kotlin.jvm.functions.Function1<AnimatedContentTransitionScope<NavBackStackEntry>,EnterTransition>

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/capturedBoundType.txt

@@ -1,97 +1,97 @@
 KtType: T
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_call.txt

@@ -1,97 +1,97 @@
 KtType: getInner
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  PsiType:NonExistentClass
+  PsiType: error.NonExistentClass
 

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_constructor.txt

@@ -1,97 +1,97 @@
 KtType: Outer.`<no name provided>`.Inner
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  null
+  PsiType: null
 

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/errorType.txt

@@ -1,97 +1,97 @@
 KtType: UNRESOLVED<kotlin.Nothing>
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  null
+  PsiType: null
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  PsiType:UNRESOLVED<Void>
+  PsiType: UNRESOLVED<java.lang.Void>
 

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/localClassWithUnresolvedSuperType.txt

@@ -1,97 +1,97 @@
 KtType: Foo.Bar
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  PsiType:Bar
+  PsiType: Bar
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  PsiType:Bar
+  PsiType: Bar
 

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/recursiveTypeParameter_localSimple.txt

@@ -1,97 +1,97 @@
 KtType: kotlin.collections.List<Test>
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false):
-  PsiType:List<Comparable<? super Test>>
+  PsiType: java.util.List<java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true):
-  PsiType:List<Comparable<? super Test>>
+  PsiType: java.util.List<java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  PsiType:List<Comparable<? super Test>>
+  PsiType: kotlin.collections.List<java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  PsiType:List<Comparable<? super Test>>
+  PsiType: kotlin.collections.List<java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false):
-  PsiType:List<Comparable<Test>>
+  PsiType: java.util.List<java.lang.Comparable<Test>>
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false):
-  PsiType:List<Comparable<? super Test>>
+  PsiType: java.util.List<java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true):
-  PsiType:List<Comparable<? super Test>>
+  PsiType: java.util.List<java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  PsiType:List<Comparable<? super Test>>
+  PsiType: kotlin.collections.List<java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  PsiType:List<Comparable<? super Test>>
+  PsiType: kotlin.collections.List<java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false):
-  PsiType:List<Comparable<Test>>
+  PsiType: java.util.List<java.lang.Comparable<Test>>
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Test>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Test>>
 

analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/recursiveTypeParameter_localWithTypeParameter.txt

@@ -1,97 +1,97 @@
 KtType: kotlin.collections.List<Wrapper>
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false):
-  PsiType:List<Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true):
-  PsiType:List<Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  PsiType:List<Comparable<? super Wrapper<T>>>
+  PsiType: kotlin.collections.List<java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  PsiType:List<Comparable<? super Wrapper<T>>>
+  PsiType: kotlin.collections.List<java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false):
-  PsiType:List<Comparable<Wrapper<T>>>
+  PsiType: java.util.List<java.lang.Comparable<Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false):
-  PsiType:List<Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true):
-  PsiType:List<Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false):
-  PsiType:List<Comparable<? super Wrapper<T>>>
+  PsiType: kotlin.collections.List<java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true):
-  PsiType:List<Comparable<? super Wrapper<T>>>
+  PsiType: kotlin.collections.List<java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false):
-  PsiType:List<Comparable<Wrapper<T>>>
+  PsiType: java.util.List<java.lang.Comparable<Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>
 
 asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true):
-  PsiType:List<? extends Comparable<? super Wrapper<T>>>
+  PsiType: java.util.List<? extends java.lang.Comparable<? super Wrapper<T>>>