From 82fbe4d83df46ebe2bb3117e90093b332c4e96aa Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 16 Apr 2019 14:40:46 +0300 Subject: [PATCH] Support String concatenation and Unit expression in html fir dump --- .../org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 91ee6f34e08..fb7e9f30194 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 @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition 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.symbols.ConeSymbol @@ -1064,9 +1065,21 @@ class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver generate(throwExpression.exception) } + private fun FlowContent.generate(unitExpression: FirUnitExpression) { + generate(unitExpression.typeRef) + } + + private fun FlowContent.generate(stringConcatenationCall: FirStringConcatenationCall) { + generateList(stringConcatenationCall.arguments, separator = " + ") { + generate(it) + } + } + private fun FlowContent.generate(expression: FirExpression) { exprType(expression.typeRef) { when (expression) { + is FirUnitExpression -> generate(expression) + is FirStringConcatenationCall -> generate(expression) is FirAnonymousFunction -> generate(expression, isStatement = false) is FirThrowExpression -> generate(expression) is FirWhenSubjectExpression -> generate(expression)