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

FIR2IR: Fix offsets calculation for qualified expressions

Browse Source
This commit is contained in:
Ilya Chernikov
2022-03-11 16:31:03 +01:00
committed by teamcity
parent a65c102469
commit 738c1f34df
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+2 -6
View File
@@ -83,13 +83,9 @@ internal fun <T : IrElement> KtSourceElement?.convertWithOffsets(
internal fun <T : IrElement> FirQualifiedAccess.convertWithOffsets( internal fun <T : IrElement> FirQualifiedAccess.convertWithOffsets(
f: (startOffset: Int, endOffset: Int) -> T f: (startOffset: Int, endOffset: Int) -> T
): T { ): T {
val psi = psi val psi = calleeReference.psi
if (psi is PsiCompiledElement) return f(UNDEFINED_OFFSET, UNDEFINED_OFFSET) if (psi is PsiCompiledElement) return f(UNDEFINED_OFFSET, UNDEFINED_OFFSET)
val startOffset = if (psi is KtQualifiedExpression) { val startOffset = psi?.startOffsetSkippingComments ?: calleeReference.source ?.startOffset ?: UNDEFINED_OFFSET
(psi.selectorExpression ?: psi).startOffsetSkippingComments
} else {
psi?.startOffsetSkippingComments ?: source?.startOffset ?: UNDEFINED_OFFSET
}
val endOffset = source?.endOffset ?: UNDEFINED_OFFSET val endOffset = source?.endOffset ?: UNDEFINED_OFFSET
return f(startOffset, endOffset) return f(startOffset, endOffset)
} }