K2: prefer base class sources for JVM mapped functions

This commit is a follow-up to 3cb9396b20
"K2: prefer derived class sources for callable copies (e.g. fake overrides)"

#KT-64044 Fixed
This commit is contained in:
Mikhail Glukhikh
2023-12-20 16:14:44 +01:00
committed by Space Team
parent c80854eb7c
commit f5453690a6
11 changed files with 64 additions and 7 deletions
@@ -78,8 +78,9 @@ abstract class AbstractReferenceResolveTest : AbstractAnalysisApiBasedTest() {
val resolvedTo = analyzeReferenceElement(ktReferences.first().element, mainModule) {
val symbols = ktReferences.flatMap { it.resolveToSymbols() }
checkReferenceResultForValidity(ktReferences, mainModule, testServices, symbols)
renderResolvedTo(symbols, renderingOptions) { getAdditionalSymbolInfo(it) }
}
val renderPsiClassName = Directives.RENDER_PSI_CLASS_NAME in mainModule.directives
renderResolvedTo(symbols, renderPsiClassName, renderingOptions) { getAdditionalSymbolInfo(it) }
}
if (Directives.UNRESOLVED_REFERENCE in mainModule.directives) {
return
@@ -119,6 +120,10 @@ abstract class AbstractReferenceResolveTest : AbstractAnalysisApiBasedTest() {
val UNRESOLVED_REFERENCE by directive(
"Reference should be unresolved",
)
val RENDER_PSI_CLASS_NAME by directive(
"Render also PSI class name for resolved reference"
)
}
private val renderingOptions = KtDeclarationRendererForDebug.WITH_QUALIFIED_NAMES.with {
@@ -17,16 +17,18 @@ import org.jetbrains.kotlin.types.Variance
object TestReferenceResolveResultRenderer {
fun KtAnalysisSession.renderResolvedTo(
symbols: List<KtSymbol>,
renderPsiClassName: Boolean = false,
renderer: KtDeclarationRenderer = KtDeclarationRendererForDebug.WITH_QUALIFIED_NAMES,
additionalInfo: KtAnalysisSession.(KtSymbol) -> String? = { null }
) =
symbols.map { renderResolveResult(it, renderer, additionalInfo) }
symbols.map { renderResolveResult(it, renderPsiClassName, renderer, additionalInfo) }
.sorted()
.withIndex()
.joinToString(separator = "\n") { "${it.index}: ${it.value}" }
private fun KtAnalysisSession.renderResolveResult(
symbol: KtSymbol,
renderPsiClassName: Boolean,
renderer: KtDeclarationRenderer,
additionalInfo: KtAnalysisSession.(KtSymbol) -> String?
): String {
@@ -35,7 +37,12 @@ object TestReferenceResolveResultRenderer {
append("(in $fqName) ")
}
when (symbol) {
is KtDeclarationSymbol -> append(symbol.render(renderer))
is KtDeclarationSymbol -> {
append(symbol.render(renderer))
if (renderPsiClassName) {
append(" (psi: ${symbol.psi?.let { it::class.simpleName }})")
}
}
is KtPackageSymbol -> append("package ${symbol.fqName}")
is KtReceiverParameterSymbol -> {
append("extension receiver with type ")