From b3e9dfcea958598b966569bc6a0a7ff3c5e6476b Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Sun, 16 Jul 2017 16:52:40 +0300 Subject: [PATCH] Minor: fix weak warnings and formatting in KotlinReferencesSearcher.kt --- .../KotlinReferencesSearcher.kt | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 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 1b14c2afe46..00616091931 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 @@ -60,13 +60,13 @@ data class KotlinReferencesSearchOptions(val acceptCallableOverrides: Boolean = } } -class KotlinReferencesSearchParameters(elementToSearch: PsiElement, - scope: SearchScope = runReadAction { elementToSearch.project.allScope() }, - ignoreAccessScope: Boolean = false, - optimizer: SearchRequestCollector? = null, - val kotlinOptions: KotlinReferencesSearchOptions = KotlinReferencesSearchOptions.Empty) - : ReferencesSearch.SearchParameters(elementToSearch, scope, ignoreAccessScope, optimizer) { -} +class KotlinReferencesSearchParameters( + elementToSearch: PsiElement, + scope: SearchScope = runReadAction { elementToSearch.project.allScope() }, + ignoreAccessScope: Boolean = false, + optimizer: SearchRequestCollector? = null, + val kotlinOptions: KotlinReferencesSearchOptions = KotlinReferencesSearchOptions.Empty) + : ReferencesSearch.SearchParameters(elementToSearch, scope, ignoreAccessScope, optimizer) class KotlinReferencesSearcher : QueryExecutorBase() { override fun processQuery(queryParameters: ReferencesSearch.SearchParameters, consumer: Processor) { @@ -105,9 +105,9 @@ class KotlinReferencesSearcher : QueryExecutorBase Boolean = when { - unwrappedElement is KtParameter -> ({ ref: PsiReference -> !ref.isNamedArgumentReference()/* they are processed later*/ }) - else -> ({true}) + val refFilter: (PsiReference) -> Boolean = when (unwrappedElement) { + is KtParameter -> ({ ref: PsiReference -> !ref.isNamedArgumentReference()/* they are processed later*/ }) + else -> ({ true }) } val resultProcessor = KotlinRequestResultProcessor(unwrappedElement, filter = refFilter, options = kotlinOptions) @@ -166,7 +166,7 @@ class KotlinReferencesSearcher : QueryExecutorBase