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

Postpone counting light elements till all psi checks done

Browse Source
This commit is contained in:
Nikolay Krasko
2017-06-30 16:19:53 +03:00
parent fe17d616b9
commit 25109671b1
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodReferenceSearcher.kt
+15 -8
View File
@@ -110,17 +110,24 @@ class KotlinOverridingMethodReferenceSearcher : MethodUsagesSearcher() {
return true return true
} }
var lightMethods = refElement.toLightMethods() fun countNonFinalLightMethods() = refElement
.toLightMethods()
.filterNot { it.hasModifierProperty(PsiModifier.FINAL) } .filterNot { it.hasModifierProperty(PsiModifier.FINAL) }
.ifEmpty { return true }
if (refElement is KtProperty || refElement is KtParameter) { val lightMethods = when (refElement) {
if (isWrongAccessorReference()) return true is KtProperty, is KtParameter -> {
lightMethods = lightMethods.filter { JvmAbi.isGetterName(it.name) == isGetter } if (isWrongAccessorReference()) return true
} countNonFinalLightMethods().filter { JvmAbi.isGetterName(it.name) == isGetter }
if (refElement is KtNamedFunction) { }
lightMethods = lightMethods.filter { it.name == method.name }
is KtNamedFunction ->
countNonFinalLightMethods().filter { it.name == method.name }
else ->
countNonFinalLightMethods()
} }
return lightMethods.all { super.processInexactReference(ref, it, method, consumer) } return lightMethods.all { super.processInexactReference(ref, it, method, consumer) }
} }
} }