azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move static constants with builtin names to :core:descriptors.common module

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-08-16 22:57:12 +03:00
parent 2e92fe9be9
commit 7a7fe77b8e
180 changed files with 1085 additions and 1025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt
+1 -2
View File
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.psi.KtCodeFragment
import org.jetbrains.kotlin.psi.externalDescriptors
import org.jetbrains.kotlin.resolve.ResolutionAnchorProvider
import org.jetbrains.kotlin.resolve.scopes.MemberScope
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.Variance
@@ -217,4 +216,4 @@ internal class DebugLabelPropertyDescriptor(
/*isActual = */false,
/*isExternal = */false,
/*isDelegated = */false
)
)
idea/jvm-debugger/jvm-debugger-sequence/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinSequenceTypes.kt
+13 -13
View File
@@ -7,22 +7,22 @@ package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl
import com.intellij.debugger.streams.trace.dsl.Types
import com.intellij.debugger.streams.trace.impl.handler.type.*
import org.jetbrains.kotlin.builtins.KotlinBuiltIns.FQ_NAMES
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames
object KotlinSequenceTypes : Types {
override val ANY: GenericType = ClassTypeImpl(FQ_NAMES.any.asString(), "kotlin.Any()")
override val ANY: GenericType = ClassTypeImpl(FqNames.any.asString(), "kotlin.Any()")
override val BOOLEAN: GenericType = ClassTypeImpl(FQ_NAMES._boolean.asString(), "false")
val BYTE: GenericType = ClassTypeImpl(FQ_NAMES._byte.asString(), "0")
val SHORT: GenericType = ClassTypeImpl(FQ_NAMES._short.asString(), "0")
val CHAR: GenericType = ClassTypeImpl(FQ_NAMES._char.asString(), "0.toChar()")
override val INT: GenericType = ClassTypeImpl(FQ_NAMES._int.asString(), "0")
override val LONG: GenericType = ClassTypeImpl(FQ_NAMES._long.asString(), "0L")
val FLOAT: GenericType = ClassTypeImpl(FQ_NAMES._float.asString(), "0.0f")
override val DOUBLE: GenericType = ClassTypeImpl(FQ_NAMES._double.asString(), "0.0")
override val STRING: GenericType = ClassTypeImpl(FQ_NAMES.string.asString(), "\"\"")
override val EXCEPTION: GenericType = ClassTypeImpl(FQ_NAMES.throwable.asString(), "kotlin.Throwable()")
override val VOID: GenericType = ClassTypeImpl(FQ_NAMES.unit.asString(), "Unit")
override val BOOLEAN: GenericType = ClassTypeImpl(FqNames._boolean.asString(), "false")
val BYTE: GenericType = ClassTypeImpl(FqNames._byte.asString(), "0")
val SHORT: GenericType = ClassTypeImpl(FqNames._short.asString(), "0")
val CHAR: GenericType = ClassTypeImpl(FqNames._char.asString(), "0.toChar()")
override val INT: GenericType = ClassTypeImpl(FqNames._int.asString(), "0")
override val LONG: GenericType = ClassTypeImpl(FqNames._long.asString(), "0L")
val FLOAT: GenericType = ClassTypeImpl(FqNames._float.asString(), "0.0f")
override val DOUBLE: GenericType = ClassTypeImpl(FqNames._double.asString(), "0.0")
override val STRING: GenericType = ClassTypeImpl(FqNames.string.asString(), "\"\"")
override val EXCEPTION: GenericType = ClassTypeImpl(FqNames.throwable.asString(), "kotlin.Throwable()")
override val VOID: GenericType = ClassTypeImpl(FqNames.unit.asString(), "Unit")
val NULLABLE_ANY: GenericType = nullable { ANY }