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

[ULC] Fix annotations with no site for ctor

Browse Source 
Fixed #KT-45291
This commit is contained in:
Igor Yakovlev
2021-03-04 18:26:30 +01:00
parent 297aa17b6e
commit 179cf303da
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightParameters.kt
+7 -2
View File
@@ -180,8 +180,13 @@ internal class KtUltraLightParameterForSource(
override val givenAnnotations: List<KtLightAbstractAnnotation>?
get() {
val site = if (kotlinOrigin.hasValOrVar()) AnnotationUseSiteTarget.CONSTRUCTOR_PARAMETER else null
return kotlinOrigin.annotationEntries.toLightAnnotations(this, site)
return if (kotlinOrigin.hasValOrVar()) {
val entriesWithoutJvmField = kotlinOrigin.annotationEntries.filter { it.shortName?.identifier != "JvmField" }
entriesWithoutJvmField.toLightAnnotations(this, null) +
entriesWithoutJvmField.toLightAnnotations(this, AnnotationUseSiteTarget.CONSTRUCTOR_PARAMETER)
} else {
kotlinOrigin.annotationEntries.toLightAnnotations(this, null)
}
}
override fun getText(): String? = kotlinOrigin.text