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

[FIR] Fix naming for light tree delegate and expression conversion

Browse Source
This commit is contained in:
Egor Kulikov
2023-11-30 09:44:10 +01:00
committed by Space Team
parent 77b9c40434
commit 926c0a9136
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/AbstractLightTreeRawFirBuilder.kt
+2
View File
@@ -71,6 +71,8 @@ abstract class AbstractLightTreeRawFirBuilder(
override fun LighterASTNode.getLabeledExpression() = getLastChildExpression()
fun LighterASTNode.getChildExpression() = getFirstChildExpression()
private fun LighterASTNode.getFirstChildExpression(): LighterASTNode? {
forEachChildren {
if (it.isExpression()) return it
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirDeclarationBuilder.kt
+6 -6
View File
@@ -1278,7 +1278,7 @@ class LightTreeRawFirDeclarationBuilder(
var identifier: String? = null
val firTypeParameters = mutableListOf<FirTypeParameter>()
var isReturnType = false
var delegateExpression: LighterASTNode? = null
var delegate: LighterASTNode? = null
var isVar = false
var receiverType: FirTypeRef? = null
var returnType: FirTypeRef = implicitType
@@ -1312,7 +1312,7 @@ class LightTreeRawFirDeclarationBuilder(
COLON -> isReturnType = true
TYPE_REFERENCE -> if (isReturnType) returnType = convertType(it) else receiverType = convertType(it)
TYPE_CONSTRAINT_LIST -> typeConstraints += convertTypeConstraints(it)
PROPERTY_DELEGATE -> delegateExpression = it
PROPERTY_DELEGATE -> delegate = it
VAR_KEYWORD -> isVar = true
PROPERTY_ACCESSOR -> {
accessors += it
@@ -1338,8 +1338,8 @@ class LightTreeRawFirDeclarationBuilder(
initializer = propertyInitializer
//probably can do this for delegateExpression itself
val delegateSource = delegateExpression?.let {
(it.getExpressionInParentheses() ?: it).toFirSourceElement()
val delegateSource = delegate?.let {
(it.getChildExpression() ?: it).toFirSourceElement()
}
symbol = propertySymbol
@@ -1356,7 +1356,7 @@ class LightTreeRawFirDeclarationBuilder(
if (isLocal) {
this.isLocal = true
val delegateBuilder = delegateExpression?.let {
val delegateBuilder = delegate?.let {
FirWrappedDelegateExpressionBuilder().apply {
source = delegateSource?.fakeElement(KtFakeSourceElementKind.WrappedDelegate)
expression = expressionConverter.getAsFirExpression(it, "Incorrect delegate expression")
@@ -1381,7 +1381,7 @@ class LightTreeRawFirDeclarationBuilder(
withCapturedTypeParameters(true, propertySource, firTypeParameters) {
typeParameters += firTypeParameters
val delegateBuilder = delegateExpression?.let {
val delegateBuilder = delegate?.let {
FirWrappedDelegateExpressionBuilder().apply {
source = delegateSource?.fakeElement(KtFakeSourceElementKind.WrappedDelegate)
expression = expressionConverter.getAsFirExpression(it, "Should have delegate")
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirExpressionBuilder.kt
+1 -1
View File
@@ -136,7 +136,7 @@ class LightTreeRawFirExpressionBuilder(
getAsFirExpression(content, "Empty parentheses")
}
PROPERTY_DELEGATE, INDICES, CONDITION, LOOP_RANGE ->
getAsFirExpression(expression.getExpressionInParentheses(), errorReason)
getAsFirExpression(expression.getChildExpression(), errorReason)
THIS_EXPRESSION -> convertThisExpression(expression)
SUPER_EXPRESSION -> convertSuperExpression(expression)