From 34071f285ab53ad0d723c7e4ec8f15a1496b443c Mon Sep 17 00:00:00 2001 From: Tianyu Geng Date: Thu, 14 Oct 2021 17:22:39 -0700 Subject: [PATCH] RAW FIR: fix source kind in LT generation PSI->FIR respects forced source kind but it appears LT ignores it. --- .../jetbrains/kotlin/fir/lightTree/converter/BaseConverter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/BaseConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/BaseConverter.kt index 0fbe132c400..2e89c81e28e 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/BaseConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/BaseConverter.kt @@ -34,7 +34,7 @@ abstract class BaseConverter( override fun LighterASTNode.toFirSourceElement(kind: FirFakeSourceElementKind?): FirLightSourceElement { val startOffset = offset + tree.getStartOffset(this) val endOffset = offset + tree.getEndOffset(this) - return toFirLightSourceElement(tree, kind ?: FirRealSourceElementKind, startOffset, endOffset) + return toFirLightSourceElement(tree, kind ?: context.forcedElementSourceKind ?: FirRealSourceElementKind, startOffset, endOffset) } override val LighterASTNode.elementType: IElementType