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

Minor: extract scope initialization out of cycle

Browse Source
This commit is contained in:
Nikolay Krasko
2017-10-20 18:11:25 +03:00
parent 28535a57d8
commit 55996fa43d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
+7 -6
View File
@@ -146,14 +146,15 @@ abstract class KotlinFindMemberUsagesHandler<T : KtNamedDeclaration>
addTask { query.forEach(referenceProcessor) } 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()) { for (psiMethod in element.toLightMethods()) {
var searchScope = options.searchScope applyQueryFilters(element, options, MethodReferencesSearch.search(psiMethod, psiMethodScopeSearch, true)).let { query ->
// 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 ->
addTask { query.forEach(referenceProcessor) } addTask { query.forEach(referenceProcessor) }
} }
} }