azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Analysis API] render extra debug information for nested symbols if renders for outers

Browse Source
This commit is contained in:
Ilya Kirillov
2022-10-24 22:23:51 +02:00
committed by teamcity
parent 85effcc1b3
commit 4bb32f4634
77 changed files with 967 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtSymbolByFirBuilder.kt
+1 -1
View File
@@ -629,7 +629,7 @@ private class BuilderCache<From, To : KtSymbol> {
inline fun <reified S : To> cache(key: From, calculation: () -> S): S {
val value = cache.getOrPut(key, calculation)
return value as? S
?: error("Cannot cast ${value::class} to ${S::class}\n${DebugSymbolRenderer.render(value)}")
?: error("Cannot cast ${value::class} to ${S::class}\n${value}")
}
}
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt
+4 -4
View File
@@ -80,7 +80,7 @@ internal class KtFirSymbolContainingDeclarationProvider(
val source = symbol.firSymbol.source
val thisSource = when (source?.kind) {
null -> buildErrorWithAttachment("PSI should present for declaration built by Kotlin code") {
withSymbolAttachment("symbolForContainingPsi", symbol)
withSymbolAttachment("symbolForContainingPsi", symbol, analysisSession)
}
KtFakeSourceElementKind.ImplicitConstructor ->
@@ -92,19 +92,19 @@ internal class KtFirSymbolContainingDeclarationProvider(
KtRealSourceElementKind -> source.psi!!
else ->
buildErrorWithAttachment("errorWithAttachment FirSourceElement: kind=${source.kind} element=${source.psi!!::class.simpleName}") {
withSymbolAttachment("symbolForContainingPsi", symbol)
withSymbolAttachment("symbolForContainingPsi", symbol, analysisSession)
}
}
return when (symbol.origin) {
KtSymbolOrigin.SOURCE -> thisSource.getContainingKtDeclaration()
?: buildErrorWithAttachment("Containing declaration should present for non-toplevel declaration ${thisSource::class}") {
withSymbolAttachment("symbolForContainingPsi", symbol)
withSymbolAttachment("symbolForContainingPsi", symbol, analysisSession)
}
KtSymbolOrigin.SOURCE_MEMBER_GENERATED -> thisSource as KtDeclaration
else -> buildErrorWithAttachment("Unsupported declaration origin ${symbol.origin} ${thisSource::class}") {
withSymbolAttachment("symbolForContainingPsi", symbol)
withSymbolAttachment("symbolForContainingPsi", symbol, analysisSession)
}
}
}
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/errorUtils.kt
+5 -3
View File
@@ -5,17 +5,19 @@
package org.jetbrains.kotlin.analysis.api.fir.utils
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.fir.symbols.KtFirSymbol
import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer
import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.withFirEntry
import org.jetbrains.kotlin.analysis.utils.errors.ExceptionAttachmentBuilder
import org.jetbrains.kotlin.analysis.utils.errors.withPsiEntry
import org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments
fun ExceptionAttachmentBuilder.withSymbolAttachment(name: String, symbol: KtSymbol) {
withEntry(name, symbol, DebugSymbolRenderer::render)
fun ExceptionAttachmentBuilder.withSymbolAttachment(name: String, symbol: KtSymbol, analysisSession: KtAnalysisSession) {
with(analysisSession) {
withEntry(name, symbol) { DebugSymbolRenderer(renderExtra = true).render(it) }
}
withPsiEntry("${name}Psi", symbol.psi)
if (symbol is KtFirSymbol<*>) {