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

[FIR] Remove FirExpression.typeRef

Browse Source 
#KT-61312 Fixed
This commit is contained in:
Kirill Rakhman
2023-08-24 10:14:15 +02:00
committed by Space Team
parent c4fbbe7338
commit 844ab4ee74
3 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt
-1
View File
@@ -92,7 +92,6 @@ abstract class AbstractRawFirBuilderTestCase : KtParsingTestCase(
} }
for (property in this::class.memberProperties) { for (property in this::class.memberProperties) {
if (hasNoAcceptAndTransform(this::class.simpleName, property.name)) continue if (hasNoAcceptAndTransform(this::class.simpleName, property.name)) continue
if (this is FirExpression && property.name == "typeRef") continue
when (val childElement = property.getter.apply { isAccessible = true }.call(this)) { when (val childElement = property.getter.apply { isAccessible = true }.call(this)) {
is FirNoReceiverExpression -> continue is FirNoReceiverExpression -> continue
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt
-3
View File
@@ -32,7 +32,4 @@ abstract class FirExpression : FirPureAbstractElement(), FirStatement {
abstract override fun replaceAnnotations(newAnnotations: List<FirAnnotation>) abstract override fun replaceAnnotations(newAnnotations: List<FirAnnotation>)
abstract override fun <D> transformAnnotations(transformer: FirTransformer<D>, data: D): FirExpression abstract override fun <D> transformAnnotations(transformer: FirTransformer<D>, data: D): FirExpression
/** DO NOT USE! Only for temporary compatibility with Compose. Will be removed soon. KT-61312*/
val typeRef: org.jetbrains.kotlin.fir.types.FirTypeRef get() = coneTypeOrNull?.let { org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef { type = it } } ?: org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource
} }
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/element.kt
-8
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir.tree.generator.printer package org.jetbrains.kotlin.fir.tree.generator.printer
import org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder
import org.jetbrains.kotlin.fir.tree.generator.context.AbstractFirTreeBuilder import org.jetbrains.kotlin.fir.tree.generator.context.AbstractFirTreeBuilder
import org.jetbrains.kotlin.fir.tree.generator.model.Element import org.jetbrains.kotlin.fir.tree.generator.model.Element
import org.jetbrains.kotlin.fir.tree.generator.model.Field import org.jetbrains.kotlin.fir.tree.generator.model.Field
@@ -148,14 +147,7 @@ fun SmartPrinter.printElement(element: Element) {
println() println()
println("fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirElement") println("fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirElement")
} }
if (element == FirTreeBuilder.expression) {
println()
println("/** DO NOT USE! Only for temporary compatibility with Compose. Will be removed soon. KT-61312*/")
println("val typeRef: org.jetbrains.kotlin.fir.types.FirTypeRef get() = coneTypeOrNull?.let { org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef { type = it } } ?: org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource")
}
} }
println("}") println("}")
} }
} }