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

Refactoring: extract isOnlyKotlinSearch function

Browse Source
This commit is contained in:
Nikolay Krasko
2017-10-20 18:14:01 +03:00
parent 55996fa43d
commit 189e2506d1
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
+1 -8
View File
@@ -32,10 +32,7 @@ import org.jetbrains.kotlin.asJava.toLightClass
import org.jetbrains.kotlin.asJava.toLightElements import org.jetbrains.kotlin.asJava.toLightElements
import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
import org.jetbrains.kotlin.idea.search.KOTLIN_NAMED_ARGUMENT_SEARCH_CONTEXT import org.jetbrains.kotlin.idea.search.*
import org.jetbrains.kotlin.idea.search.allScope
import org.jetbrains.kotlin.idea.search.effectiveSearchScope
import org.jetbrains.kotlin.idea.search.unionSafe
import org.jetbrains.kotlin.idea.search.usagesSearch.dataClassComponentFunction import org.jetbrains.kotlin.idea.search.usagesSearch.dataClassComponentFunction
import org.jetbrains.kotlin.idea.search.usagesSearch.getClassNameForCompanionObject import org.jetbrains.kotlin.idea.search.usagesSearch.getClassNameForCompanionObject
import org.jetbrains.kotlin.idea.search.usagesSearch.operators.OperatorReferenceSearcher import org.jetbrains.kotlin.idea.search.usagesSearch.operators.OperatorReferenceSearcher
@@ -282,10 +279,6 @@ class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, ReferencesSearc
} }
} }
private fun isOnlyKotlinSearch(searchScope: SearchScope): Boolean {
return searchScope is LocalSearchScope && searchScope.scope.all { it.containingFile is KtFile }
}
private fun processStaticsFromCompanionObject(element: KtDeclaration) { private fun processStaticsFromCompanionObject(element: KtDeclaration) {
findStaticMethodsFromCompanionObject(element).forEach { searchNamedElement(it) } findStaticMethodsFromCompanionObject(element).forEach { searchNamedElement(it) }
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt
+4
View File
@@ -90,4 +90,8 @@ fun ReferencesSearch.SearchParameters.effectiveSearchScope(element: PsiElement):
if (isIgnoreAccessScope) return scopeDeterminedByUser if (isIgnoreAccessScope) return scopeDeterminedByUser
val accessScope = PsiSearchHelper.SERVICE.getInstance(element.project).getUseScope(element) val accessScope = PsiSearchHelper.SERVICE.getInstance(element.project).getUseScope(element)
return scopeDeterminedByUser.intersectWith(accessScope) return scopeDeterminedByUser.intersectWith(accessScope)
}
fun isOnlyKotlinSearch(searchScope: SearchScope): Boolean {
return searchScope is LocalSearchScope && searchScope.scope.all { it.containingFile is KtFile }
} }