From 048b6b60e907850314a17c5ac2992e7df52cfbfd Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Mon, 20 Jun 2016 19:36:42 +0300
Subject: [PATCH] dangerousFlexibleTypeOrNull : minor refactoring (cherry
 picked from commit 31e8fe5)

---
 .../kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
index 07636c882b4..07e47f16940 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
+import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.core.ShortenReferences
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
@@ -62,8 +63,7 @@ class SpecifyTypeExplicitlyIntention :
 
         if (declaration.containingClassOrObject?.isLocal() ?: false) return null
 
-        val context = declaration.analyze(BodyResolveMode.PARTIAL)
-        val callable = context[BindingContext.DECLARATION_TO_DESCRIPTOR, declaration] as? CallableDescriptor ?: return null
+        val callable = declaration.resolveToDescriptorIfAny() as? CallableDescriptor ?: return null
         if (publicAPIOnly && !callable.visibility.isPublicAPI) return null
         val type = callable.returnType ?: return null
         if (!type.isFlexibleRecursive()) return null