From e571de5942707180ebc6dcf6c5c7ee097b35c92f Mon Sep 17 00:00:00 2001 From: Nikolay Lunyak Date: Fri, 20 Aug 2021 01:36:48 +0300 Subject: [PATCH] [FIR] Fix dumpKotlinLike --- .../jetbrains/kotlin/ir/util/dumpKotlinLike.kt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt index cd67c16fdd2..c9f1d377472 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt @@ -617,9 +617,11 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption returnType.printTypeWithNoIndent() } printWhereClauseIfNeededWithNoIndent() - p.printWithNoIndent(" ") - body?.accept(this@KotlinLikeDumper, null) + body?.let { + p.printWithNoIndent(" ") + it.accept(this@KotlinLikeDumper, null) + } } else { p.printlnWithNoIndent() } @@ -724,9 +726,16 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption p.printWithNoIndent(declaration.name.asString()) - declaration.getter?.returnType?.let { + val backingField = declaration.backingField + + if (backingField != null && !declaration.isDelegated) { p.printWithNoIndent(": ") - it.printTypeWithNoIndent() + backingField.type.printTypeWithNoIndent() + } else { + declaration.getter?.returnType?.let { + p.printWithNoIndent(": ") + it.printTypeWithNoIndent() + } } /* TODO better rendering for