From 609a6ca9bb88c9b70d94338c2523c6cf13c3eadf Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 17 May 2018 15:32:08 +0300 Subject: [PATCH] IrTypes: dummy implementation of IrType.render --- .../org/jetbrains/kotlin/ir/util/DumpIrTree.kt | 9 ++------- .../org/jetbrains/kotlin/ir/util/RenderIrType.kt | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrType.kt diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt index 5ae163f8532..ae8962c8baa 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt @@ -208,13 +208,8 @@ class DumpIrTreeVisitor(out: Appendable) : IrElementVisitor { "<`$index>" } - private fun IrMemberAccessExpression.renderTypeArgument(index: Int): String { - val typeArgument = getTypeArgument(index) - return if (typeArgument != null) - DescriptorRenderer.ONLY_NAMES_WITH_SHORT_TYPES.renderType(typeArgument) - else - "" - } + private fun IrMemberAccessExpression.renderTypeArgument(index: Int): String = + getTypeArgument(index)?.render() ?: "" override fun visitGetField(expression: IrGetField, data: String) { expression.dumpLabeledElementWith(data) { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrType.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrType.kt new file mode 100644 index 00000000000..60bfcbdb680 --- /dev/null +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrType.kt @@ -0,0 +1,15 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.ir.util + +import org.jetbrains.kotlin.ir.types.IrType +import org.jetbrains.kotlin.ir.types.impl.originalKotlinType +import org.jetbrains.kotlin.renderer.DescriptorRenderer + +fun IrType.render() = + originalKotlinType?.let { + DescriptorRenderer.ONLY_NAMES_WITH_SHORT_TYPES.renderType(it) + } ?: "UNBOUND IrType" \ No newline at end of file