[AA] DebugSymbolRenderer: update naming

^KT-56046
This commit is contained in:
Dmitrii Gridin
2023-02-01 20:02:06 +01:00
committed by Space Team
parent 17681bd803
commit 3a14fba524
@@ -88,7 +88,7 @@ public class DebugSymbolRenderer(
public fun KtAnalysisSession.renderForSubstitutionOverrideUnwrappingTest(symbol: KtSymbol): String = prettyPrint { public fun KtAnalysisSession.renderForSubstitutionOverrideUnwrappingTest(symbol: KtSymbol): String = prettyPrint {
if (symbol !is KtCallableSymbol) return@prettyPrint if (symbol !is KtCallableSymbol) return@prettyPrint
renderSymbolHeader(symbol) renderFrontendIndependentKClassNameOf(symbol)
withIndent { withIndent {
appendLine() appendLine()
@@ -126,8 +126,8 @@ public class DebugSymbolRenderer(
context(KtAnalysisSession) context(KtAnalysisSession)
private fun PrettyPrinter.renderSymbolInternals(symbol: KtSymbol) { private fun PrettyPrinter.renderSymbolInternals(symbol: KtSymbol) {
renderSymbolHeader(symbol) renderFrontendIndependentKClassNameOf(symbol)
val apiClass = getSymbolApiClass(symbol) val apiClass = getFrontendIndependentKClassOf(symbol)
withIndent { withIndent {
val members = apiClass.members val members = apiClass.members
.filterIsInstance<KProperty<*>>() .filterIsInstance<KProperty<*>>()
@@ -145,8 +145,8 @@ public class DebugSymbolRenderer(
} }
context(KtAnalysisSession) context(KtAnalysisSession)
private fun PrettyPrinter.renderSymbolHeader(symbol: Any) { private fun PrettyPrinter.renderFrontendIndependentKClassNameOf(instanceOfClassToRender: Any) {
val apiClass = getSymbolApiClass(symbol) val apiClass = getFrontendIndependentKClassOf(instanceOfClassToRender)
append(apiClass.simpleName).append(':') append(apiClass.simpleName).append(':')
} }
@@ -178,7 +178,7 @@ public class DebugSymbolRenderer(
return return
} }
append(getSymbolApiClass(symbol).simpleName) append(getFrontendIndependentKClassOf(symbol).simpleName)
append("(") append("(")
when (symbol) { when (symbol) {
is KtClassLikeSymbol -> renderId(symbol.classIdIfNonLocal, symbol) is KtClassLikeSymbol -> renderId(symbol.classIdIfNonLocal, symbol)
@@ -208,7 +208,7 @@ public class DebugSymbolRenderer(
return return
} }
renderSymbolHeader(typeToRender) renderFrontendIndependentKClassNameOf(typeToRender)
withIndent { withIndent {
appendLine() appendLine()
append("annotationsList: ") append("annotationsList: ")
@@ -392,8 +392,8 @@ public class DebugSymbolRenderer(
renderList(value.annotations, renderSymbolsFully = false) renderList(value.annotations, renderSymbolsFully = false)
} }
private fun getSymbolApiClass(symbol: Any): KClass<*> { private fun getFrontendIndependentKClassOf(instanceOfClass: Any): KClass<*> {
var current: Class<*> = symbol.javaClass var current: Class<*> = instanceOfClass.javaClass
while (true) { while (true) {
val className = current.name val className = current.name