Skip to content

Commit a883319

Browse files
committed
[ULC] Fix annotations with no site for ctor
Fixed #KT-45291
1 parent 00c5df5 commit a883319

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightParameters.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,13 @@ internal class KtUltraLightParameterForSource(
179179

180180
override val givenAnnotations: List<KtLightAbstractAnnotation>?
181181
get() {
182-
val site = if (kotlinOrigin.hasValOrVar()) AnnotationUseSiteTarget.CONSTRUCTOR_PARAMETER else null
183-
return kotlinOrigin.annotationEntries.toLightAnnotations(this, site)
182+
return if (kotlinOrigin.hasValOrVar()) {
183+
val entriesWithoutJvmField = kotlinOrigin.annotationEntries.filter { it.shortName?.identifier != "JvmField" }
184+
entriesWithoutJvmField.toLightAnnotations(this, null) +
185+
entriesWithoutJvmField.toLightAnnotations(this, AnnotationUseSiteTarget.CONSTRUCTOR_PARAMETER)
186+
} else {
187+
kotlinOrigin.annotationEntries.toLightAnnotations(this, null)
188+
}
184189
}
185190

186191
override fun getText(): String? = kotlinOrigin.text

0 commit comments

Comments
 (0)