From 68384a9b4a48e24a00dcc11dedc376e3370941c3 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 26 Jun 2015 18:09:17 +0300 Subject: [PATCH] Avoid looking for light methods if only Kotlin search needed --- .../KotlinReferencesSearcher.kt | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt index 27d9aaa6e23..c5c6743cbcd 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt @@ -16,20 +16,21 @@ package org.jetbrains.kotlin.idea.search.ideaExtensions -import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.QueryExecutorBase import com.intellij.openapi.progress.ProgressManager -import com.intellij.openapi.util.Computable import com.intellij.psi.* +import com.intellij.psi.search.LocalSearchScope import com.intellij.psi.search.RequestResultProcessor +import com.intellij.psi.search.SearchScope import com.intellij.psi.search.searches.ReferencesSearch import com.intellij.psi.util.PsiTreeUtil import com.intellij.util.Processor import org.jetbrains.kotlin.asJava.KotlinLightMethod import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.asJava.namedUnwrappedElement -import org.jetbrains.kotlin.idea.references.matchesTarget -import org.jetbrains.kotlin.idea.search.usagesSearch.* +import org.jetbrains.kotlin.idea.JetFileType +import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchLocation +import org.jetbrains.kotlin.idea.search.usagesSearch.getSpecialNamesToSearch import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.psi.* @@ -66,7 +67,9 @@ public class KotlinReferencesSearcher : QueryExecutorBase { val propertyMethods = runReadAction { LightClassUtil.getLightClassPropertyMethods(element) } - searchNamedElement(queryParameters, propertyMethods.getGetter()) - searchNamedElement(queryParameters, propertyMethods.getSetter()) - } + searchNamedElement(queryParameters, propertyMethods.getGetter()) + searchNamedElement(queryParameters, propertyMethods.getSetter()) + } is KotlinLightMethod -> { val declaration = element.getOrigin() if (declaration is JetProperty || (declaration is JetParameter && declaration.hasValOrVar())) { @@ -115,6 +118,9 @@ public class KotlinReferencesSearcher : QueryExecutorBase