From 96117fc1eb2445f7a838832df782acdcf5167876 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Tue, 11 May 2021 16:38:44 +0200
Subject: [PATCH] FIR IDE: cleanup FirPositionCompletionContextDetector.detect

---
 .../context/FirPositionCompletionContext.kt      | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/context/FirPositionCompletionContext.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/context/FirPositionCompletionContext.kt
index 46dcbf8ca38..cd6df1b3267 100644
--- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/context/FirPositionCompletionContext.kt
+++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/context/FirPositionCompletionContext.kt
@@ -37,16 +37,12 @@ internal class FirUnknownPositionContext(
 internal object FirPositionCompletionContextDetector {
     fun detect(basicContext: FirBasicCompletionContext): FirPositionCompletionContext {
         val position = basicContext.parameters.position
-
-        return when (val reference = (position.parent as? KtSimpleNameExpression)?.mainReference) {
-            null -> FirUnknownPositionContext(position)
-            else -> {
-                val nameExpression = reference.expression.takeIf { it !is KtLabelReferenceExpression }
-                    ?: return FirUnknownPositionContext(position)
-                val explicitReceiver = nameExpression.getReceiverExpression()
-                FirNameReferencePositionContext(position, reference, nameExpression, explicitReceiver)
-            }
-        }
+        val reference = (position.parent as? KtSimpleNameExpression)?.mainReference
+            ?: return FirUnknownPositionContext(position)
+        val nameExpression = reference.expression.takeIf { it !is KtLabelReferenceExpression }
+            ?: return FirUnknownPositionContext(position)
+        val explicitReceiver = nameExpression.getReceiverExpression()
+        return FirNameReferencePositionContext(position, reference, nameExpression, explicitReceiver)
     }
 
     inline fun analyseInContext(