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

Don't process Java references twice when looking for kotlin overrides (KT-17751)

Browse Source
This commit is contained in:
Nikolay Krasko
2017-06-30 16:06:51 +03:00
parent 0cd8ee57b8
commit fe17d616b9
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodReferenceSearcher.kt
+9 -6
View File
@@ -48,16 +48,19 @@ class KotlinOverridingMethodReferenceSearcher : MethodUsagesSearcher() {
return return
} }
super.processQuery(p, consumer) val searchScope = p.project.runReadActionInSmartMode {
p.effectiveSearchScope
.intersectWith(method.useScope)
.restrictToKotlinSources()
}
if (searchScope === GlobalSearchScope.EMPTY_SCOPE) return
super.processQuery(MethodReferencesSearch.SearchParameters(method, searchScope, p.isStrictSignatureSearch, p.optimizer), consumer)
p.project.runReadActionInSmartMode { p.project.runReadActionInSmartMode {
val containingClass = method.containingClass ?: return@runReadActionInSmartMode val containingClass = method.containingClass ?: return@runReadActionInSmartMode
val searchScope = p.effectiveSearchScope
.intersectWith(method.useScope)
.restrictToKotlinSources()
if (searchScope === GlobalSearchScope.EMPTY_SCOPE) return@runReadActionInSmartMode
val nameCandidates = getPropertyNamesCandidatesByAccessorName(Name.identifier(method.name)) val nameCandidates = getPropertyNamesCandidatesByAccessorName(Name.identifier(method.name))
for (name in nameCandidates) { for (name in nameCandidates) {
p.optimizer.searchWord( p.optimizer.searchWord(