diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyType.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyType.kt index c92e2e21c2b..25bf6ca60ff 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyType.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyType.kt @@ -47,4 +47,14 @@ abstract class LazyType(storageManager: StorageManager) : AbstractJetType() { override fun isError()= getConstructor().getDeclarationDescriptor().inn({ d -> ErrorUtils.isError(d)}, false) override fun getAnnotations(): List = listOf() + + override fun toString(): String? { + if (!_typeConstructor.isComputed()) { + return "Type constructor is not computed" + } + if (!_arguments.isComputed()) { + return "" + getConstructor() + "" + } + return super.toString() + } } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractJetType.java b/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractJetType.java index 1d7f57878c1..d5ddee2fd74 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractJetType.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractJetType.java @@ -41,7 +41,7 @@ public abstract class AbstractJetType implements JetType { } @Override - public final String toString() { + public String toString() { List arguments = getArguments(); return getConstructor() + (arguments.isEmpty() ? "" : "<" + argumentsToString(arguments) + ">") + (isNullable() ? "?" : ""); }