[FIR] FirReceiverParameter: rename type to typeRef

^KT-54417
This commit is contained in:
Dmitrii Gridin
2022-11-11 07:47:39 +01:00
committed by Space Team
parent 40c64c672d
commit 86422d0944
57 changed files with 110 additions and 108 deletions
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.*
abstract class FirReceiverParameter : FirPureAbstractElement(), FirAnnotationContainer {
abstract override val source: KtSourceElement?
abstract val type: FirTypeRef
abstract val typeRef: FirTypeRef
abstract override val annotations: List<FirAnnotation>
override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = visitor.visitReceiverParameter(this, data)
@@ -29,9 +29,9 @@ abstract class FirReceiverParameter : FirPureAbstractElement(), FirAnnotationCon
override fun <E: FirElement, D> transform(transformer: FirTransformer<D>, data: D): E =
transformer.transformReceiverParameter(this, data) as E
abstract fun replaceType(newType: FirTypeRef)
abstract fun replaceTypeRef(newTypeRef: FirTypeRef)
abstract fun <D> transformType(transformer: FirTransformer<D>, data: D): FirReceiverParameter
abstract fun <D> transformTypeRef(transformer: FirTransformer<D>, data: D): FirReceiverParameter
abstract override fun <D> transformAnnotations(transformer: FirTransformer<D>, data: D): FirReceiverParameter
}
@@ -25,13 +25,13 @@ import org.jetbrains.kotlin.fir.visitors.*
@FirBuilderDsl
class FirReceiverParameterBuilder : FirAnnotationContainerBuilder {
override var source: KtSourceElement? = null
lateinit var type: FirTypeRef
lateinit var typeRef: FirTypeRef
override val annotations: MutableList<FirAnnotation> = mutableListOf()
override fun build(): FirReceiverParameter {
return FirReceiverParameterImpl(
source,
type,
typeRef,
annotations,
)
}
@@ -53,7 +53,7 @@ inline fun buildReceiverParameterCopy(original: FirReceiverParameter, init: FirR
}
val copyBuilder = FirReceiverParameterBuilder()
copyBuilder.source = original.source
copyBuilder.type = original.type
copyBuilder.typeRef = original.typeRef
copyBuilder.annotations.addAll(original.annotations)
return copyBuilder.apply(init).build()
}
@@ -20,22 +20,22 @@ import org.jetbrains.kotlin.fir.visitors.*
internal class FirReceiverParameterImpl(
override val source: KtSourceElement?,
override var type: FirTypeRef,
override var typeRef: FirTypeRef,
override val annotations: MutableList<FirAnnotation>,
) : FirReceiverParameter() {
override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {
type.accept(visitor, data)
typeRef.accept(visitor, data)
annotations.forEach { it.accept(visitor, data) }
}
override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirReceiverParameterImpl {
transformType(transformer, data)
transformTypeRef(transformer, data)
transformAnnotations(transformer, data)
return this
}
override fun <D> transformType(transformer: FirTransformer<D>, data: D): FirReceiverParameterImpl {
type = type.transform(transformer, data)
override fun <D> transformTypeRef(transformer: FirTransformer<D>, data: D): FirReceiverParameterImpl {
typeRef = typeRef.transform(transformer, data)
return this
}
@@ -44,7 +44,7 @@ internal class FirReceiverParameterImpl(
return this
}
override fun replaceType(newType: FirTypeRef) {
type = newType
override fun replaceTypeRef(newTypeRef: FirTypeRef) {
typeRef = newTypeRef
}
}
@@ -184,7 +184,7 @@ class FirRenderer(
print(" ")
if (receiverParameter != null) {
annotationRenderer?.render(receiverParameter, AnnotationUseSiteTarget.RECEIVER)
receiverParameter.type.accept(this)
receiverParameter.typeRef.accept(this)
print(".")
}
when (callableDeclaration) {
@@ -304,7 +304,7 @@ class FirRenderer(
override fun visitReceiverParameter(receiverParameter: FirReceiverParameter) {
print("<explicit receiver parameter>: ")
annotationRenderer?.render(receiverParameter)
receiverParameter.type.accept(this)
receiverParameter.typeRef.accept(this)
}
override fun visitSimpleFunction(simpleFunction: FirSimpleFunction) {
@@ -353,7 +353,7 @@ class FirRenderer(
print(" ")
val receiverParameter = anonymousFunction.receiverParameter
if (receiverParameter != null) {
receiverParameter.type.accept(this)
receiverParameter.typeRef.accept(this)
print(".")
}
print("<anonymous>")
@@ -29,13 +29,13 @@ abstract class FirCallableSymbol<D : FirCallableDeclaration> : FirBasedSymbol<D>
val resolvedReceiverTypeRef: FirResolvedTypeRef?
get() {
ensureType(fir.receiverParameter?.type)
return fir.receiverParameter?.type as FirResolvedTypeRef?
ensureType(fir.receiverParameter?.typeRef)
return fir.receiverParameter?.typeRef as FirResolvedTypeRef?
}
val receiverParameter: FirAnnotationContainer?
get() {
ensureType(fir.receiverParameter?.type)
ensureType(fir.receiverParameter?.typeRef)
return fir.receiverParameter
}
@@ -569,6 +569,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
"FirArrayOfCallImpl",
"FirIntegerLiteralOperatorCallImpl",
"FirContextReceiverImpl",
"FirReceiverParameterImpl",
"FirClassReferenceExpressionImpl",
"FirGetClassCallImpl",
"FirSmartCastExpressionImpl"
@@ -394,7 +394,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
}
receiverParameter.configure {
+field("type", typeRef).withTransform().withReplace()
+typeRefField.withTransform()
+annotations
}