From fd1ff5123308d1e815fee644dd4b45aeda6697b5 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 10 Nov 2015 16:23:51 +0300
Subject: [PATCH] Minor changes on code review

---
 .../kotlin/idea/intentions/ImportAllMembersIntention.kt        | 3 +--
 .../jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ImportAllMembersIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ImportAllMembersIntention.kt
index 8be0fb21eb3..0eb9ed52210 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ImportAllMembersIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ImportAllMembersIntention.kt
@@ -64,8 +64,7 @@ class ImportAllMembersIntention : SelfTargetingIntention<KtDotQualifiedExpressio
 
         val qualifiedExpressions = element.getContainingKtFile().collectDescendantsOfType<KtDotQualifiedExpression> { qualifiedExpression ->
             val qualifierName = qualifiedExpression.receiverExpression.getQualifiedElementSelector() as? KtNameReferenceExpression
-                                ?: return@collectDescendantsOfType false
-            qualifierName.getReferencedNameAsName() == classFqName.shortName() && target(qualifiedExpression)?.importableFqName?.parent() == classFqName
+            qualifierName?.getReferencedNameAsName() == classFqName.shortName() && target(qualifiedExpression)?.importableFqName?.parent() == classFqName
         }
 
         //TODO: not deep
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt
index 89da992b51b..efe6ee0a4e3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt
@@ -57,8 +57,7 @@ class ImportMemberIntention : SelfTargetingOffsetIndependentIntention<KtNameRefe
 
         val qualifiedExpressions = file.collectDescendantsOfType<KtDotQualifiedExpression> { qualifiedExpression ->
             val selector = qualifiedExpression.getQualifiedElementSelector() as? KtNameReferenceExpression
-                           ?: return@collectDescendantsOfType false
-            selector.getReferencedNameAsName() == fqName.shortName() && targetFqName(qualifiedExpression) == fqName
+            selector?.getReferencedNameAsName() == fqName.shortName() && targetFqName(qualifiedExpression) == fqName
         }
 
         //TODO: not deep