From bad91915a6dbeea4c948a9611a21584c83d0f007 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 30 Nov 2021 13:15:13 +0100 Subject: [PATCH] Analysis API: adapt reference resolve tests to changes in renderer --- .../base/test/AbstractReferenceResolveTest.kt | 18 +++++++++++++++--- .../GenericFunctionParameter.txt | 2 +- .../GenericTypeInFunctionParameter.txt | 2 +- .../InVaragReferenceInFunctionBody.txt | 2 +- .../InVaragReferenceInNamedParameter.txt | 2 +- .../referenceResolve/ValueParameter.txt | 2 +- .../implicitExtensionInvoke.txt | 2 +- .../implicitFunctionInvoke.txt | 2 +- .../implicitFunctionalInterfaceInvoke.txt | 2 +- .../referenceResolve/parameterByName.txt | 2 +- .../thisWithLabelToFunction_caretAtThis.txt | 2 +- .../thisWithLabelToProperty_caretAtThis.txt | 2 +- .../TypeParameterInAnonymousObject.txt | 2 +- .../typeParameter/multipleBounds.txt | 2 +- .../reified_argumentInFunctionalType.txt | 2 +- .../reified_extensionReceiver.txt | 2 +- .../typeParameter/reified_returnType.txt | 2 +- .../typeParameter/reified_valueParameter.txt | 2 +- .../reified_valueParameter_vararg.txt | 2 +- 19 files changed, 33 insertions(+), 21 deletions(-) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt index b0c99dfb17c..7a3d59c916a 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProv import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtPossibleMemberSymbol import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithKind import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.name.FqName @@ -28,7 +29,8 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractReferenceResolveTest(configurator: FrontendApiTestConfiguratorService) : AbstractHLApiSingleModuleTest(configurator) { +abstract class AbstractReferenceResolveTest(configurator: FrontendApiTestConfiguratorService) : + AbstractHLApiSingleModuleTest(configurator) { override fun configureTest(builder: TestConfigurationBuilder) { super.configureTest(builder) with(builder) { @@ -48,7 +50,9 @@ abstract class AbstractReferenceResolveTest(configurator: FrontendApiTestConfigu } val resolvedTo = - analyseForTest(PsiTreeUtil.findElementOfClassAtOffset(mainKtFile, caretPosition, KtDeclaration::class.java, false) ?: mainKtFile) { + analyseForTest( + PsiTreeUtil.findElementOfClassAtOffset(mainKtFile, caretPosition, KtDeclaration::class.java, false) ?: mainKtFile + ) { val symbols = ktReferences.flatMap { it.resolveToSymbols() } checkReferenceResultForValidity(module, testServices, symbols) renderResolvedTo(symbols) @@ -91,7 +95,15 @@ abstract class AbstractReferenceResolveTest(configurator: FrontendApiTestConfigu symbolContainerFqName(symbol)?.let { fqName -> append("(in $fqName) ") } - append(symbol.render(renderingOptions)) + when (symbol) { + is KtDeclarationSymbol -> append(symbol.render(renderingOptions)) + is KtPackageSymbol -> append("package ${symbol.fqName}") + is KtReceiverParameterSymbol -> { + append("extension receiver with type ") + append(symbol.type.render(renderingOptions.typeRendererOptions)) + } + else -> error("Unexpected symbol ${symbol::class}") + } } } diff --git a/analysis/analysis-api/testData/referenceResolve/GenericFunctionParameter.txt b/analysis/analysis-api/testData/referenceResolve/GenericFunctionParameter.txt index 5a03b257010..694e8760ef3 100644 --- a/analysis/analysis-api/testData/referenceResolve/GenericFunctionParameter.txt +++ b/analysis/analysis-api/testData/referenceResolve/GenericFunctionParameter.txt @@ -1,2 +1,2 @@ Resolved to: -0: +0: T \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/GenericTypeInFunctionParameter.txt b/analysis/analysis-api/testData/referenceResolve/GenericTypeInFunctionParameter.txt index 2012cdd0de1..e437914a621 100644 --- a/analysis/analysis-api/testData/referenceResolve/GenericTypeInFunctionParameter.txt +++ b/analysis/analysis-api/testData/referenceResolve/GenericTypeInFunctionParameter.txt @@ -1,2 +1,2 @@ Resolved to: -0: +0: X \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/InVaragReferenceInFunctionBody.txt b/analysis/analysis-api/testData/referenceResolve/InVaragReferenceInFunctionBody.txt index 7fa85e8351b..f514ac7c49b 100644 --- a/analysis/analysis-api/testData/referenceResolve/InVaragReferenceInFunctionBody.txt +++ b/analysis/analysis-api/testData/referenceResolve/InVaragReferenceInFunctionBody.txt @@ -1,2 +1,2 @@ Resolved to: -0: value-parameter vararg a: test.A +0: vararg a: test.A \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/InVaragReferenceInNamedParameter.txt b/analysis/analysis-api/testData/referenceResolve/InVaragReferenceInNamedParameter.txt index 7fa85e8351b..f514ac7c49b 100644 --- a/analysis/analysis-api/testData/referenceResolve/InVaragReferenceInNamedParameter.txt +++ b/analysis/analysis-api/testData/referenceResolve/InVaragReferenceInNamedParameter.txt @@ -1,2 +1,2 @@ Resolved to: -0: value-parameter vararg a: test.A +0: vararg a: test.A \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/ValueParameter.txt b/analysis/analysis-api/testData/referenceResolve/ValueParameter.txt index 1e795a29ef0..78118d5e394 100644 --- a/analysis/analysis-api/testData/referenceResolve/ValueParameter.txt +++ b/analysis/analysis-api/testData/referenceResolve/ValueParameter.txt @@ -1,2 +1,2 @@ Resolved to: -0: value-parameter x: A \ No newline at end of file +0: x: A \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/implicitExtensionInvoke.txt b/analysis/analysis-api/testData/referenceResolve/implicitExtensionInvoke.txt index d0f5675993c..dd30b8723ff 100644 --- a/analysis/analysis-api/testData/referenceResolve/implicitExtensionInvoke.txt +++ b/analysis/analysis-api/testData/referenceResolve/implicitExtensionInvoke.txt @@ -1,2 +1,2 @@ Resolved to: -0: value-parameter a: kotlin.Int +0: a: kotlin.Int \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/implicitFunctionInvoke.txt b/analysis/analysis-api/testData/referenceResolve/implicitFunctionInvoke.txt index 85a29b4d96c..36cb4778cdd 100644 --- a/analysis/analysis-api/testData/referenceResolve/implicitFunctionInvoke.txt +++ b/analysis/analysis-api/testData/referenceResolve/implicitFunctionInvoke.txt @@ -1,2 +1,2 @@ Resolved to: -0: value-parameter a: () -> kotlin.Unit +0: a: () -> kotlin.Unit \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/implicitFunctionalInterfaceInvoke.txt b/analysis/analysis-api/testData/referenceResolve/implicitFunctionalInterfaceInvoke.txt index 0577081ccfb..f7ac0672139 100644 --- a/analysis/analysis-api/testData/referenceResolve/implicitFunctionalInterfaceInvoke.txt +++ b/analysis/analysis-api/testData/referenceResolve/implicitFunctionalInterfaceInvoke.txt @@ -1,2 +1,2 @@ Resolved to: -0: value-parameter a: A +0: a: A \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/parameterByName.txt b/analysis/analysis-api/testData/referenceResolve/parameterByName.txt index a601572f826..14944d7c58b 100644 --- a/analysis/analysis-api/testData/referenceResolve/parameterByName.txt +++ b/analysis/analysis-api/testData/referenceResolve/parameterByName.txt @@ -1,2 +1,2 @@ Resolved to: -0: value-parameter bb: kotlin.Int +0: bb: kotlin.Int \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/thisWithLabelToFunction_caretAtThis.txt b/analysis/analysis-api/testData/referenceResolve/thisWithLabelToFunction_caretAtThis.txt index f80669ddde1..e93e8255cc9 100644 --- a/analysis/analysis-api/testData/referenceResolve/thisWithLabelToFunction_caretAtThis.txt +++ b/analysis/analysis-api/testData/referenceResolve/thisWithLabelToFunction_caretAtThis.txt @@ -1,2 +1,2 @@ Resolved to: -0: extension receiver of fun kotlin.String.foo() \ No newline at end of file +0: extension receiver with type kotlin.String \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtThis.txt b/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtThis.txt index c1ba97c0c9c..e93e8255cc9 100644 --- a/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtThis.txt +++ b/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtThis.txt @@ -1,2 +1,2 @@ Resolved to: -0: extension receiver of val kotlin.String.foo: kotlin.Any +0: extension receiver with type kotlin.String \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/typeParameter/TypeParameterInAnonymousObject.txt b/analysis/analysis-api/testData/referenceResolve/typeParameter/TypeParameterInAnonymousObject.txt index 4f7953b0d6f..5e73ec8165d 100644 --- a/analysis/analysis-api/testData/referenceResolve/typeParameter/TypeParameterInAnonymousObject.txt +++ b/analysis/analysis-api/testData/referenceResolve/typeParameter/TypeParameterInAnonymousObject.txt @@ -1,2 +1,2 @@ Resolved to: -0: +0: K \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt b/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt index ebc4bde1518..7398b0f1970 100644 --- a/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt +++ b/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt @@ -1,2 +1,2 @@ Resolved to: -0: +0: T : kotlin.Int \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_argumentInFunctionalType.txt b/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_argumentInFunctionalType.txt index d1e9e0d3371..74771e143e7 100644 --- a/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_argumentInFunctionalType.txt +++ b/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_argumentInFunctionalType.txt @@ -1,2 +1,2 @@ Resolved to: -0: +0: reified T \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_extensionReceiver.txt b/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_extensionReceiver.txt index 8c2287a9501..4e69179e8e2 100644 --- a/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_extensionReceiver.txt +++ b/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_extensionReceiver.txt @@ -1,2 +1,2 @@ Resolved to: -0: +0: reified T : kotlin.Any \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_returnType.txt b/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_returnType.txt index d1e9e0d3371..74771e143e7 100644 --- a/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_returnType.txt +++ b/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_returnType.txt @@ -1,2 +1,2 @@ Resolved to: -0: +0: reified T \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_valueParameter.txt b/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_valueParameter.txt index d1e9e0d3371..74771e143e7 100644 --- a/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_valueParameter.txt +++ b/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_valueParameter.txt @@ -1,2 +1,2 @@ Resolved to: -0: +0: reified T \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_valueParameter_vararg.txt b/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_valueParameter_vararg.txt index d1e9e0d3371..74771e143e7 100644 --- a/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_valueParameter_vararg.txt +++ b/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_valueParameter_vararg.txt @@ -1,2 +1,2 @@ Resolved to: -0: +0: reified T \ No newline at end of file