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

one more place where we missed the search scope when highlighting usages

Browse Source 
#KT-8904 Fixed
This commit is contained in:
Dmitry Jemerov
2015-11-09 16:00:10 +01:00
parent 1c05750a48
commit ffccef753d
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt
+1 -1
View File
@@ -113,7 +113,7 @@ public class KotlinFindClassUsagesHandler(
val result = runReadAction {
val constructors = classOrObject.toLightClass()?.getConstructors() ?: PsiMethod.EMPTY_ARRAY
constructors.filterIsInstance<KtLightMethod>().all { constructor ->
constructor.processDelegationCallConstructorUsages(constructor.getUseScope()) {
constructor.processDelegationCallConstructorUsages(constructor.getUseScope().intersectWith(options.searchScope)) {
it.getCalleeExpression()?.mainReference?.let { referenceProcessor.process(it) } ?: false
}
}
idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt
+7
View File
@@ -18,9 +18,11 @@ package org.jetbrains.kotlin.idea.findUsages.handlers
import com.intellij.find.findUsages.FindUsagesHandler
import com.intellij.find.findUsages.FindUsagesOptions
import com.intellij.openapi.diagnostic.Logger
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiReference
import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.search.LocalSearchScope
import com.intellij.psi.search.SearchScope
import com.intellij.usageView.UsageInfo
import com.intellij.util.CommonProcessors
@@ -74,10 +76,14 @@ public abstract class KotlinFindUsagesHandler<T : PsiElement>(psiElement: T,
val results = Collections.synchronizedList(arrayListOf<PsiReference>())
val options = getFindUsagesOptions().clone()
options.searchScope = searchScope
val scopeContainingFile = (searchScope as? LocalSearchScope)?.scope?.get(0)?.containingFile
searchReferences(target, object : Processor<UsageInfo> {
override fun process(info: UsageInfo): Boolean {
val reference = info.getReference()
if (reference != null) {
if (scopeContainingFile != null && reference.element.containingFile != scopeContainingFile) {
LOG.error("findReferencesToHighight() found a reference from a different file: $reference")
}
results.add(reference)
}
return true
@@ -87,6 +93,7 @@ public abstract class KotlinFindUsagesHandler<T : PsiElement>(psiElement: T,
}
companion object {
val LOG = Logger.getInstance(KotlinFindUsagesHandler::class.java)
protected fun processUsage(processor: Processor<UsageInfo>, ref: PsiReference): Boolean =
processor.processIfNotNull { if (ref.element.isValid) KotlinReferenceUsageInfo(ref) else null }