From 58c2433bddad85bbd29a910cefca862bcb508d90 Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Fri, 20 May 2022 17:02:22 -0700 Subject: [PATCH] FIR LC: use unified annotations' ClassId (missed JvmName) --- .../light/classes/symbol/annotations/annotationsUtils.kt | 3 ++- .../src/org/jetbrains/kotlin/name/JvmNames.kt | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/annotationsUtils.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/annotationsUtils.kt index b57ae93bd21..7e452eeb66d 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/annotationsUtils.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/annotationsUtils.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.load.java.JvmAbi.JVM_FIELD_ANNOTATION_CLASS_ID import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.JvmNames.JVM_MULTIFILE_CLASS_ID +import org.jetbrains.kotlin.name.JvmNames.JVM_NAME_CLASS_ID import org.jetbrains.kotlin.name.JvmNames.JVM_OVERLOADS_CLASS_ID import org.jetbrains.kotlin.name.JvmNames.JVM_SYNTHETIC_ANNOTATION_CLASS_ID import org.jetbrains.kotlin.name.StandardClassIds @@ -36,7 +37,7 @@ internal fun KtAnnotatedSymbol.getJvmNameFromAnnotation(annotationUseSiteTarget: val annotation = annotations.firstOrNull { val siteTarget = it.useSiteTarget (siteTarget == null || siteTarget == annotationUseSiteTarget) && - it.classId?.asString() == "kotlin/jvm/JvmName" + it.classId == JVM_NAME_CLASS_ID } return annotation?.let { diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/name/JvmNames.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/name/JvmNames.kt index 26c5348e075..f9309b1e116 100644 --- a/core/compiler.common.jvm/src/org/jetbrains/kotlin/name/JvmNames.kt +++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/name/JvmNames.kt @@ -6,7 +6,12 @@ package org.jetbrains.kotlin.name object JvmNames { + @JvmField val JVM_NAME: FqName = FqName("kotlin.jvm.JvmName") + + @JvmField + val JVM_NAME_CLASS_ID = ClassId.topLevel(JVM_NAME) + val JVM_NAME_SHORT: String = JVM_NAME.shortName().asString() val JVM_MULTIFILE_CLASS: FqName = FqName("kotlin.jvm.JvmMultifileClass")