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

K2: don't duplicate custom annotations in types #KT-54275 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-10-07 11:19:43 +02:00
committed by Space Team
parent d491eba629
commit 62ba1277bb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/exceptionInRepeatedAnnotation.fir.txt
Vendored
+1 -1
View File
@@ -20,7 +20,7 @@ FILE: exceptionInRepeatedAnnotation.kt
public final inline fun <reified E : R|Event|> R|EventHandler<E>|.withPriority(): R|EventListener<@R|kotlin/ParameterName|(name = String(e)) E>| {
^withPriority Q|EventListener|.R|/EventListener.Companion.invoke|<R|@R|kotlin/ParameterName|(name = String(e)) E|>(this@R|/withPriority|)
}
public final inline fun <reified E : R|Event|> R|EventHandler<E>|.withDefaultPriority(): R|EventListener<@R|kotlin/ParameterName|(name = String(e)) @R|kotlin/ParameterName|(name = String(e)) E>| {
public final inline fun <reified E : R|Event|> R|EventHandler<E>|.withDefaultPriority(): R|EventListener<@R|kotlin/ParameterName|(name = String(e)) E>| {
^withDefaultPriority this@R|/withDefaultPriority|.R|/withPriority|<R|@R|kotlin/ParameterName|(name = String(e)) E|>()
}
public abstract class Event : R|kotlin/Any| {
compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/CustomAnnotationTypeAttribute.kt
+1 -1
View File
@@ -15,7 +15,7 @@ class CustomAnnotationTypeAttribute(val annotations: List<FirAnnotation>) : Cone
override fun intersect(other: CustomAnnotationTypeAttribute?): CustomAnnotationTypeAttribute? = null
override fun add(other: CustomAnnotationTypeAttribute?): CustomAnnotationTypeAttribute {
if (other == null) return this
if (other == null || other === this) return this
return CustomAnnotationTypeAttribute(annotations + other.annotations)
}