diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt index 640d0eeca13..e89f3be6b8c 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt @@ -83,13 +83,9 @@ internal fun KtSourceElement?.convertWithOffsets( internal fun FirQualifiedAccess.convertWithOffsets( f: (startOffset: Int, endOffset: Int) -> T ): T { - val psi = psi + val psi = calleeReference.psi if (psi is PsiCompiledElement) return f(UNDEFINED_OFFSET, UNDEFINED_OFFSET) - val startOffset = if (psi is KtQualifiedExpression) { - (psi.selectorExpression ?: psi).startOffsetSkippingComments - } else { - psi?.startOffsetSkippingComments ?: source?.startOffset ?: UNDEFINED_OFFSET - } + val startOffset = psi?.startOffsetSkippingComments ?: calleeReference.source ?.startOffset ?: UNDEFINED_OFFSET val endOffset = source?.endOffset ?: UNDEFINED_OFFSET return f(startOffset, endOffset) }