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

Changes on code review

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-07-31 21:46:03 +03:00
parent 397e48a11d
commit c2c6ba59fd
5 changed files with 19 additions and 6 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
+7 -2
View File
@@ -49,10 +49,15 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
val effectiveSearchScope = runReadAction { queryParameters.effectiveSearchScope }
val refFilter: (PsiReference) -> Boolean = if (unwrappedElement is JetParameter)
({ ref: PsiReference -> !ref.isNamedArgumentReference()/* they are processed later*/ })
else
({true})
words.forEach { word ->
queryParameters.optimizer.searchWord(word, effectiveSearchScope,
UsagesSearchLocation.EVERYWHERE.searchContext, true, unwrappedElement,
MyRequestResultProcessor(unwrappedElement) { !it.isNamedArgumentReference()/* they are processed later*/ })
MyRequestResultProcessor(unwrappedElement, refFilter))
}
if (unwrappedElement is JetParameter) {
@@ -71,7 +76,7 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
var namedArgsScope = function.useScope.intersectWith(queryParameters.scopeDeterminedByUser)
if (namedArgsScope is GlobalSearchScope) {
namedArgsScope = JetSourceFilterScope.kotlinSources(namedArgsScope, project)
namedArgsScope = JetSourceFilterScope.kotlinSourcesAndLibraries(namedArgsScope, project)
val filesWithFunctionName = CacheManager.SERVICE.getInstance(project).getVirtualFilesWithWord(
function.name!!, UsageSearchContext.IN_CODE, namedArgsScope, true)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt
+2 -2
View File
@@ -268,14 +268,14 @@ class PropertyUsagesSearchHelper(
var scope = function.useScope and target.effectiveScope
if (scope is GlobalSearchScope) {
scope = JetSourceFilterScope.kotlinSources(scope, element.project)
scope = JetSourceFilterScope.kotlinSourcesAndLibraries(scope, element.project)
}
val additionalFilter1 = AdditionalFileFilter(element.name!!, KOTLIN_NAMED_ARGUMENT_SEARCH_CONTEXT, true)
val additionalFilter2 = AdditionalFileFilter(function.name!!, UsageSearchContext.IN_CODE, true)
val namedArgsRequest = UsagesSearchRequestItem(target.withScope(scope),
listOf(element.name!!),
(PsiReference::isNamedArgumentUsage).searchFilter,
(PsiReference::isNamedArgumentUsage).searchFilter and makeFilter(target),
additionalFileFilters = listOf(additionalFilter1, additionalFilter2))
return listOf(realUsagesRequest, namedArgsRequest)
}