From 84027124db5c80cfd4aedadfd1a8adb0e317f491 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 17 Feb 2015 21:33:35 +0300
Subject: [PATCH] Made code more clear

---
 .../jetbrains/kotlin/idea/util/ImportsUtils.kt   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt
index 9c17d4fc809..af7f488c238 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt
@@ -45,15 +45,15 @@ public fun DeclarationDescriptor.canBeReferencedViaImport(): Boolean {
         (this is CallableDescriptor && DescriptorUtils.isStaticDeclaration(this))) {
         return !getName().isSpecial()
     }
-    val parent = getContainingDeclaration()!!
-    if (parent !is ClassDescriptor || !parent.canBeReferencedViaImport()) {
-        return false
+
+    val parentClass = getContainingDeclaration() as? ClassDescriptor ?: return false
+    if (!parentClass.canBeReferencedViaImport()) return false
+
+    return when (this) {
+        is ConstructorDescriptor -> !parentClass.isInner() // inner class constructors can't be referenced via import
+        is ClassDescriptor -> true
+        else -> false
     }
-    // inner class constructors can't be referenced via import
-    if (this is ConstructorDescriptor && parent.isInner()) {
-        return false
-    }
-    return this is ClassDescriptor || this is ConstructorDescriptor
 }
 
 public fun JetType.canBeReferencedViaImport(): Boolean {