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

[FIR][LightTree] Proper source for enum constructor call

Browse Source
This commit is contained in:
Andrey Zinovyev
2021-04-18 13:22:26 +03:00
committed by TeamCityServer
parent bed45affe1
commit 05f0507cbb
1 changed files with 21 additions and 4 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/DeclarationsConverter.kt
+21 -4
View File
@@ -614,11 +614,17 @@ class DeclarationsConverter(
lateinit var identifier: String lateinit var identifier: String
val enumSuperTypeCallEntry = mutableListOf<FirExpression>() val enumSuperTypeCallEntry = mutableListOf<FirExpression>()
var classBodyNode: LighterASTNode? = null var classBodyNode: LighterASTNode? = null
var superTypeCallEntry: LighterASTNode? = null
enumEntry.forEachChildren { enumEntry.forEachChildren {
when (it.tokenType) { when (it.tokenType) {
MODIFIER_LIST -> modifiers = convertModifierList(it) MODIFIER_LIST -> modifiers = convertModifierList(it)
IDENTIFIER -> identifier = it.asText IDENTIFIER -> identifier = it.asText
INITIALIZER_LIST -> enumSuperTypeCallEntry += convertInitializerList(it) INITIALIZER_LIST -> {
enumSuperTypeCallEntry += convertInitializerList(it)
it.getChildNodeByType(SUPER_TYPE_CALL_ENTRY)?.let { superTypeCall ->
superTypeCallEntry = superTypeCall
}
}
CLASS_BODY -> classBodyNode = it CLASS_BODY -> classBodyNode = it
} }
} }
@@ -666,7 +672,12 @@ class DeclarationsConverter(
superTypeCallEntry = enumSuperTypeCallEntry superTypeCallEntry = enumSuperTypeCallEntry
) )
superTypeRefs += enumClassWrapper.delegatedSuperTypeRef superTypeRefs += enumClassWrapper.delegatedSuperTypeRef
convertPrimaryConstructor(null, null, enumClassWrapper, null)?.let { declarations += it.firConstructor } convertPrimaryConstructor(
null,
enumEntry.toFirSourceElement(),
enumClassWrapper,
superTypeCallEntry?.toFirSourceElement()
)?.let { declarations += it.firConstructor }
classBodyNode?.also { classBodyNode?.also {
// Use ANONYMOUS_OBJECT_NAME for the owner class id of enum entry declarations // Use ANONYMOUS_OBJECT_NAME for the owner class id of enum entry declarations
withChildClassName(ANONYMOUS_OBJECT_NAME, isLocal = true) { withChildClassName(ANONYMOUS_OBJECT_NAME, isLocal = true) {
@@ -743,8 +754,14 @@ class DeclarationsConverter(
constructedTypeRef = classWrapper.delegatedSuperTypeRef.copyWithNewSourceKind(FirFakeSourceElementKind.ImplicitTypeRef) constructedTypeRef = classWrapper.delegatedSuperTypeRef.copyWithNewSourceKind(FirFakeSourceElementKind.ImplicitTypeRef)
isThis = false isThis = false
calleeReference = buildExplicitSuperReference { calleeReference = buildExplicitSuperReference {
source = classWrapper.delegatedSuperTypeRef.source?.fakeElement(FirFakeSourceElementKind.DelegatingConstructorCall) //[dirty] if there is not explicit constructor call source, don't take delegatedSuperTypeRef.source
?: this@buildDelegatedConstructorCall.source?.fakeElement(FirFakeSourceElementKind.DelegatingConstructorCall) source = if (delegatedConstructorSource != null) {
classWrapper.delegatedSuperTypeRef.source?.fakeElement(FirFakeSourceElementKind.DelegatingConstructorCall)
?: this@buildDelegatedConstructorCall.source?.fakeElement(FirFakeSourceElementKind.DelegatingConstructorCall)
} else {
this@buildDelegatedConstructorCall.source
}
superTypeRef = this@buildDelegatedConstructorCall.constructedTypeRef superTypeRef = this@buildDelegatedConstructorCall.constructedTypeRef
} }
extractArgumentsFrom(classWrapper.superTypeCallEntry, stubMode) extractArgumentsFrom(classWrapper.superTypeCallEntry, stubMode)