From 55996fa43d5d8ada75d3b08ed8dab8d905c1d5d8 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 20 Oct 2017 18:11:25 +0300 Subject: [PATCH] Minor: extract scope initialization out of cycle --- .../handlers/KotlinFindMemberUsagesHandler.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt index ed1fa6a6b79..a9efd06d85f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt @@ -146,14 +146,15 @@ abstract class KotlinFindMemberUsagesHandler addTask { query.forEach(referenceProcessor) } } + // TODO: very bad code!! ReferencesSearch does not work correctly for constructors and annotation parameters + val psiMethodScopeSearch = when { + element is KtNamedFunction || element is KtParameter && element.dataClassComponentFunction() != null -> + options.searchScope.excludeKotlinSources() + else -> options.searchScope + } for (psiMethod in element.toLightMethods()) { - var searchScope = options.searchScope - // TODO: very bad code!! ReferencesSearch does not work correctly for constructors and annotation parameters - if (element is KtNamedFunction || (element is KtParameter && element.dataClassComponentFunction() != null)) { - searchScope = searchScope.excludeKotlinSources() - } - applyQueryFilters(element, options, MethodReferencesSearch.search(psiMethod, searchScope, true)).let { query -> + applyQueryFilters(element, options, MethodReferencesSearch.search(psiMethod, psiMethodScopeSearch, true)).let { query -> addTask { query.forEach(referenceProcessor) } } }