[FIR] Rename FirAnnotationCall to FirAnnotation
This commit is contained in:
committed by
teamcityserver
parent
a7353d5a02
commit
4b662a42a1
+1
-1
@@ -108,7 +108,7 @@ object BuilderConfigurator : AbstractBuilderConfigurator<FirTreeBuilder>(FirTree
|
||||
withCopy()
|
||||
}
|
||||
|
||||
builder(annotationCall) {
|
||||
builder(annotation) {
|
||||
parents += callBuilder
|
||||
default("argumentList") {
|
||||
value = "FirEmptyArgumentList"
|
||||
|
||||
+2
-2
@@ -5,7 +5,7 @@
|
||||
|
||||
package org.jetbrains.kotlin.fir.tree.generator
|
||||
|
||||
import org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.annotationCall
|
||||
import org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.annotation
|
||||
import org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.block
|
||||
import org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.controlFlowGraphReference
|
||||
import org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.declaration
|
||||
@@ -37,7 +37,7 @@ object FieldSets {
|
||||
|
||||
val declarations by lazy { fieldList(declaration.withArgs("E" to "*")) }
|
||||
|
||||
val annotations by lazy { fieldList("annotations", annotationCall).withTransform(needTransformInOtherChildren = true) }
|
||||
val annotations by lazy { fieldList("annotations", annotation).withTransform(needTransformInOtherChildren = true) }
|
||||
|
||||
fun symbolWithPackage(packageName: String?, symbolClassName: String, argument: String? = null): Field {
|
||||
return field("symbol", type(packageName, symbolClassName), argument)
|
||||
|
||||
+1
-1
@@ -89,7 +89,7 @@ object FirTreeBuilder : AbstractFirTreeBuilder() {
|
||||
val typeProjectionWithVariance = element("TypeProjectionWithVariance", TypeRef, typeProjection)
|
||||
val argumentList = element("ArgumentList", Expression)
|
||||
val call = sealedElement("Call", Expression, statement) // TODO: may smth like `CallWithArguments` or `ElementWithArguments`?
|
||||
val annotationCall = element("AnnotationCall", Expression, expression, call, resolvable)
|
||||
val annotation = element("Annotation", Expression, expression, call, resolvable)
|
||||
val comparisonExpression = element("ComparisonExpression", Expression, expression)
|
||||
val typeOperatorCall = element("TypeOperatorCall", Expression, expression, call)
|
||||
val assignmentOperatorStatement = element("AssignmentOperatorStatement", Expression, statement)
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
|
||||
delegateFields(listOf("aliasName", "importedFqName", "isAllUnder", "source"), "delegate")
|
||||
}
|
||||
|
||||
impl(annotationCall) {
|
||||
impl(annotation) {
|
||||
default("typeRef") {
|
||||
value = "annotationTypeRef"
|
||||
withGetter = true
|
||||
|
||||
+1
-1
@@ -444,7 +444,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
|
||||
+field("delegate", import)
|
||||
}
|
||||
|
||||
annotationCall.configure {
|
||||
annotation.configure {
|
||||
+field("useSiteTarget", annotationUseSiteTargetType, nullable = true)
|
||||
+field("annotationTypeRef", typeRef).withTransform()
|
||||
+field("resolveStatus", annotationResolveStatusType, withReplace = true)
|
||||
|
||||
Reference in New Issue
Block a user