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

Add checkCanceled on find usages execution path

Browse Source 
#KT-36138 Fixed
This commit is contained in:
Vladimir Dolzhenko
2020-03-23 14:46:13 +00:00
parent baf1f56859
commit 8935c600c1
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt
+1
View File
@@ -927,6 +927,7 @@ class ExpressionsOfTypeProcessor(
private fun searchReferences(parameters: ReferencesSearch.SearchParameters, processor: (PsiReference) -> Boolean) { private fun searchReferences(parameters: ReferencesSearch.SearchParameters, processor: (PsiReference) -> Boolean) {
ReferencesSearch.search(parameters).forEach(Processor { ref -> ReferencesSearch.search(parameters).forEach(Processor { ref ->
ProgressManager.checkCanceled()
runReadAction { runReadAction {
if (ref.element.isValid) { if (ref.element.isValid) {
processor(ref) processor(ref)
idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt
+2
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.findUsages.handlers
import com.intellij.find.findUsages.FindUsagesHandler import com.intellij.find.findUsages.FindUsagesHandler
import com.intellij.find.findUsages.FindUsagesOptions import com.intellij.find.findUsages.FindUsagesOptions
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.progress.ProgressManager
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiReference import com.intellij.psi.PsiReference
import com.intellij.psi.impl.light.LightMemberReference import com.intellij.psi.impl.light.LightMemberReference
@@ -140,6 +141,7 @@ abstract class KotlinFindUsagesHandler<T : PsiElement>(
processor.processIfNotNull { if (element.isValid) UsageInfo(element) else null } processor.processIfNotNull { if (element.isValid) UsageInfo(element) else null }
private fun UsageInfoProcessor.processIfNotNull(callback: () -> UsageInfo?): Boolean { private fun UsageInfoProcessor.processIfNotNull(callback: () -> UsageInfo?): Boolean {
ProgressManager.checkCanceled()
val usageInfo = runReadAction(callback) val usageInfo = runReadAction(callback)
return if (usageInfo != null) process(usageInfo) else true return if (usageInfo != null) process(usageInfo) else true
} }