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

Navigation: add actual declarations as implementations (KT-16892)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-03-07 16:58:10 +03:00
parent 3530d9b4c7
commit 849f9fc5c1
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.kt
+25 -8
View File
@@ -32,6 +32,8 @@ import org.jetbrains.kotlin.asJava.elements.KtLightMethod
import org.jetbrains.kotlin.asJava.toLightClass
import org.jetbrains.kotlin.asJava.unwrapped
import org.jetbrains.kotlin.idea.caches.lightClasses.KtFakeLightClass
import org.jetbrains.kotlin.idea.highlighter.markers.actualsForExpected
import org.jetbrains.kotlin.idea.highlighter.markers.isExpectedOrExpectedClassMember
import org.jetbrains.kotlin.idea.search.declarationsSearch.forEachImplementation
import org.jetbrains.kotlin.idea.search.declarationsSearch.forEachOverridingMethod
import org.jetbrains.kotlin.idea.search.declarationsSearch.toPossiblyFakeLightMethods
@@ -47,8 +49,9 @@ class KotlinDefinitionsSearcher : QueryExecutor<PsiElement, DefinitionsScopedSea
val scope = queryParameters.scope
return when (element) {
is KtClass ->
processClassImplementations(element, consumer)
is KtClass -> {
processClassImplementations(element, consumer) && processActualDeclarations(element, consumer)
}
is KtLightClass -> {
val useScope = runReadAction { element.useScope }
@@ -58,14 +61,21 @@ class KotlinDefinitionsSearcher : QueryExecutor<PsiElement, DefinitionsScopedSea
true
}
is KtNamedFunction, is KtSecondaryConstructor ->
processFunctionImplementations(element as KtFunction, scope, consumer)
is KtNamedFunction, is KtSecondaryConstructor -> {
processFunctionImplementations(element as KtFunction, scope, consumer) && processActualDeclarations(element, consumer)
}
is KtProperty ->
processPropertyImplementations(element, scope, consumer)
is KtProperty -> {
processPropertyImplementations(element, scope, consumer) && processActualDeclarations(element, consumer)
}
is KtParameter ->
if (isFieldParameter(element)) processPropertyImplementations(element, scope, consumer) else true
is KtParameter -> {
if (isFieldParameter(element)) {
processPropertyImplementations(element, scope, consumer) && processActualDeclarations(element, consumer)
} else {
true
}
}
else -> true
}
@@ -128,6 +138,13 @@ class KotlinDefinitionsSearcher : QueryExecutor<PsiElement, DefinitionsScopedSea
}
}
private fun processActualDeclarations(declaration: KtDeclaration, consumer: Processor<PsiElement>): Boolean {
return runReadAction {
if (!declaration.isExpectedOrExpectedClassMember()) true
else declaration.actualsForExpected().all(consumer::process)
}
}
fun processPropertyImplementationsMethods(accessors: Iterable<PsiMethod>, scope: SearchScope, consumer: Processor<PsiElement>): Boolean {
return accessors.all { method ->
method.forEachOverridingMethod(scope) { implementation ->