[FIR] Don't miss annotations on inits
^KT-59874
This commit is contained in:
committed by
Space Team
parent
63f461a6cd
commit
5a1a23afac
+3
@@ -1004,8 +1004,10 @@ class LightTreeRawFirDeclarationBuilder(
|
||||
*/
|
||||
private fun convertAnonymousInitializer(anonymousInitializer: LighterASTNode): FirDeclaration {
|
||||
var firBlock: FirBlock? = null
|
||||
var modifiers = Modifier()
|
||||
anonymousInitializer.forEachChildren {
|
||||
when (it.tokenType) {
|
||||
MODIFIER_LIST -> modifiers = convertModifierList(it, isInClass = true)
|
||||
BLOCK -> withForcedLocalContext {
|
||||
firBlock = convertBlock(it)
|
||||
}
|
||||
@@ -1018,6 +1020,7 @@ class LightTreeRawFirDeclarationBuilder(
|
||||
origin = FirDeclarationOrigin.Source
|
||||
body = firBlock ?: buildEmptyExpressionBlock()
|
||||
dispatchReceiverType = context.dispatchReceiverTypesStack.lastOrNull()
|
||||
annotations += modifiers.annotations
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2110,6 +2110,7 @@ open class PsiRawFirBuilder(
|
||||
}
|
||||
}
|
||||
dispatchReceiverType = context.dispatchReceiverTypesStack.lastOrNull()
|
||||
initializer.extractAnnotationsTo(this)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+6
@@ -164,6 +164,12 @@ open class FirTypeResolveTransformer(
|
||||
}
|
||||
}
|
||||
|
||||
override fun transformAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer, data: Any?): FirAnonymousInitializer {
|
||||
return withScopeCleanup {
|
||||
transformDeclaration(anonymousInitializer, data) as FirAnonymousInitializer
|
||||
}
|
||||
}
|
||||
|
||||
override fun transformErrorPrimaryConstructor(errorPrimaryConstructor: FirErrorPrimaryConstructor, data: Any?) =
|
||||
transformConstructor(errorPrimaryConstructor, data)
|
||||
|
||||
|
||||
+1
@@ -207,6 +207,7 @@ private class FirDeclarationsResolveTransformerForAnnotationArguments(
|
||||
anonymousInitializer: FirAnonymousInitializer,
|
||||
data: ResolutionMode
|
||||
): FirAnonymousInitializer {
|
||||
anonymousInitializer.transformAnnotations(this, ResolutionMode.ContextIndependent)
|
||||
return anonymousInitializer
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.KtSourceElement
|
||||
import org.jetbrains.kotlin.fir.FirModuleData
|
||||
import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder
|
||||
import org.jetbrains.kotlin.fir.builder.FirBuilderDsl
|
||||
import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty
|
||||
import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer
|
||||
import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes
|
||||
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
|
||||
@@ -29,6 +30,7 @@ import org.jetbrains.kotlin.fir.types.ConeClassLikeType
|
||||
class FirAnonymousInitializerBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder {
|
||||
override var source: KtSourceElement? = null
|
||||
override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR
|
||||
override val annotations: MutableList<FirAnnotation> = mutableListOf()
|
||||
override lateinit var moduleData: FirModuleData
|
||||
override lateinit var origin: FirDeclarationOrigin
|
||||
override var attributes: FirDeclarationAttributes = FirDeclarationAttributes()
|
||||
@@ -40,6 +42,7 @@ class FirAnonymousInitializerBuilder : FirDeclarationBuilder, FirAnnotationConta
|
||||
return FirAnonymousInitializerImpl(
|
||||
source,
|
||||
resolvePhase,
|
||||
annotations.toMutableOrEmpty(),
|
||||
moduleData,
|
||||
origin,
|
||||
attributes,
|
||||
@@ -49,9 +52,6 @@ class FirAnonymousInitializerBuilder : FirDeclarationBuilder, FirAnnotationConta
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@Deprecated("Modification of 'annotations' has no impact for FirAnonymousInitializerBuilder", level = DeprecationLevel.HIDDEN)
|
||||
override val annotations: MutableList<FirAnnotation> = mutableListOf()
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalContracts::class)
|
||||
|
||||
+10
-3
@@ -12,6 +12,8 @@ package org.jetbrains.kotlin.fir.declarations.impl
|
||||
|
||||
import org.jetbrains.kotlin.KtSourceElement
|
||||
import org.jetbrains.kotlin.fir.FirModuleData
|
||||
import org.jetbrains.kotlin.fir.MutableOrEmptyList
|
||||
import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty
|
||||
import org.jetbrains.kotlin.fir.declarations.*
|
||||
import org.jetbrains.kotlin.fir.expressions.FirAnnotation
|
||||
import org.jetbrains.kotlin.fir.expressions.FirBlock
|
||||
@@ -20,11 +22,13 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousInitializerSymbol
|
||||
import org.jetbrains.kotlin.fir.types.ConeClassLikeType
|
||||
import org.jetbrains.kotlin.fir.visitors.FirTransformer
|
||||
import org.jetbrains.kotlin.fir.visitors.FirVisitor
|
||||
import org.jetbrains.kotlin.fir.visitors.transformInplace
|
||||
|
||||
@OptIn(ResolveStateAccess::class)
|
||||
internal class FirAnonymousInitializerImpl(
|
||||
override val source: KtSourceElement?,
|
||||
resolvePhase: FirResolvePhase,
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
override val moduleData: FirModuleData,
|
||||
override val origin: FirDeclarationOrigin,
|
||||
override val attributes: FirDeclarationAttributes,
|
||||
@@ -32,8 +36,6 @@ internal class FirAnonymousInitializerImpl(
|
||||
override val symbol: FirAnonymousInitializerSymbol,
|
||||
override val dispatchReceiverType: ConeClassLikeType?,
|
||||
) : FirAnonymousInitializer() {
|
||||
override val annotations: List<FirAnnotation>
|
||||
get() = emptyList()
|
||||
override var controlFlowGraphReference: FirControlFlowGraphReference? = null
|
||||
|
||||
init {
|
||||
@@ -42,21 +44,26 @@ internal class FirAnonymousInitializerImpl(
|
||||
}
|
||||
|
||||
override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {
|
||||
annotations.forEach { it.accept(visitor, data) }
|
||||
controlFlowGraphReference?.accept(visitor, data)
|
||||
body?.accept(visitor, data)
|
||||
}
|
||||
|
||||
override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirAnonymousInitializerImpl {
|
||||
transformAnnotations(transformer, data)
|
||||
controlFlowGraphReference = controlFlowGraphReference?.transform(transformer, data)
|
||||
body = body?.transform(transformer, data)
|
||||
return this
|
||||
}
|
||||
|
||||
override fun <D> transformAnnotations(transformer: FirTransformer<D>, data: D): FirAnonymousInitializerImpl {
|
||||
annotations.transformInplace(transformer, data)
|
||||
return this
|
||||
}
|
||||
|
||||
override fun replaceAnnotations(newAnnotations: List<FirAnnotation>) {}
|
||||
override fun replaceAnnotations(newAnnotations: List<FirAnnotation>) {
|
||||
annotations = newAnnotations.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
|
||||
controlFlowGraphReference = newControlFlowGraphReference
|
||||
|
||||
@@ -479,6 +479,7 @@ class FirRenderer(
|
||||
|
||||
override fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer) {
|
||||
resolvePhaseRenderer?.render(anonymousInitializer)
|
||||
annotationRenderer?.render(anonymousInitializer)
|
||||
print("init")
|
||||
bodyRenderer?.renderBody(anonymousInitializer.body)
|
||||
}
|
||||
|
||||
+1
-3
@@ -43,9 +43,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
|
||||
defaultFalse("hasLazyNestedClassifiers", withGetter = true)
|
||||
}
|
||||
|
||||
impl(anonymousInitializer) {
|
||||
defaultEmptyList("annotations")
|
||||
}
|
||||
impl(anonymousInitializer)
|
||||
|
||||
impl(anonymousObject)
|
||||
impl(danglingModifierList)
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
class A {
|
||||
@ann init {}
|
||||
@aaa init {}
|
||||
<!WRONG_ANNOTATION_TARGET!>@ann<!> init {}
|
||||
@<!UNRESOLVED_REFERENCE!>aaa<!> init {}
|
||||
}
|
||||
|
||||
interface T {
|
||||
@ann <!ANONYMOUS_INITIALIZER_IN_INTERFACE!>init<!> {}
|
||||
@aaa <!ANONYMOUS_INITIALIZER_IN_INTERFACE!>init<!> {}
|
||||
<!WRONG_ANNOTATION_TARGET!>@ann<!> <!ANONYMOUS_INITIALIZER_IN_INTERFACE!>init<!> {}
|
||||
@<!UNRESOLVED_REFERENCE!>aaa<!> <!ANONYMOUS_INITIALIZER_IN_INTERFACE!>init<!> {}
|
||||
}
|
||||
|
||||
annotation class ann
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
annotation class base
|
||||
|
||||
@base class My {
|
||||
@base init {
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
// FIR_IDENTICAL
|
||||
annotation class base
|
||||
|
||||
@base class My {
|
||||
|
||||
@@ -85,9 +85,9 @@ abstract class IllegalModifiers6() {
|
||||
<!WRONG_MODIFIER_TARGET!>open<!> init {}
|
||||
<!WRONG_MODIFIER_TARGET!>final<!> init {}
|
||||
|
||||
<!WRONG_MODIFIER_TARGET!>public<!> @annotated init {}
|
||||
<!WRONG_MODIFIER_TARGET!>public<!> <!WRONG_ANNOTATION_TARGET!>@annotated<!> init {}
|
||||
|
||||
<!WRONG_MODIFIER_TARGET!>private<!> @IllegalModifiers6() init {}
|
||||
<!WRONG_MODIFIER_TARGET!>private<!> <!WRONG_ANNOTATION_TARGET!>@<!NOT_AN_ANNOTATION_CLASS!>IllegalModifiers6<!>()<!> init {}
|
||||
}
|
||||
|
||||
// strange inappropriate modifiers usages
|
||||
|
||||
Reference in New Issue
Block a user