From 738c1f34df161b3da946033770a4b99eca0d5928 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Fri, 11 Mar 2022 16:31:03 +0100
Subject: [PATCH] FIR2IR: Fix offsets calculation for qualified expressions

---
 .../org/jetbrains/kotlin/fir/backend/ConversionUtils.kt   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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 <T : IrElement> KtSourceElement?.convertWithOffsets(
 internal fun <T : IrElement> 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)
 }