From 43bbfa78d16865ee26c8127af12ead7b83845460 Mon Sep 17 00:00:00 2001
From: Roman Golyshev <roman.golyshev@jetbrains.com>
Date: Wed, 27 May 2020 14:02:24 +0300
Subject: [PATCH] KT-18538 Cleanup in `ShortenReferences`

---
 .../kotlin/idea/core/ShortenReferences.kt     | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
index 5a249ad15e5..32879bff09d 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
@@ -338,12 +338,11 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
                         val tryImport = result.descriptors.isNotEmpty()
                                 && result.descriptors.none { it in failedToImportDescriptors }
                                 && result.descriptors.all { mayImport(it, file) }
-                        toBeShortened = if (tryImport) {
+
+                        if (tryImport) {
                             descriptorsToImport.addAll(result.descriptors)
-                            true
-                        } else {
-                            false
                         }
+                        toBeShortened = tryImport
                     }
 
                     AnalyzeQualifiedElementResult.Skip -> {
@@ -516,10 +515,8 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
             element: KtDotQualifiedExpression,
             bindingContext: BindingContext
         ): AnalyzeQualifiedElementResult {
-            if (PsiTreeUtil.getParentOfType(
-                    element,
-                    KtImportDirective::class.java, KtPackageDirective::class.java
-                ) != null || !canBePossibleToDropReceiver(element, bindingContext)
+            if (PsiTreeUtil.getParentOfType(element, KtImportDirective::class.java, KtPackageDirective::class.java) != null ||
+                !canBePossibleToDropReceiver(element, bindingContext)
             ) return AnalyzeQualifiedElementResult.Skip
 
             val selector = element.selectorExpression ?: return AnalyzeQualifiedElementResult.Skip
@@ -719,11 +716,9 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
 
             val receiver = element.receiverExpression
 
-            if (PsiTreeUtil.getParentOfType(
-                    element,
-                    KtImportDirective::class.java, KtPackageDirective::class.java
-                ) != null
-            ) return AnalyzeQualifiedElementResult.Skip
+            if (PsiTreeUtil.getParentOfType(element, KtImportDirective::class.java, KtPackageDirective::class.java) != null) {
+                return AnalyzeQualifiedElementResult.Skip
+            }
 
             val receiverTarget = receiver.singleTarget(bindingContext) as? ClassDescriptor ?: return AnalyzeQualifiedElementResult.Skip
 
@@ -740,11 +735,9 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
             // TODO: More generic solution may be possible
             if (selectorsSelectorTarget is PropertyDescriptor) {
                 val source = selectorsSelectorTarget.source.getPsi() as? KtProperty
-                if (source != null && isEnumCompanionPropertyWithEntryConflict(
-                        source,
-                        source.name ?: ""
-                    )
-                ) return AnalyzeQualifiedElementResult.Skip
+                if (source != null && isEnumCompanionPropertyWithEntryConflict(source, source.name ?: "")) {
+                    return AnalyzeQualifiedElementResult.Skip
+                }
             }
 
             return AnalyzeQualifiedElementResult.ShortenNow