azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring: remove local function

Browse Source
This commit is contained in:
Nikolay Krasko
2013-12-27 20:12:05 +04:00
parent b84c1a2113
commit 4d95a29590
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt
+10 -13
View File
@@ -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) }