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

KotlinReferencesSearcher: cleanup after J2K

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-06-02 20:21:19 +02:00
parent b2a6531255
commit 527751e967
1 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
+12 -20
View File
@@ -26,6 +26,7 @@ import com.intellij.util.Processor
import org.jetbrains.kotlin.asJava.* import org.jetbrains.kotlin.asJava.*
import org.jetbrains.kotlin.idea.search.usagesSearch.* import org.jetbrains.kotlin.idea.search.usagesSearch.*
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters>() { public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters>() {
@@ -75,32 +76,22 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
} }
private fun searchLightElements(queryParameters: ReferencesSearch.SearchParameters, element: PsiElement) { private fun searchLightElements(queryParameters: ReferencesSearch.SearchParameters, element: PsiElement) {
if (element is JetClassOrObject) { when (element) {
processJetClassOrObject(element, queryParameters) is JetClassOrObject -> processJetClassOrObject(element, queryParameters)
} is JetNamedFunction, is JetSecondaryConstructor -> {
else if (element is JetNamedFunction || element is JetSecondaryConstructor) {
val function = element as JetFunction val function = element as JetFunction
val name = function.getName() val name = function.getName()
if (name != null) { if (name != null) {
val method = ApplicationManager.getApplication().runReadAction<PsiMethod>(object : Computable<PsiMethod?> { val method = runReadAction { LightClassUtil.getLightClassMethod(function) }
override fun compute(): PsiMethod? {
return LightClassUtil.getLightClassMethod(function)
}
})
searchNamedElement(queryParameters, method) searchNamedElement(queryParameters, method)
} }
} }
else if (element is JetProperty) { is JetProperty -> {
val propertyMethods = ApplicationManager.getApplication().runReadAction<LightClassUtil.PropertyAccessorsPsiMethods>(object : Computable<LightClassUtil.PropertyAccessorsPsiMethods> { val propertyMethods = runReadAction { LightClassUtil.getLightClassPropertyMethods(element) }
override fun compute(): LightClassUtil.PropertyAccessorsPsiMethods {
return LightClassUtil.getLightClassPropertyMethods(element)
}
})
searchNamedElement(queryParameters, propertyMethods.getGetter()) searchNamedElement(queryParameters, propertyMethods.getGetter())
searchNamedElement(queryParameters, propertyMethods.getSetter()) searchNamedElement(queryParameters, propertyMethods.getSetter())
} }
else if (element is KotlinLightMethod) { is KotlinLightMethod -> {
val declaration = element.getOrigin() val declaration = element.getOrigin()
if (declaration is JetProperty || (declaration is JetParameter && declaration.hasValOrVar())) { if (declaration is JetProperty || (declaration is JetParameter && declaration.hasValOrVar())) {
searchNamedElement(queryParameters, declaration as PsiNamedElement) searchNamedElement(queryParameters, declaration as PsiNamedElement)
@@ -110,10 +101,11 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
} }
} }
} }
}
private fun searchNamedElement(queryParameters: ReferencesSearch.SearchParameters, element: PsiNamedElement, private fun searchNamedElement(queryParameters: ReferencesSearch.SearchParameters, element: PsiNamedElement?,
name: String? = element.getName()) { name: String? = element?.getName()) {
if (name != null) { if (name != null && element != null) {
queryParameters.getOptimizer().searchWord(name, queryParameters.getEffectiveSearchScope(), true, element) queryParameters.getOptimizer().searchWord(name, queryParameters.getEffectiveSearchScope(), true, element)
} }
} }