extract StandartNames.NAME constant

This commit is contained in:
Anna Kozlova
2023-05-02 11:18:13 +02:00
committed by teamcity
parent 92b6a77431
commit 366c67a668
11 changed files with 20 additions and 15 deletions
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.name.Name
object BuiltinSpecialProperties {
val PROPERTY_FQ_NAME_TO_JVM_GETTER_NAME_MAP: Map<FqName, Name> = mapOf(
StandardNames.FqNames._enum.childSafe("name") to Name.identifier("name"),
StandardNames.FqNames._enum.childSafe("name") to StandardNames.NAME,
StandardNames.FqNames._enum.childSafe("ordinal") to Name.identifier("ordinal"),
StandardNames.FqNames.collection.child("size") to Name.identifier("size"),
StandardNames.FqNames.map.child("size") to Name.identifier("size"),
@@ -34,6 +34,8 @@ object StandardNames {
@JvmField val CHAR_CODE = Name.identifier("code")
@JvmField val NAME = Name.identifier("name")
@JvmField val NEXT_CHAR = Name.identifier("nextChar")
@JvmField val CONTEXT_FUNCTION_TYPE_PARAMETER_COUNT_NAME = Name.identifier("count")
@@ -5,6 +5,8 @@
package org.jetbrains.kotlin.name
import org.jetbrains.kotlin.builtins.StandardNames
object StandardClassIds {
val BASE_KOTLIN_PACKAGE = FqName("kotlin")
val BASE_REFLECT_PACKAGE = BASE_KOTLIN_PACKAGE.child(Name.identifier("reflect"))
@@ -199,7 +201,6 @@ object StandardClassIds {
val retentionValue = value
val targetAllowedTargets = Name.identifier("allowedTargets")
val jvmNameName = Name.identifier("name")
val sinceKotlinVersion = Name.identifier("version")
@@ -210,7 +211,7 @@ object StandardClassIds {
val deprecatedSinceKotlinErrorSince = Name.identifier("errorSince")
val deprecatedSinceKotlinHiddenSince = Name.identifier("hiddenSince")
val parameterNameName = jvmNameName
val parameterNameName = StandardNames.NAME
}
}
@@ -225,7 +225,7 @@ fun getFunctionTypeArgumentProjections(
val parameterNameAnnotation = BuiltInAnnotationDescriptor(
builtIns,
StandardNames.FqNames.parameterName,
mapOf(Name.identifier("name") to StringValue(name.asString()))
mapOf(StandardNames.NAME to StringValue(name.asString()))
)
type.replaceAnnotations(Annotations.create(type.annotations + parameterNameAnnotation))
}