diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinTypes.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinTypes.kt index d7af9a3d156..8a0d713d9d4 100644 --- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinTypes.kt +++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinTypes.kt @@ -3,23 +3,24 @@ package com.intellij.debugger.streams.kotlin.trace.dsl import com.intellij.debugger.streams.trace.dsl.Types import com.intellij.debugger.streams.trace.impl.handler.type.* + /** * @author Vitaliy.Bibaev */ object KotlinTypes : Types { - override val ANY: GenericType = ClassTypeImpl("kotlin.Any", "kotlin.Any()") - override val INT: GenericType = ClassTypeImpl("kotlin.Int", "0") - override val LONG: GenericType = ClassTypeImpl("kotlin.Long", "0L") - override val BOOLEAN: GenericType = ClassTypeImpl("kotlin.Boolean", "false") - override val DOUBLE: GenericType = ClassTypeImpl("kotlin.Double", "0.") - override val STRING: GenericType = ClassTypeImpl("kotlin.String", "\"\"") - override val EXCEPTION: GenericType = ClassTypeImpl("kotlin.Throwable", "kotlin.Throwable()") - override val VOID: GenericType = ClassTypeImpl("kotlin.Unit", "Unit") + override val ANY: GenericType = ClassTypeImpl("kotlin.Any", "kotlin.Any()") + override val INT: GenericType = ClassTypeImpl("kotlin.Int", "0") + override val LONG: GenericType = ClassTypeImpl("kotlin.Long", "0L") + override val BOOLEAN: GenericType = ClassTypeImpl("kotlin.Boolean", "false") + override val DOUBLE: GenericType = ClassTypeImpl("kotlin.Double", "0.") + override val STRING: GenericType = ClassTypeImpl("kotlin.String", "\"\"") + override val EXCEPTION: GenericType = ClassTypeImpl("kotlin.Throwable", "kotlin.Throwable()") + override val VOID: GenericType = ClassTypeImpl("kotlin.Unit", "Unit") - override val TIME: GenericType = ClassTypeImpl("java.util.concurrent.atomic.AtomicInteger", - "java.util.concurrent.atomic.AtomicInteger()") + override val TIME: GenericType = ClassTypeImpl("java.util.concurrent.atomic.AtomicInteger", + "java.util.concurrent.atomic.AtomicInteger()") - override fun list(elementsType: GenericType): ListType = + override fun list(elementsType: GenericType): ListType = ListTypeImpl(elementsType, { "kotlin.collections.MutableList<$it>" }, "kotlin.collections.mutableListOf()") override fun array(elementType: GenericType): ArrayType = when (elementType) { @@ -31,15 +32,15 @@ object KotlinTypes : Types { { "kotlin.arrayOfNulls<${elementType.genericTypeName}>($it)" }) } - override fun map(keyType: GenericType, valueType: GenericType): MapType = + override fun map(keyType: GenericType, valueType: GenericType): MapType = MapTypeImpl(keyType, valueType, - { keys, values -> "kotlin.collections.MutableMap<$keys, $values>" }, - "kotlin.collections.mutableMapOf()") + { keys, values -> "kotlin.collections.MutableMap<$keys, $values>" }, + "kotlin.collections.mutableMapOf()") - override fun linkedMap(keyType: GenericType, valueType: GenericType): MapType = + override fun linkedMap(keyType: GenericType, valueType: GenericType): MapType = MapTypeImpl(keyType, valueType, - { keys, values -> "kotlin.collections.MutableMap<$keys, $values>" }, - "kotlin.collections.linkedMapOf()") + { keys, values -> "kotlin.collections.MutableMap<$keys, $values>" }, + "kotlin.collections.linkedMapOf()") override fun nullable(typeSelector: Types.() -> GenericType): GenericType { val type = this.typeSelector() @@ -48,7 +49,7 @@ object KotlinTypes : Types { is ArrayType -> ArrayTypeImpl(type.elementType, { "kotlin.Array<$it>?" }, { type.sizedDeclaration(it) }) is ListType -> ListTypeImpl(type.elementType, { "kotlin.collections.MutableList<$it>?" }, type.defaultValue) is MapType -> MapTypeImpl(type.keyType, type.valueType, { keys, values -> "kotlin.collections.MutableMap<$keys, $values>?" }, - type.defaultValue) + type.defaultValue) else -> ClassTypeImpl(type.genericTypeName + '?', type.defaultValue) } }