From 4d95a295908d49c142ed4cfb756d296511b94868 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Fri, 27 Dec 2013 20:12:05 +0400
Subject: [PATCH] Refactoring: remove local function

---
 .../KotlinDirectInheritorsSearcher.kt         | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt
index 79c45d9d4cc..1f5024416af 100644
--- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt
+++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt
@@ -29,26 +29,23 @@ import org.jetbrains.jet.lang.resolve.*
 import java.util.Collections
 
 public open class KotlinDirectInheritorsSearcher() : QueryExecutorBase<PsiClass, DirectClassInheritorsSearch.SearchParameters>(true) {
-    public override fun processQuery(queryParameters: DirectClassInheritorsSearch.SearchParameters, consumer: Processor<PsiClass>): Unit {
+    public override fun processQuery(queryParameters: DirectClassInheritorsSearch.SearchParameters, consumer: Processor<PsiClass>) {
         val baseClass = queryParameters.getClassToProcess()
         if (baseClass == null) return
 
-        fun candidates(): Iterator<JetClassOrObject> {
-            val name = baseClass.getName()
+        val name = baseClass.getName()
+        if (name == null) return
 
-            val originalScope = queryParameters.getScope()
-            val scope = if (originalScope is GlobalSearchScope)
-                originalScope
-            else baseClass.getContainingFile()?.let { file -> GlobalSearchScope.fileScope(file) }
+        val originalScope = queryParameters.getScope()
+        val scope = if (originalScope is GlobalSearchScope)
+            originalScope
+        else
+            baseClass.getContainingFile()?.let { file -> GlobalSearchScope.fileScope(file) }
 
-            if (name != null && scope != null) {
-                return JetSuperClassIndex.getInstance().get(name, baseClass.getProject(), scope).iterator()
-            }
-            return Collections.emptyList<JetClassOrObject>().iterator()
-        }
+        if (scope == null) return
 
         ApplicationManager.getApplication()?.runReadAction {
-            candidates()
+            JetSuperClassIndex.getInstance().get(name, baseClass.getProject(), scope).iterator()
                     .map { candidate -> JetSourceNavigationHelper.getOriginalPsiClassOrCreateLightClass(candidate)}
                     .filterNotNull()
                     .filter { candidate -> candidate.isInheritor(baseClass, false) }