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

convert isOverrideHierarchyElement() to extension function

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-04-27 14:59:15 +02:00
parent d013221942
commit 61a02a9d5a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt
+1 -1
View File
@@ -43,7 +43,7 @@ class KotlinOverrideHierarchyBrowser(
) )
override fun isApplicableElement(psiElement: PsiElement): Boolean = override fun isApplicableElement(psiElement: PsiElement): Boolean =
isOverrideHierarchyElement(psiElement) psiElement.isOverrideHierarchyElement()
override fun createHierarchyTreeStructure(typeName: String, psiElement: PsiElement): HierarchyTreeStructure? = override fun createHierarchyTreeStructure(typeName: String, psiElement: PsiElement): HierarchyTreeStructure? =
if (typeName == MethodHierarchyBrowserBase.METHOD_TYPE) KotlinOverrideTreeStructure(myProject, psiElement) else null if (typeName == MethodHierarchyBrowserBase.METHOD_TYPE) KotlinOverrideTreeStructure(myProject, psiElement) else null
idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyProvider.kt
+3 -3
View File
@@ -44,8 +44,8 @@ public class KotlinOverrideHierarchyProvider: HierarchyProvider {
} }
private fun getOverrideHierarchyElement(element: PsiElement?): PsiElement? private fun getOverrideHierarchyElement(element: PsiElement?): PsiElement?
= element?.getParentOfTypesAndPredicate() { isOverrideHierarchyElement(it) } = element?.getParentOfTypesAndPredicate() { it.isOverrideHierarchyElement() }
} }
fun isOverrideHierarchyElement(element: PsiElement): Boolean fun PsiElement.isOverrideHierarchyElement(): Boolean
= element is PsiMethod || element is JetNamedFunction || element is JetProperty = this is PsiMethod || this is JetNamedFunction || this is JetProperty