diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt index 4f5c0192c63..999fa32a2cd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt @@ -43,7 +43,7 @@ class KotlinOverrideHierarchyBrowser( ) override fun isApplicableElement(psiElement: PsiElement): Boolean = - isOverrideHierarchyElement(psiElement) + psiElement.isOverrideHierarchyElement() override fun createHierarchyTreeStructure(typeName: String, psiElement: PsiElement): HierarchyTreeStructure? = if (typeName == MethodHierarchyBrowserBase.METHOD_TYPE) KotlinOverrideTreeStructure(myProject, psiElement) else null diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyProvider.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyProvider.kt index c3c63fad01c..cdcb8fcfd84 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyProvider.kt @@ -44,8 +44,8 @@ public class KotlinOverrideHierarchyProvider: HierarchyProvider { } private fun getOverrideHierarchyElement(element: PsiElement?): PsiElement? - = element?.getParentOfTypesAndPredicate() { isOverrideHierarchyElement(it) } + = element?.getParentOfTypesAndPredicate() { it.isOverrideHierarchyElement() } } -fun isOverrideHierarchyElement(element: PsiElement): Boolean - = element is PsiMethod || element is JetNamedFunction || element is JetProperty +fun PsiElement.isOverrideHierarchyElement(): Boolean + = this is PsiMethod || this is JetNamedFunction || this is JetProperty