From 91f97fa6114aa84c126f558d1ba93fd515ba99b5 Mon Sep 17 00:00:00 2001 From: Mark Punzalan Date: Fri, 6 Dec 2019 13:42:56 -0800 Subject: [PATCH] [FIR] Support FirCheckNotNullCall in HTML dump. --- .../src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 7f7a9566626..b8c3995e3c7 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 @@ -1244,10 +1244,9 @@ class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver } private fun FlowContent.generateUnary(expression: FirOperatorCall) { - val (first) = expression.arguments unresolved { +expression.operation.operator } ws - generate(first) + generate(expression.argument) } private fun FlowContent.generate(expression: FirOperatorCall) { @@ -1259,14 +1258,18 @@ class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver } private fun FlowContent.generate(typeOperatorCall: FirTypeOperatorCall) { - val (expression) = typeOperatorCall.arguments - generate(expression) + generate(typeOperatorCall.argument) ws keyword(typeOperatorCall.operation.operator) ws generate(typeOperatorCall.conversionTypeRef) } + private fun FlowContent.generate(checkNotNullCall: FirCheckNotNullCall) { + generate(checkNotNullCall.argument) + +"!!" + } + @Suppress("UNUSED_PARAMETER") private fun FlowContent.generate(elseIfTrueCondition: FirElseIfTrueCondition) { keyword("else") @@ -1471,6 +1474,7 @@ class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver is FirTypeOperatorCall -> generate(expression) is FirOperatorCall -> generate(expression) is FirBinaryLogicExpression -> generate(expression) + is FirCheckNotNullCall -> generate(expression) else -> inlineUnsupported(expression) } }