From cb91c6b977c5c89e070adfbce42e2a812466769e Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 23 Apr 2019 04:23:49 +0300 Subject: [PATCH] Add abbreviated types rendering to html fir dump --- .../src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt b/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt index 644608fab16..a1ff809381f 100644 --- a/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt +++ b/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression import org.jetbrains.kotlin.fir.references.FirErrorNamedReference import org.jetbrains.kotlin.fir.references.FirSimpleNamedReference +import org.jetbrains.kotlin.fir.resolve.directExpansionType import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.symbols.* import org.jetbrains.kotlin.fir.types.* @@ -684,7 +685,13 @@ class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver when (type) { is ConeClassErrorType -> error { +type.reason } is ConeClassType -> generate(type) - is ConeAbbreviatedType -> inlineUnsupported(type) + is ConeAbbreviatedType -> resolved { + symbolRef(type.abbreviationLookupTag.toSymbol(session)) { + simpleName(type.abbreviationLookupTag.name) + } + +" = " + generate(type.directExpansionType(session) ?: ConeKotlinErrorType("No expansion for type-alias")) + } is ConeTypeParameterType -> resolved { symbolRef(type.lookupTag.toSymbol(session)) { simpleName(type.lookupTag.name)