From 4b03adaa570a45238d3cd176ca863e5e1ad3f700 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 20 Jan 2016 22:45:18 +0300 Subject: [PATCH] Minor, improve AbstractLazyType#toString for debug --- .../jetbrains/kotlin/types/AbstractLazyType.kt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt index 22df1669cdc..c72284319b0 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.types import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor -import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.resolve.scopes.MemberScope +import org.jetbrains.kotlin.storage.StorageManager abstract class AbstractLazyType(storageManager: StorageManager) : AbstractKotlinType(), LazyType { @@ -56,13 +56,11 @@ abstract class AbstractLazyType(storageManager: StorageManager) : AbstractKotlin override fun getAnnotations() = Annotations.EMPTY - override fun toString(): String { - if (!typeConstructor.isComputed()) { - return "Type constructor is not computed" - } - if (!arguments.isComputed()) { - return "" + constructor + "" - } - return super.toString() + override fun toString() = when { + !typeConstructor.isComputed() -> "[Not-computed]" + !arguments.isComputed() -> + if (constructor.parameters.isEmpty()) constructor.toString() + else "$constructor" + else -> super.toString() } }