Analysis API: adapt reference resolve tests to changes in renderer

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}")
+            }
         }
     }
 

analysis/analysis-api/testData/referenceResolve/GenericFunctionParameter.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: <T>
+0: T

analysis/analysis-api/testData/referenceResolve/GenericTypeInFunctionParameter.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: <X>
+0: X

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

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

analysis/analysis-api/testData/referenceResolve/ValueParameter.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: value-parameter x: A
+0: x: A

analysis/analysis-api/testData/referenceResolve/implicitExtensionInvoke.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: value-parameter a: kotlin.Int
+0: a: kotlin.Int

analysis/analysis-api/testData/referenceResolve/implicitFunctionInvoke.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: value-parameter a: () -> kotlin.Unit
+0: a: () -> kotlin.Unit

analysis/analysis-api/testData/referenceResolve/implicitFunctionalInterfaceInvoke.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: value-parameter a: A
+0: a: A

analysis/analysis-api/testData/referenceResolve/parameterByName.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: value-parameter bb: kotlin.Int
+0: bb: kotlin.Int

analysis/analysis-api/testData/referenceResolve/thisWithLabelToFunction_caretAtThis.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: extension receiver of fun kotlin.String.foo()
+0: extension receiver with type kotlin.String

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

analysis/analysis-api/testData/referenceResolve/typeParameter/TypeParameterInAnonymousObject.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: <K>
+0: K

analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: <T : kotlin.Int & kotlin.Long>
+0: T : kotlin.Int

analysis/analysis-api/testData/referenceResolve/typeParameter/reified_argumentInFunctionalType.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: <reified T>
+0: reified T

analysis/analysis-api/testData/referenceResolve/typeParameter/reified_extensionReceiver.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: <reified T : kotlin.Any>
+0: reified T : kotlin.Any

analysis/analysis-api/testData/referenceResolve/typeParameter/reified_returnType.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: <reified T>
+0: reified T

analysis/analysis-api/testData/referenceResolve/typeParameter/reified_valueParameter.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: <reified T>
+0: reified T

analysis/analysis-api/testData/referenceResolve/typeParameter/reified_valueParameter_vararg.txt

@@ -1,2 +1,2 @@
 Resolved to:
-0: <reified T>
+0: reified T