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 eda73be2a15..b1c7545d070 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 @@ -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() ?: 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) } } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiKtTypeByPsiTypeProviderTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiKtTypeByPsiTypeProviderTest.kt index f86271221fe..c86949eb029 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiKtTypeByPsiTypeProviderTest.kt +++ b/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 - testServices.assertions.assertNotNull(returnType) - val asKtTypeSuper = returnType!!.asKtType(useSitePosition ?: psiMethod)!! - appendLine("PsiType: $returnType") - appendLine("KtType: ${asKtTypeSuper.render(position = Variance.OUT_VARIANCE)}") + val psiType = psiMethod.returnType + testServices.assertions.assertNotNull(psiType) + val ktType = psiType!!.asKtType(useSitePosition ?: psiMethod)!! + appendLine("PsiType: ${AnalysisApiPsiTypeProviderTestUtils.render(psiType)}") + appendLine("KtType: ${AnalysisApiPsiTypeProviderTestUtils.render(ktType, Variance.OUT_VARIANCE)}") } } } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderTest.kt index ff3743bf491..37c1bcb67be 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderTest.kt +++ b/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("PsiType: ${ktType.asPsiType(psiContext, allowErrorTypes = false)}") + appendLine("KtType: ${AnalysisApiPsiTypeProviderTestUtils.render(ktType)}") + val psiType = ktType.asPsiType(psiContext, allowErrorTypes = false) + appendLine("PsiType: ${AnalysisApiPsiTypeProviderTestUtils.render(psiType)}") } } } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AnalysisApiPsiTypeProviderTestUtils.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AnalysisApiPsiTypeProviderTestUtils.kt index bef73e8152b..9f96ae20712 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AnalysisApiPsiTypeProviderTestUtils.kt +++ b/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, diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/anonym.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/anonym.txt index 3aef682c854..a95441cf789 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/anonym.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/anonym.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:T +PsiType: T KtType: T? diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/extends.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/extends.txt index 83c872dcba5..20bedcc2fd6 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/extends.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/extends.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:List +PsiType: java.util.List KtType: kotlin.collections.List? diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithKotlinUseSite.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithKotlinUseSite.txt index 13ef5fe42c5..f90edd41fe3 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithKotlinUseSite.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithKotlinUseSite.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:TYPE +PsiType: TYPE KtType: TYPE diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithMethodUseSite.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithMethodUseSite.txt index d0d2edf5c71..e2bf618d4fb 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithMethodUseSite.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithMethodUseSite.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:TYPE +PsiType: TYPE KtType: TYPE? diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithTypeParameterUseSite.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithTypeParameterUseSite.txt index d0d2edf5c71..e2bf618d4fb 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithTypeParameterUseSite.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameterWithTypeParameterUseSite.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:TYPE +PsiType: TYPE KtType: TYPE? diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameters.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameters.txt index cbb5b24b87b..9bc86fda347 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameters.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/methodTypeParameters.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:K +PsiType: K KtType: K? diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nestedGenerics.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nestedGenerics.txt index b7d7a6f78c0..01d82f35acc 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nestedGenerics.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nestedGenerics.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:List +PsiType: java.util.List KtType: kotlin.collections.List? diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nullableString.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nullableString.txt index f011d4bdd1d..cb649d8bc3c 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nullableString.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/nullableString.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:String +PsiType: java.lang.String KtType: kotlin.String? diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/primitive.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/primitive.txt index 07c41f381dc..c7094860ab1 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/primitive.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/primitive.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:int +PsiType: int KtType: kotlin.Int diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeAnnotation.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeAnnotation.txt index ebc56f0b97f..c49967ece10 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeAnnotation.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeAnnotation.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:KotlinClass +PsiType: @MyAnno KotlinClass KtType: @MyAnno KotlinClass? diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeAnnotationOnString.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeAnnotationOnString.txt index 596e8afb713..164879bd0fa 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeAnnotationOnString.txt +++ b/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? diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameterWithKotlinUseSite.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameterWithKotlinUseSite.txt index 95876755fa0..ec861ad526b 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameterWithKotlinUseSite.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameterWithKotlinUseSite.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:T +PsiType: T KtType: T diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameterWithMethodUseSite.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameterWithMethodUseSite.txt index 3aef682c854..a95441cf789 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameterWithMethodUseSite.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameterWithMethodUseSite.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:T +PsiType: T KtType: T? diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters.txt index 3aef682c854..a95441cf789 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:T +PsiType: T KtType: T? diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters2.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters2.txt index cbb5b24b87b..9bc86fda347 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters2.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/asKtType/typeParameters2.txt @@ -1,2 +1,2 @@ -PsiType: PsiType:K +PsiType: K KtType: K? diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.txt index 18cfd0dd787..4fb8a656113 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.txt @@ -1,2 +1,2 @@ KtType: PointerKeyboardModifiers -PsiType: PsiType:int +PsiType: int diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.descriptors.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.descriptors.txt index d2d0b0655d1..db43379ed99 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.descriptors.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.descriptors.txt @@ -1,2 +1,2 @@ KtType: kotlin.Int -PsiType: PsiType:int +PsiType: int diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.txt index 5c50edd022c..b1b89f50f46 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.txt @@ -1,2 +1,2 @@ KtType: Foo -PsiType: PsiType:int +PsiType: int diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/anonymousObject_exposedAsReturnValue.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/anonymousObject_exposedAsReturnValue.txt index 0c81ab3bca7..824b5525685 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/anonymousObject_exposedAsReturnValue.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/duplicatedClass_functionParameter.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/duplicatedClass_functionParameter.txt index d2d0b0655d1..db43379ed99 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/duplicatedClass_functionParameter.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/duplicatedClass_functionParameter.txt @@ -1,2 +1,2 @@ KtType: kotlin.Int -PsiType: PsiType:int +PsiType: int diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsMemberInAnonymousObject.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsMemberInAnonymousObject.txt index 5acefee632d..798b93acbbd 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsMemberInAnonymousObject.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsMemberInAnonymousObject.txt @@ -1,2 +1,2 @@ KtType: kotlin.collections.MutableList -PsiType: PsiType:List +PsiType: java.util.List diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsReturnValue.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsReturnValue.txt index 0c81ab3bca7..824b5525685 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsReturnValue.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsReturnValue_privateFunction.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsReturnValue_privateFunction.txt index f52a9f37b60..9a8cababc65 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsReturnValue_privateFunction.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localFunctionInSameScope.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localFunctionInSameScope.txt index 4ecb78baceb..d856443f7cd 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localFunctionInSameScope.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localFunctionInSameScope.txt @@ -1,2 +1,2 @@ KtType: Local -PsiType: PsiType:Local +PsiType: Local diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localPropertyInSameScope.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localPropertyInSameScope.txt index 4ecb78baceb..d856443f7cd 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localPropertyInSameScope.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localPropertyInSameScope.txt @@ -1,2 +1,2 @@ KtType: Local -PsiType: PsiType:Local +PsiType: Local diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localPropertyInSampeScope_functionalType.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localPropertyInSampeScope_functionalType.txt index 352c2825381..2bbb3623352 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localPropertyInSampeScope_functionalType.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localPropertyInSampeScope_functionalType.txt @@ -1,2 +1,2 @@ KtType: () -> Local -PsiType: PsiType:Function0 +PsiType: kotlin.jvm.functions.Function0 diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_memberFunction.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_memberFunction.txt index 4ecb78baceb..d856443f7cd 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_memberFunction.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_memberFunction.txt @@ -1,2 +1,2 @@ KtType: Local -PsiType: PsiType:Local +PsiType: Local diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/suspendFunctionValueParameterNoStdlib.descriptors.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/suspendFunctionValueParameterNoStdlib.descriptors.txt index 20efb1bcb0a..7db744a4a7e 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/suspendFunctionValueParameterNoStdlib.descriptors.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/suspendFunctionValueParameterNoStdlib.descriptors.txt @@ -1,2 +1,2 @@ KtType: suspend (kotlin.Int) -> kotlin.Unit -PsiType: PsiType:Function2, ? extends Object> +PsiType: kotlin.jvm.functions.Function2,? extends java.lang.Object> diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/suspendFunctionValueParameterWithStdlib.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/suspendFunctionValueParameterWithStdlib.txt index 20efb1bcb0a..7db744a4a7e 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/suspendFunctionValueParameterWithStdlib.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/suspendFunctionValueParameterWithStdlib.txt @@ -1,2 +1,2 @@ KtType: suspend (kotlin.Int) -> kotlin.Unit -PsiType: PsiType:Function2, ? extends Object> +PsiType: kotlin.jvm.functions.Function2,? extends java.lang.Object> diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_false.descriptors.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_false.descriptors.txt new file mode 100644 index 00000000000..4e7287b1f6a --- /dev/null +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_false.descriptors.txt @@ -0,0 +1,2 @@ +KtType: @kotlin.jvm.JvmSuppressWildcards(suppress = false) (AnimatedContentTransitionScope.() -> EnterTransition?)? +PsiType: kotlin.jvm.functions.Function1,? extends .EnterTransition> diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_false.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_false.txt index b3191429e4e..7b25f40fa6e 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_false.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_false.txt @@ -1,2 +1,2 @@ KtType: @kotlin.jvm.JvmSuppressWildcards(suppress = false) (AnimatedContentTransitionScope.() -> EnterTransition?)? -PsiType: PsiType:Function1, ? extends EnterTransition> +PsiType: kotlin.jvm.functions.Function1,? extends EnterTransition> diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_true.descriptors.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_true.descriptors.txt new file mode 100644 index 00000000000..19fbf3a782e --- /dev/null +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_true.descriptors.txt @@ -0,0 +1,2 @@ +KtType: @kotlin.jvm.JvmSuppressWildcards(suppress = true) (AnimatedContentTransitionScope.() -> EnterTransition?)? +PsiType: kotlin.jvm.functions.Function1<.AnimatedContentTransitionScope<.NavBackStackEntry>,.EnterTransition> diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_true.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_true.txt index 5cceaeb84e1..6a3c729a86f 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_true.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/wildcardSuppression_true.txt @@ -1,2 +1,2 @@ KtType: @kotlin.jvm.JvmSuppressWildcards(suppress = true) (AnimatedContentTransitionScope.() -> EnterTransition?)? -PsiType: PsiType:Function1, EnterTransition> +PsiType: kotlin.jvm.functions.Function1,EnterTransition> 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 94d77895aea..7b129cb7b63 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/capturedBoundType.txt +++ b/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 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 a19dca2219c..299d381267f 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,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 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 ac2043cf4b2..0a3addbf57c 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,97 +1,97 @@ KtType: Outer.``.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 diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/errorType.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/errorType.txt index 85ee27b49f3..9286520801a 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/errorType.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/errorType.txt @@ -1,97 +1,97 @@ KtType: UNRESOLVED 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 + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false): - PsiType:UNRESOLVED + PsiType: UNRESOLVED asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true): - PsiType:UNRESOLVED + PsiType: UNRESOLVED 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 6eb07be3b4b..52ab6e96767 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/localClassWithUnresolvedSuperType.txt +++ b/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 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 88b187eacaa..160db8e6271 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,97 +1,97 @@ KtType: kotlin.collections.List asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false): - PsiType:List> + PsiType: kotlin.collections.List> asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true): - PsiType:List> + PsiType: kotlin.collections.List> asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false): - PsiType:List> + PsiType: kotlin.collections.List> asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true): - PsiType:List> + PsiType: kotlin.collections.List> asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false): - PsiType:List> + PsiType: java.util.List> asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true): - PsiType:List> + PsiType: java.util.List> 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 63b26b2d2e1..d913a04c944 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,97 +1,97 @@ KtType: kotlin.collections.List asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=false, mode=DEFAULT, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=false, mode=DEFAULT_UAST, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=false, mode=GENERIC_ARGUMENT, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=false, mode=SUPER_TYPE, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false): - PsiType:List>> + PsiType: kotlin.collections.List>> asPsiType(allowErrorTypes=false, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true): - PsiType:List>> + PsiType: kotlin.collections.List>> asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=false, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=false, mode=RETURN_TYPE, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=false, mode=VALUE_PARAMETER, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=DEFAULT, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=DEFAULT_UAST, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=GENERIC_ARGUMENT, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=SUPER_TYPE, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=false): - PsiType:List>> + PsiType: kotlin.collections.List>> asPsiType(allowErrorTypes=true, mode=SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS, isAnnotationMethod=true): - PsiType:List>> + PsiType: kotlin.collections.List>> asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=RETURN_TYPE_BOXED, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=RETURN_TYPE, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=false): - PsiType:List>> + PsiType: java.util.List>> asPsiType(allowErrorTypes=true, mode=VALUE_PARAMETER, isAnnotationMethod=true): - PsiType:List>> + PsiType: java.util.List>>