From 3a14fba524ebc1d80e70fcc0c79b76a143d7cc8f Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 1 Feb 2023 20:02:06 +0100 Subject: [PATCH] [AA] DebugSymbolRenderer: update naming ^KT-56046 --- .../api/symbols/DebugSymbolRenderer.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt index 930918b7e64..081ba5f79db 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt @@ -88,7 +88,7 @@ public class DebugSymbolRenderer( public fun KtAnalysisSession.renderForSubstitutionOverrideUnwrappingTest(symbol: KtSymbol): String = prettyPrint { if (symbol !is KtCallableSymbol) return@prettyPrint - renderSymbolHeader(symbol) + renderFrontendIndependentKClassNameOf(symbol) withIndent { appendLine() @@ -126,8 +126,8 @@ public class DebugSymbolRenderer( context(KtAnalysisSession) private fun PrettyPrinter.renderSymbolInternals(symbol: KtSymbol) { - renderSymbolHeader(symbol) - val apiClass = getSymbolApiClass(symbol) + renderFrontendIndependentKClassNameOf(symbol) + val apiClass = getFrontendIndependentKClassOf(symbol) withIndent { val members = apiClass.members .filterIsInstance>() @@ -145,8 +145,8 @@ public class DebugSymbolRenderer( } context(KtAnalysisSession) - private fun PrettyPrinter.renderSymbolHeader(symbol: Any) { - val apiClass = getSymbolApiClass(symbol) + private fun PrettyPrinter.renderFrontendIndependentKClassNameOf(instanceOfClassToRender: Any) { + val apiClass = getFrontendIndependentKClassOf(instanceOfClassToRender) append(apiClass.simpleName).append(':') } @@ -178,7 +178,7 @@ public class DebugSymbolRenderer( return } - append(getSymbolApiClass(symbol).simpleName) + append(getFrontendIndependentKClassOf(symbol).simpleName) append("(") when (symbol) { is KtClassLikeSymbol -> renderId(symbol.classIdIfNonLocal, symbol) @@ -208,7 +208,7 @@ public class DebugSymbolRenderer( return } - renderSymbolHeader(typeToRender) + renderFrontendIndependentKClassNameOf(typeToRender) withIndent { appendLine() append("annotationsList: ") @@ -392,8 +392,8 @@ public class DebugSymbolRenderer( renderList(value.annotations, renderSymbolsFully = false) } - private fun getSymbolApiClass(symbol: Any): KClass<*> { - var current: Class<*> = symbol.javaClass + private fun getFrontendIndependentKClassOf(instanceOfClass: Any): KClass<*> { + var current: Class<*> = instanceOfClass.javaClass while (true) { val className = current.name