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

FIR LC: use unified annotations' ClassId (missed JvmName)

Browse Source
This commit is contained in:
Jinseong Jeon
2022-05-20 17:02:22 -07:00
committed by Ilya Kirillov
parent 85388f0c79
commit 58c2433bdd
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/annotationsUtils.kt
+2 -1
View File
@@ -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.ClassId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.JvmNames.JVM_MULTIFILE_CLASS_ID 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_OVERLOADS_CLASS_ID
import org.jetbrains.kotlin.name.JvmNames.JVM_SYNTHETIC_ANNOTATION_CLASS_ID import org.jetbrains.kotlin.name.JvmNames.JVM_SYNTHETIC_ANNOTATION_CLASS_ID
import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.name.StandardClassIds
@@ -36,7 +37,7 @@ internal fun KtAnnotatedSymbol.getJvmNameFromAnnotation(annotationUseSiteTarget:
val annotation = annotations.firstOrNull { val annotation = annotations.firstOrNull {
val siteTarget = it.useSiteTarget val siteTarget = it.useSiteTarget
(siteTarget == null || siteTarget == annotationUseSiteTarget) && (siteTarget == null || siteTarget == annotationUseSiteTarget) &&
it.classId?.asString() == "kotlin/jvm/JvmName" it.classId == JVM_NAME_CLASS_ID
} }
return annotation?.let { return annotation?.let {
core/compiler.common.jvm/src/org/jetbrains/kotlin/name/JvmNames.kt
+5
View File
@@ -6,7 +6,12 @@
package org.jetbrains.kotlin.name package org.jetbrains.kotlin.name
object JvmNames { object JvmNames {
@JvmField
val JVM_NAME: FqName = FqName("kotlin.jvm.JvmName") 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_NAME_SHORT: String = JVM_NAME.shortName().asString()
val JVM_MULTIFILE_CLASS: FqName = FqName("kotlin.jvm.JvmMultifileClass") val JVM_MULTIFILE_CLASS: FqName = FqName("kotlin.jvm.JvmMultifileClass")