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

[FIR] Support some kinds of fake sources in light builder

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-08-02 14:46:26 +03:00
parent 951aa8185e
commit 4e4fe9f719
3 changed files with 12 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/BaseConverter.kt
+1 -1
View File
@@ -31,7 +31,7 @@ open class BaseConverter(
override fun LighterASTNode.toFirSourceElement(kind: FirFakeSourceElementKind?): FirLightSourceElement {
val startOffset = offset + tree.getStartOffset(this)
val endOffset = offset + tree.getEndOffset(this)
return toFirLightSourceElement(startOffset, endOffset, tree)
return toFirLightSourceElement(startOffset, endOffset, tree, kind ?: FirRealSourceElementKind)
}
override val LighterASTNode.elementType: IElementType
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
+8 -4
View File
@@ -457,7 +457,7 @@ class DeclarationsConverter(
)
//parse primary constructor
val primaryConstructorWrapper = convertPrimaryConstructor(
primaryConstructor, classWrapper, delegatedConstructorSource,
primaryConstructor, classNode, classWrapper, delegatedConstructorSource,
delegationSpecifiers?.primaryConstructorBody
)
val firPrimaryConstructor = primaryConstructorWrapper?.firConstructor
@@ -564,7 +564,7 @@ class DeclarationsConverter(
superTypeCallEntry = superTypeCallEntry
)
//parse primary constructor
convertPrimaryConstructor(primaryConstructor, classWrapper, delegatedConstructorSource, primaryConstructorBody)
convertPrimaryConstructor(primaryConstructor, objectLiteral, classWrapper, delegatedConstructorSource, primaryConstructorBody)
?.let { this.declarations += it.firConstructor }
//parse declarations
@@ -635,7 +635,9 @@ class DeclarationsConverter(
superTypeCallEntry = enumSuperTypeCallEntry
)
superTypeRefs += enumClassWrapper.delegatedSuperTypeRef
convertPrimaryConstructor(null, enumClassWrapper, null)?.let { declarations += it.firConstructor }
convertPrimaryConstructor(null, enumEntry, enumClassWrapper, null)?.let {
declarations += it.firConstructor
}
classBodyNode?.also { declarations += convertClassBody(it, enumClassWrapper) }
}
}
@@ -683,6 +685,7 @@ class DeclarationsConverter(
*/
private fun convertPrimaryConstructor(
primaryConstructor: LighterASTNode?,
classNode: LighterASTNode,
classWrapper: ClassWrapper,
delegatedConstructorSource: FirLightSourceElement?,
body: FirBlock? = null
@@ -719,6 +722,7 @@ class DeclarationsConverter(
return PrimaryConstructor(
buildPrimaryConstructor {
source = primaryConstructor?.toFirSourceElement()
?: classNode.toFirSourceElement(FirFakeSourceElementKind.ImplicitConstructor)
session = baseSession
origin = FirDeclarationOrigin.Source
returnTypeRef = classWrapper.delegatedSelfTypeRef
@@ -1343,7 +1347,7 @@ class DeclarationsConverter(
delegatedSuperTypeRef = first
superTypeRefs += first
superTypeCallEntry += second
delegateConstructorSource = it.toFirSourceElement()
delegateConstructorSource = it.toFirSourceElement(FirFakeSourceElementKind.DelegatingConstructorCall)
}
DELEGATED_SUPER_TYPE_ENTRY -> {
superTypeRefs += convertExplicitDelegation(it, delegateNumber, delegateFields, initializeDelegateStatements, containerSymbol, delegatedTypeRef)
compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSourceElement.kt
+3 -2
View File
@@ -201,7 +201,8 @@ inline fun PsiElement.toFirPsiSourceElement(kind: FirSourceElementKind = FirReal
@Suppress("NOTHING_TO_INLINE")
inline fun LighterASTNode.toFirLightSourceElement(
startOffset: Int, endOffset: Int,
tree: FlyweightCapableTreeStructure<LighterASTNode>
): FirLightSourceElement = FirLightSourceElement(this, startOffset, endOffset, tree)
tree: FlyweightCapableTreeStructure<LighterASTNode>,
kind: FirSourceElementKind = FirRealSourceElementKind
): FirLightSourceElement = FirLightSourceElement(this, startOffset, endOffset, tree, kind)
val FirSourceElement?.lightNode: LighterASTNode? get() = (this as? FirLightSourceElement)?.element